Commit 54c01a3c authored by 黄奎's avatar 黄奎

新增页面

parent bd4bdba1
......@@ -35,11 +35,10 @@ namespace Mall.Common.Enum.MallBase
[EnumField("插件页面")]
PluginPage = 4,
/// <summary>
/// diy页面
/// </summary>
[EnumField("diy页面")]
DiyPage = 4,
DiyPage = 5,
}
}
......@@ -59,7 +59,7 @@ namespace Mall.Model.Entity.User
}
/// <summary>
/// 是否有参数
/// 是否有参数(0-无参数,1-有参数)
/// </summary>
public int? IsParameter
{
......
......@@ -21,5 +21,26 @@ namespace Mall.Model.Extend.User
return str;
}
}
/// <summary>
/// 页面类型【查询使用】
/// </summary>
public int QPageType { get; set; }
/// <summary>
/// 状态字符串
/// </summary>
public string StatusStr
{
get
{
string str = "正常";
if (this.Status > 0 && this.Status == 1)
{
str = "禁用";
}
return str;
}
}
}
}
......@@ -22,6 +22,160 @@ namespace Mall.Module.User
/// </summary>
private readonly RB_Miniprogram_PageManageRepository miniprogram_PageManageRepository = new RB_Miniprogram_PageManageRepository();
/// <summary>
/// 根据查询条件获取小程序列表(单个)
/// </summary>
/// <param name="query">查询条件</param>
/// <returns></returns>
public List<RB_MiniProgram_Page_Extend> GetMiniProgramPage_ListModule(RB_MiniProgram_Page_Extend query)
{
return miniProgram_PageRepository.GetListRepository(query);
}
/// <summary>
/// 获取小程序分页列表(单个)
/// </summary>
/// <param name="pageIndex">页码</param>
/// <param name="pageSize">每页显示条数</param>
/// <param name="rowCount">总条数</param>
/// <param name="query">查询条件</param>
/// <returns></returns>
public List<RB_MiniProgram_Page_Extend> GetMiniProgramPage_PageListModule(int pageIndex, int pageSize, out long rowCount, RB_MiniProgram_Page_Extend query)
{
return miniProgram_PageRepository.GetPageListRepository(pageIndex, pageSize, out rowCount, query);
}
/// <summary>
/// 新增修改小程序页面(单个)
/// </summary>
/// <param name="extModel"></param>
/// <returns></returns>
public bool SetMiniProgram_Page_Module(RB_MiniProgram_Page_Extend extModel)
{
bool flag = false;
if (extModel.Id > 0)
{
Dictionary<string, object> fileds = new Dictionary<string, object>()
{
{ nameof(RB_MiniProgram_Page_Extend.Id),extModel.Id},
{ nameof(RB_MiniProgram_Page_Extend.MallBaseId),extModel.MallBaseId},
{ nameof(RB_MiniProgram_Page_Extend.PageId),extModel.PageId},
{ nameof(RB_MiniProgram_Page_Extend.SelePageName),extModel.SelePageName},
};
flag = miniProgram_PageRepository.Update(fileds, new WhereHelper(nameof(RB_MiniProgram_Page_Extend.Id), extModel.Id));
}
else
{
int NewId = miniProgram_PageRepository.Insert(extModel);
extModel.Id = NewId;
flag = NewId > 0;
}
return flag;
}
/// <summary>
/// 根据小程序页面编号获取小程序页面实体(单个)
/// </summary>
/// <param name="PageId"></param>
/// <returns></returns>
public RB_MiniProgram_Page_Extend GetMiniprogram_Page_Module(object Id)
{
RB_MiniProgram_Page_Extend extModel = miniProgram_PageRepository.GetEntity<RB_MiniProgram_Page_Extend>(Id);
if (extModel == null)
{
extModel = new RB_MiniProgram_Page_Extend();
}
return extModel;
}
/// <summary>
/// 根据查询条件获取小程序页面管理列表【管理页面】
/// </summary>
/// <param name="query">查询条件</param>
/// <returns></returns>
public List<RB_Miniprogram_PageManage_Extend> GetMiniprogram_PageManage_ListModule(RB_Miniprogram_PageManage_Extend query)
{
return miniprogram_PageManageRepository.GetListRepository(query);
}
/// <summary>
/// 获取小程序页面管理分页列表【管理页面】
/// </summary>
/// <param name="pageIndex">页码</param>
/// <param name="pageSize">每页显示条数</param>
/// <param name="rowCount">总条数</param>
/// <param name="query">查询条件</param>
/// <returns></returns>
public List<RB_Miniprogram_PageManage_Extend> GetMiniprogram_PageManage_PageListModule(int pageIndex, int pageSize, out long rowCount, RB_Miniprogram_PageManage_Extend query)
{
return miniprogram_PageManageRepository.GetPageListRepository(pageIndex, pageSize, out rowCount, query);
}
/// <summary>
/// 新增修改小程序管理页面【管理页面】
/// </summary>
/// <param name="extModel"></param>
/// <returns></returns>
public bool SetMiniprogram_PageManage_Module(RB_Miniprogram_PageManage_Extend extModel)
{
bool flag = false;
if (extModel.IsParameter == 0)
{
extModel.ParameterValue = "";
}
if (extModel.PageId > 0)
{
Dictionary<string, object> fileds = new Dictionary<string, object>()
{
{ nameof(RB_Miniprogram_PageManage_Extend.PageType),extModel.PageType},
{ nameof(RB_Miniprogram_PageManage_Extend.PageName),extModel.PageName},
{ nameof(RB_Miniprogram_PageManage_Extend.PageUrl),extModel.PageUrl},
{ nameof(RB_Miniprogram_PageManage_Extend.PageSort),extModel.PageSort},
{ nameof(RB_Miniprogram_PageManage_Extend.IsParameter),extModel.IsParameter},
{ nameof(RB_Miniprogram_PageManage_Extend.ParameterValue),extModel.ParameterValue},
};
flag = miniprogram_PageManageRepository.Update(fileds, new WhereHelper(nameof(RB_Miniprogram_PageManage_Extend.PageId), extModel.PageId));
}
else
{
int NewId = miniprogram_PageManageRepository.Insert(extModel);
extModel.PageId = NewId;
flag = NewId > 0;
}
return flag;
}
/// <summary>
/// 更新菜单状态【管理页面】
/// </summary>
/// <param name="PageId">页面Id</param>
/// <param name="Status">页面状态(0-正常,1-删除)</param>
/// <returns></returns>
public bool RemoveMiniprogram_PageManage_Module(object PageId, int Status)
{
bool flag = false;
Dictionary<string, object> fileds = new Dictionary<string, object>()
{
{ nameof(RB_Miniprogram_PageManage_Extend.Status),Status},
};
flag = miniprogram_PageManageRepository.Update(fileds, new WhereHelper(nameof(RB_Miniprogram_PageManage_Extend.PageId), PageId));
return flag;
}
/// <summary>
/// 根据页面编号获取页面实体【管理页面】
/// </summary>
/// <param name="PageId"></param>
/// <returns></returns>
public RB_Miniprogram_PageManage_Extend GetMiniprogram_PageManage_Module(object PageId)
{
RB_Miniprogram_PageManage_Extend extModel = miniprogram_PageManageRepository.GetEntity<RB_Miniprogram_PageManage_Extend>(PageId);
if (extModel == null)
{
extModel = new RB_Miniprogram_PageManage_Extend();
}
return extModel;
}
}
}
......@@ -23,7 +23,10 @@ namespace Mall.Repository.User
builder.Append(" SELECT * FROM RB_MiniProgram_Page WHERE 1=1 ");
if (query != null)
{
if (query.MallBaseId > 0)
{
builder.AppendFormat(" AND {0}={1} ",nameof(RB_MiniProgram_Page_Extend.MallBaseId),query.MallBaseId);
}
}
return Get<RB_MiniProgram_Page_Extend>(builder.ToString()).ToList();
}
......@@ -42,7 +45,10 @@ namespace Mall.Repository.User
builder.Append(" SELECT * FROM RB_MiniProgram_Page WHERE 1=1 ");
if (query != null)
{
if (query.MallBaseId > 0)
{
builder.AppendFormat(" AND {0}={1} ", nameof(RB_MiniProgram_Page_Extend.MallBaseId), query.MallBaseId);
}
}
return GetPage<RB_MiniProgram_Page_Extend>(pageIndex, pageSize, out rowCount, builder.ToString()).ToList();
}
......
......@@ -20,11 +20,23 @@ namespace Mall.Repository.User
public List<RB_Miniprogram_PageManage_Extend> GetListRepository(RB_Miniprogram_PageManage_Extend query)
{
StringBuilder builder = new StringBuilder();
builder.Append(" SELECT * FROM RB_MiniProgram_Page WHERE 1=1 ");
builder.Append(" SELECT * FROM RB_Miniprogram_PageManage WHERE 1=1 ");
if (query != null)
{
if (query.QPageType > 0)
{
builder.AppendFormat(" AND {0}={1} ", nameof(RB_Miniprogram_PageManage_Extend.PageType), query.QPageType);
}
if (query.PageName != null && !string.IsNullOrEmpty(query.PageName.Trim()))
{
builder.AppendFormat(" AND {0} LIKE '%{1}%' ", nameof(RB_Miniprogram_PageManage_Extend.PageName), query.PageName);
}
if (query.Status >= 0)
{
builder.AppendFormat(" AND {0}={1} ", nameof(RB_Miniprogram_PageManage_Extend.Status), query.Status);
}
}
builder.Append(" ORDER BY PageSort ");
return Get<RB_Miniprogram_PageManage_Extend>(builder.ToString()).ToList();
}
......@@ -39,11 +51,23 @@ namespace Mall.Repository.User
public List<RB_Miniprogram_PageManage_Extend> GetPageListRepository(int pageIndex, int pageSize, out long rowCount, RB_Miniprogram_PageManage_Extend query)
{
StringBuilder builder = new StringBuilder();
builder.Append(" SELECT * FROM RB_MiniProgram_Page WHERE 1=1 ");
builder.Append(" SELECT * FROM RB_Miniprogram_PageManage WHERE 1=1 ");
if (query != null)
{
if (query.QPageType > 0)
{
builder.AppendFormat(" AND {0}={1} ", nameof(RB_Miniprogram_PageManage_Extend.PageType), query.QPageType);
}
if (query.PageName != null && !string.IsNullOrEmpty(query.PageName.Trim()))
{
builder.AppendFormat(" AND {0} LIKE '%{1}%' ", nameof(RB_Miniprogram_PageManage_Extend.PageName), query.PageName);
}
if (query.Status >= 0)
{
builder.AppendFormat(" AND {0}={1} ", nameof(RB_Miniprogram_PageManage_Extend.Status), query.Status);
}
}
builder.Append(" ORDER BY PageSort ");
return GetPage<RB_Miniprogram_PageManage_Extend>(pageIndex, pageSize, out rowCount, builder.ToString()).ToList();
}
}
......
......@@ -47,6 +47,11 @@ namespace Mall.WebApi.Controllers.User
/// </summary>
private Module.User.MiniProgramNaviconModule naviconModule = new Module.User.MiniProgramNaviconModule();
/// <summary>
/// 小程序页面处理类
/// </summary>
private Module.User.MiniProgramPageModule programPageModule = new Module.User.MiniProgramPageModule();
#region 商户信息
/// <summary>
/// 用户登录
......@@ -423,5 +428,71 @@ namespace Mall.WebApi.Controllers.User
}
#endregion
#region 小程序页面管理
/// <summary>
/// 获取小程序页面管理分页列表
/// </summary>
/// <returns></returns>
public ApiResult GetMiniProgramePageType()
{
var list = Common.Plugin.EnumHelper.EnumToList(typeof(PageTypeEnum));
return ApiResult.Success(data: list);
}
/// <summary>
/// 获取小程序页面管理分页列表
/// </summary>
/// <returns></returns>
public ApiResult GetMiniProgramePageManage_Page()
{
ResultPageModel pageModel = JsonConvert.DeserializeObject<ResultPageModel>(RequestParm.msg.ToString());
var query = JsonConvert.DeserializeObject<RB_Miniprogram_PageManage_Extend>(RequestParm.msg.ToString());
var list = programPageModule.GetMiniprogram_PageManage_PageListModule(pageModel.pageIndex, pageModel.pageSize, out long rowsCount, query);
pageModel.count = Convert.ToInt32(rowsCount);
pageModel.pageData = list;
return ApiResult.Success(data: pageModel);
}
/// <summary>
/// 添加修改小程序菜单管理
/// </summary>
/// <returns></returns>
public ApiResult SetMiniProgramePageManage()
{
var extModel = JsonConvert.DeserializeObject<RB_Miniprogram_PageManage_Extend>(RequestParm.msg.ToString());
extModel.Status = 0;
var flag = programPageModule.SetMiniprogram_PageManage_Module(extModel);
return flag ? ApiResult.Success() : ApiResult.Failed();
}
/// <summary>
/// 根据小程序菜单管理编号获取实体信息
/// </summary>
/// <returns></returns>
public ApiResult GetMiniProgramePageManage()
{
JObject parms = JObject.Parse(RequestParm.msg.ToString());
var PageId = parms.GetInt("PageId", 0);
var extModel = programPageModule.GetMiniprogram_PageManage_Module(PageId);
return ApiResult.Success(data: extModel);
}
/// <summary>
/// 删除、恢复 小程序菜单管理
/// </summary>
/// <returns></returns>
public ApiResult SetMiniProgramePageManageStatus()
{
JObject parms = JObject.Parse(RequestParm.msg.ToString());
var PageId = parms.GetInt("PageId", 0);
int Status = parms.GetInt("Status", 0);
var extModel = programPageModule.RemoveMiniprogram_PageManage_Module(PageId, Status);
return ApiResult.Success(data: extModel);
}
#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