Commit 2ebf0577 authored by 黄奎's avatar 黄奎

新增自定义页面

parent a647b5cc
...@@ -41,6 +41,15 @@ namespace Mall.Module.MarketingCenter ...@@ -41,6 +41,15 @@ namespace Mall.Module.MarketingCenter
public List<RB_Miniprogram_Page_Templ_Extend> GetMiniprogramPageTemplPageListModule(int pageIndex, int pageSize, out long rowCount, RB_Miniprogram_Page_Templ_Extend query) public List<RB_Miniprogram_Page_Templ_Extend> GetMiniprogramPageTemplPageListModule(int pageIndex, int pageSize, out long rowCount, RB_Miniprogram_Page_Templ_Extend query)
{ {
var list = pageRepository.GetMiniprogramPageTemplPageListRepository(pageIndex, pageSize, out rowCount, query); var list = pageRepository.GetMiniprogramPageTemplPageListRepository(pageIndex, pageSize, out rowCount, query);
if (list != null && list.Count > 0)
{
string pageIds = string.Join(",", list.Select(qitem => qitem.Id));
List<RB_Miniprogram_Page_Templ_Details_Extend> details_Extends = GetMiniprogramPageTemplDetailsListModule(new RB_Miniprogram_Page_Templ_Details_Extend() { QPageTemplIDs = pageIds });
foreach (var item in list)
{
item.DetailsList = details_Extends?.Where(qitem => qitem.PageTemplID == item.Id)?.ToList();
}
}
return list; return list;
} }
...@@ -53,15 +62,6 @@ namespace Mall.Module.MarketingCenter ...@@ -53,15 +62,6 @@ namespace Mall.Module.MarketingCenter
public List<RB_Miniprogram_Page_Templ_Extend> GetMiniprogramPageTemplListModule(RB_Miniprogram_Page_Templ_Extend query) public List<RB_Miniprogram_Page_Templ_Extend> GetMiniprogramPageTemplListModule(RB_Miniprogram_Page_Templ_Extend query)
{ {
var list = pageRepository.GetMiniprogramPageTemplListRepository(query); var list = pageRepository.GetMiniprogramPageTemplListRepository(query);
if (list != null && list.Count > 0)
{
string pageIds = string.Join(",", list.Select(qitem => qitem.Id));
List<RB_Miniprogram_Page_Templ_Details_Extend> details_Extends = GetMiniprogramPageTemplDetailsListModule(new RB_Miniprogram_Page_Templ_Details_Extend() {QPageTemplIDs=pageIds });
foreach (var item in list)
{
item.DetailsList = details_Extends?.Where(qitem => qitem.PageTemplID == item.Id)?.ToList();
}
}
return list; return list;
} }
...@@ -160,7 +160,7 @@ namespace Mall.Module.MarketingCenter ...@@ -160,7 +160,7 @@ namespace Mall.Module.MarketingCenter
/// </summary> /// </summary>
/// <param name="Id"></param> /// <param name="Id"></param>
/// <returns></returns> /// <returns></returns>
public bool RemoveMiniprogramPageTemplDetailsListModule(object Id) public bool RemoveMiniprogramPageTemplDetailsModule(object Id)
{ {
bool flag = false; bool flag = false;
flag = detailsRepository.Delete(Id)>0; flag = detailsRepository.Delete(Id)>0;
......
...@@ -77,7 +77,7 @@ namespace Mall.Module.MarketingCenter ...@@ -77,7 +77,7 @@ namespace Mall.Module.MarketingCenter
} }
/// <summary> /// <summary>
/// 获取小程序模板 /// 获取小程序模板实体
/// </summary> /// </summary>
/// <param name="Id"></param> /// <param name="Id"></param>
/// <returns></returns> /// <returns></returns>
......
...@@ -25,7 +25,7 @@ namespace Mall.Repository.MarketingCenter ...@@ -25,7 +25,7 @@ namespace Mall.Repository.MarketingCenter
{ {
if (query.QPageTemplIDs != null && !string.IsNullOrWhiteSpace(query.QPageTemplIDs.Trim())) if (query.QPageTemplIDs != null && !string.IsNullOrWhiteSpace(query.QPageTemplIDs.Trim()))
{ {
builder.Append($" AND {nameof(RB_Miniprogram_Page_Templ_Details_Extend.PageTemplID)} IN ({query.QPageTemplIDs.Trim()})'"); builder.Append($" AND {nameof(RB_Miniprogram_Page_Templ_Details_Extend.PageTemplID)} IN ({query.QPageTemplIDs.Trim()}) ");
} }
} }
return Get<RB_Miniprogram_Page_Templ_Details_Extend>(builder.ToString()).ToList(); return Get<RB_Miniprogram_Page_Templ_Details_Extend>(builder.ToString()).ToList();
......
...@@ -11,6 +11,7 @@ using Mall.Common.Plugin; ...@@ -11,6 +11,7 @@ using Mall.Common.Plugin;
using System.Collections.Generic; using System.Collections.Generic;
using Mall.Model.Extend.MarketingCenter; using Mall.Model.Extend.MarketingCenter;
using Newtonsoft.Json.Linq; using Newtonsoft.Json.Linq;
using Mall.Model.Entity.MarketingCenter;
namespace Mall.WebApi.Controllers.MarketingCenter namespace Mall.WebApi.Controllers.MarketingCenter
{ {
...@@ -20,12 +21,19 @@ namespace Mall.WebApi.Controllers.MarketingCenter ...@@ -20,12 +21,19 @@ namespace Mall.WebApi.Controllers.MarketingCenter
[EnableCors("AllowCors")] [EnableCors("AllowCors")]
public class TemplateController : BaseController public class TemplateController : BaseController
{ {
/// <summary>
/// 模板处理类
/// </summary>
private readonly Module.MarketingCenter.MiniprogramTemplateModule templateModule = new MiniprogramTemplateModule(); private readonly Module.MarketingCenter.MiniprogramTemplateModule templateModule = new MiniprogramTemplateModule();
/// <summary>
/// 自定义页面处理类
/// </summary>
private readonly MiniprogramPageTemplModule miniprogramPageTemplModule = new MiniprogramPageTemplModule();
#region 模板管理 #region 模板管理
/// <summary> /// <summary>
/// 添加修改模板 /// 新增修改小程序模板
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
public ApiResult SetMiniTemplate() public ApiResult SetMiniTemplate()
...@@ -46,7 +54,7 @@ namespace Mall.WebApi.Controllers.MarketingCenter ...@@ -46,7 +54,7 @@ namespace Mall.WebApi.Controllers.MarketingCenter
} }
/// <summary> /// <summary>
/// 获取模板 /// 获取小程序模板实体
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
public ApiResult GetMiniTemplate() public ApiResult GetMiniTemplate()
...@@ -58,7 +66,7 @@ namespace Mall.WebApi.Controllers.MarketingCenter ...@@ -58,7 +66,7 @@ namespace Mall.WebApi.Controllers.MarketingCenter
} }
/// <summary> /// <summary>
/// 删除用户中心自定义菜单 /// 删除小程序模板
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
public ApiResult RemoveMiniTemplate() public ApiResult RemoveMiniTemplate()
...@@ -71,7 +79,7 @@ namespace Mall.WebApi.Controllers.MarketingCenter ...@@ -71,7 +79,7 @@ namespace Mall.WebApi.Controllers.MarketingCenter
} }
/// <summary> /// <summary>
/// 获取分销商等级分页列表 /// 小程序模板分页列表
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
...@@ -89,5 +97,101 @@ namespace Mall.WebApi.Controllers.MarketingCenter ...@@ -89,5 +97,101 @@ namespace Mall.WebApi.Controllers.MarketingCenter
return ApiResult.Success("", pagelist); return ApiResult.Success("", pagelist);
} }
#endregion #endregion
#region 自定义页面管理
/// <summary>
/// 小程序自定义页面分页列表
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetMiniprogramPageTemplPageList()
{
var parms = RequestParm;
ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(parms.msg.ToString());
var query = JsonConvert.DeserializeObject<RB_Miniprogram_Page_Templ_Extend>(parms.msg.ToString());
query.TenantId = Convert.ToInt32(parms.uid);
query.MallBaseId = parms.MallBaseId;
var list = miniprogramPageTemplModule.GetMiniprogramPageTemplPageListModule(pagelist.pageIndex, pagelist.pageSize, out long count, query);
pagelist.count = Convert.ToInt32(count);
pagelist.pageData = list;
return ApiResult.Success("", pagelist);
}
/// <summary>
/// 小程序自定义页面列表
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetMiniprogramPageTemplList()
{
var parms = RequestParm;
var query = JsonConvert.DeserializeObject<RB_Miniprogram_Page_Templ_Extend>(parms.msg.ToString());
query.TenantId = Convert.ToInt32(parms.uid);
query.MallBaseId = parms.MallBaseId;
var list = miniprogramPageTemplModule.GetMiniprogramPageTemplListModule( query);
return ApiResult.Success("", list);
}
/// <summary>
/// 小程序自定义页面实体
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetMiniprogramPageTempl()
{
JObject parms = JObject.Parse(RequestParm.msg.ToString());
var query = JsonConvert.DeserializeObject<RB_Miniprogram_Page_Templ_Extend>(RequestParm.msg.ToString());
query.TenantId = Convert.ToInt32(RequestParm.uid);
query.MallBaseId = RequestParm.MallBaseId;
bool isGetHome = parms.GetBoolValue("isGetHome");
var extModel = miniprogramPageTemplModule.GetMiniprogramPageTemplModule(query,isGetHome: isGetHome);
return ApiResult.Success("", extModel);
}
/// <summary>
/// 新增修改自定义页面
/// </summary>
/// <returns></returns>
public ApiResult SetMiniprogramPageTempl()
{
var extModel = JsonConvert.DeserializeObject<RB_Miniprogram_Page_Templ_Extend>(RequestParm.msg.ToString());
extModel.TenantId = RequestParm.TenantId;
extModel.MallBaseId = RequestParm.MallBaseId;
Int32.TryParse(RequestParm.uid, out int Uid);
extModel.CreateBy = Uid;
extModel.CreateDate = DateTime.Now;
extModel.Status = 0;
var flag = miniprogramPageTemplModule.SetMiniprogramPageTemplModule(extModel);
return flag ? ApiResult.Success(data: extModel.Id) : ApiResult.Failed();
}
/// <summary>
/// 更新自定义页面状态
/// </summary>
/// <returns></returns>
public ApiResult RemoveMiniprogramPageTempl()
{
JObject parms = JObject.Parse(RequestParm.msg.ToString());
var Id = parms.GetInt("Id", 0);
var Status = parms.GetInt("Status", 1);
var flag = miniprogramPageTemplModule.RemoveMiniprogramPageTemplModule(Id, Status);
return flag ? ApiResult.Success() : ApiResult.Failed();
}
/// <summary>
/// 更新自定义页面状态
/// </summary>
/// <returns></returns>
public ApiResult RemoveMiniprogramPageTemplDetails()
{
JObject parms = JObject.Parse(RequestParm.msg.ToString());
var Id = parms.GetInt("Id", 0);
var flag = miniprogramPageTemplModule.RemoveMiniprogramPageTemplDetailsModule(Id);
return flag ? ApiResult.Success() : ApiResult.Failed();
}
#endregion
} }
} }
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment