Merge branch 'master' of http://gitlab.oytour.com/Kui2/mall.oytour.com

Mall.Module.MarketingCenter/MiniprogramPageTemplModule.cs

@@ -138,6 +138,41 @@ namespace Mall.Module.MarketingCenter
             return flag;
         }
 
+        /// <summary>
+        /// 更新模板禁用、启用
+        /// </summary>
+        /// <param name="Id"></param>
+        /// <param name="IsUse"></param>
+        /// <returns></returns>
+        public bool SetMiniprogramPageTemplIsUseModule(object Id, int IsUse)
+        {
+            bool flag = false;
+            Dictionary<string, object> fileds = new Dictionary<string, object>()
+            {
+                {nameof(RB_Miniprogram_Page_Templ_Extend.IsUse),IsUse }
+            };
+            flag = pageRepository.Update(fileds, new WhereHelper(nameof(RB_Miniprogram_Page_Templ_Extend.Id), Id));
+            return flag;
+        }
+
+        /// <summary>
+        /// 更新模板是否设为首页
+        /// </summary>
+        /// <param name="Id"></param>
+        /// <param name="IsHome"></param>
+        /// <returns></returns>
+        public bool SetMiniprogramPageTemplIsHomeModule(object Id, int IsHome)
+        {
+            bool flag = false;
+            flag = pageRepository.UpdateIsHomeRepository();
+            Dictionary<string, object> fileds = new Dictionary<string, object>()
+            {
+                {nameof(RB_Miniprogram_Page_Templ_Extend.IsHome),IsHome }
+            };
+            flag = pageRepository.Update(fileds, new WhereHelper(nameof(RB_Miniprogram_Page_Templ_Extend.Id), Id));
+            return flag;
+        }
+
         /// <summary>
         /// 更新自定义页面状态
         /// </summary>

Mall.Module.MarketingCenter/MiniprogramTemplateModule.cs

@@ -88,6 +88,37 @@ namespace Mall.Module.MarketingCenter
             {
                 extModel = new RB_Miniprogram_Template_Extend();
             }
+            if (extModel.TemplateData != null && !string.IsNullOrEmpty(extModel.TemplateData))
+            {
+                extModel.ComponentDataList = JsonHelper.DeserializeObject<List<ComponentItem>>(extModel.TemplateData);
+                if (extModel.ComponentDataList != null && extModel.ComponentDataList.Count > 0)
+                {
+                    foreach (var item in extModel.ComponentDataList)
+                    {
+                        switch (item.Id)
+                        {
+                            case "search": item.data = JsonHelper.DeserializeObject<searchItem>(item.data.ToString()); break;
+                            case "nav": item.data = JsonHelper.DeserializeObject<navItem>(item.data.ToString()); break;
+                            case "banner": item.data = JsonHelper.DeserializeObject<bannerItem>(item.data.ToString()); break;
+                            case "notice": item.data = JsonHelper.DeserializeObject<noticeItem>(item.data.ToString()); break;
+                            case "link": item.data = JsonHelper.DeserializeObject<linkItem>(item.data.ToString()); break;
+                            case "rubik": item.data = JsonHelper.DeserializeObject<rubikItem>(item.data.ToString()); break;
+                            case "video": item.data = JsonHelper.DeserializeObject<videoItem>(item.data.ToString()); break;
+                            case "goods": item.data = JsonHelper.DeserializeObject<goodsItem>(item.data.ToString()); break;
+                            case "store": item.data = JsonHelper.DeserializeObject<storeItem>(item.data.ToString()); break;
+                            case "copyright": item.data = JsonHelper.DeserializeObject<copyrightItem>(item.data.ToString()); break;
+                            case "check-in": item.data = JsonHelper.DeserializeObject<checkinItem>(item.data.ToString()); break;
+                            case "user-info": item.data = JsonHelper.DeserializeObject<userinfoItem>(item.data.ToString()); break;
+                            case "user-order": item.data = JsonHelper.DeserializeObject<userorderItem>(item.data.ToString()); break;
+                            case "map": item.data = JsonHelper.DeserializeObject<mapItem>(item.data.ToString()); break;
+                            case "mp-link": item.data = JsonHelper.DeserializeObject<mplinkItem>(item.data.ToString()); break;
+                            case "image-text": item.data = JsonHelper.DeserializeObject<imagetextItem>(item.data.ToString()); break;
+                            case "coupon": item.data = JsonHelper.DeserializeObject<couponItem>(item.data.ToString()); break;
+                            case "timer": item.data = JsonHelper.DeserializeObject<timerItem>(item.data.ToString()); break;
+                        }
+                    }
+                }
+            }
             return extModel;
         }
 

Mall.Repository/MarketingCenter/RB_Miniprogram_Page_TemplRepository.cs

@@ -42,6 +42,17 @@ namespace Mall.Repository.MarketingCenter
             return GetPage<RB_Miniprogram_Page_Templ_Extend>(pageIndex, pageSize, out rowCount, builder.ToString()).ToList();
         }
 
+        /// <summary>
+        /// 设置不为首页
+        /// </summary>
+        /// <returns></returns>
+        public bool UpdateIsHomeRepository()
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.Append(" UPDATE RB_Miniprogram_Page_Templ SET IsHome=0 ");
+            return base.Execute(builder.ToString())>0;
+        }
+
 
         /// <summary>
         /// 小程序自定义页面列表

Mall.WebApi/Controllers/MarketingCenter/TemplateController.cs

@@ -50,7 +50,7 @@ namespace Mall.WebApi.Controllers.MarketingCenter
             extModel.CreateDate = DateTime.Now;
             extModel.Status = 0;
             var flag = templateModule.SetMiniprogramTemplateModule(extModel);
-            return flag ? ApiResult.Success(data:extModel.Id) : ApiResult.Failed();
+            return flag ? ApiResult.Success(data: extModel.Id) : ApiResult.Failed();
         }
 
         /// <summary>
@@ -61,8 +61,18 @@ namespace Mall.WebApi.Controllers.MarketingCenter
         {
             JObject parms = JObject.Parse(RequestParm.msg.ToString());
             var Id = parms.GetInt("Id");
-            var result = templateModule.GetMiniprogramTemplateModule(Id);
-            return ApiResult.Success(data: result);
+            var extModel = templateModule.GetMiniprogramTemplateModule(Id);
+            if (extModel != null && extModel.Id > 0)
+            {
+                var obj = new
+                {
+                    extModel.Id,
+                    extModel.TemplateName,
+                    extModel.ComponentDataList,
+                };
+                return ApiResult.Success(data: obj);
+            }
+            return ApiResult.Failed(message: "参数错误");
         }
 
         /// <summary>
@@ -87,7 +97,7 @@ namespace Mall.WebApi.Controllers.MarketingCenter
         {
             var parms = RequestParm;
             ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(parms.msg.ToString());
-            var  query = JsonConvert.DeserializeObject<RB_Miniprogram_Template_Extend>(parms.msg.ToString());
+            var query = JsonConvert.DeserializeObject<RB_Miniprogram_Template_Extend>(parms.msg.ToString());
             query.TenantId = Convert.ToInt32(parms.uid);
             query.MallBaseId = parms.MallBaseId;
 
@@ -130,7 +140,7 @@ namespace Mall.WebApi.Controllers.MarketingCenter
             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);
+            var list = miniprogramPageTemplModule.GetMiniprogramPageTemplListModule(query);
             return ApiResult.Success("", list);
         }
 
@@ -146,7 +156,7 @@ namespace Mall.WebApi.Controllers.MarketingCenter
             query.TenantId = Convert.ToInt32(RequestParm.uid);
             query.MallBaseId = RequestParm.MallBaseId;
             bool isGetHome = parms.GetBoolValue("isGetHome");
-            var extModel = miniprogramPageTemplModule.GetMiniprogramPageTemplModule(query,isGetHome: isGetHome);
+            var extModel = miniprogramPageTemplModule.GetMiniprogramPageTemplModule(query, isGetHome: isGetHome);
             return ApiResult.Success("", extModel);
         }
 
@@ -159,7 +169,7 @@ namespace Mall.WebApi.Controllers.MarketingCenter
             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;
@@ -181,6 +191,33 @@ namespace Mall.WebApi.Controllers.MarketingCenter
             return flag ? ApiResult.Success() : ApiResult.Failed();
         }
 
+        /// <summary>
+        /// 更新模板禁用、启用
+        /// </summary>
+        /// <returns></returns>
+        public ApiResult SetMiniprogramPageTemplIsUse()
+        {
+            JObject parms = JObject.Parse(RequestParm.msg.ToString());
+            var Id = parms.GetInt("Id", 0);
+            var IsUse = parms.GetInt("IsUse", 0);
+            var flag = miniprogramPageTemplModule.SetMiniprogramPageTemplIsUseModule(Id, IsUse);
+            return flag ? ApiResult.Success() : ApiResult.Failed();
+        }
+
+        /// <summary>
+        /// 更新模板是否设为首页
+        /// </summary>
+        /// <returns></returns>
+        public ApiResult SetMiniprogramPageTemplIsHome()
+        {
+            JObject parms = JObject.Parse(RequestParm.msg.ToString());
+            var Id = parms.GetInt("Id", 0);
+            var IsHome = parms.GetInt("IsHome", 1);
+            var flag = miniprogramPageTemplModule.SetMiniprogramPageTemplIsHomeModule(Id, IsHome);
+            return flag ? ApiResult.Success() : ApiResult.Failed();
+        }
+
+
         /// <summary>
         /// 更新自定义页面状态
         /// </summary>