新增首页

Mall.Common/API/RequestParm.cs

@@ -62,5 +62,10 @@ namespace Mall.Common.API
         /// 员工编号【员工登录时使用】
         /// </summary>
         public int EmpId { get; set; }
+
+        /// <summary>
+        /// 小程序Id
+        /// </summary>
+        public string MiniAppId { get; set; }
     }
 }

Mall.Model/Extend/MarketingCenter/RB_Miniprogram_Template_Extend.cs

@@ -13,6 +13,11 @@ namespace Mall.Model.Extend.MarketingCenter
     [DB(ConnectionName = "DefaultConnection")]
     public class RB_Miniprogram_Template_Extend : Model.Entity.MarketingCenter.RB_Miniprogram_Template
     {
+        /// <summary>
+        /// 自定义模板编号【查询使用】
+        /// </summary>
+        public string QIds { get; set; }
+
         /// <summary>
         /// 创建时间字符串
         /// </summary>

Mall.Module.MarketingCenter/MiniprogramTemplateModule.cs

@@ -43,10 +43,29 @@ namespace Mall.Module.MarketingCenter
         /// 小程序模板列表
         /// </summary>
         /// <param name="query">查询条件</param>
+        /// <param name="IsAnalyzePlus">是否解析插件</param>
         /// <returns></returns>
-        public List<RB_Miniprogram_Template_Extend> GetMiniprogramTemplateListModule(RB_Miniprogram_Template_Extend query)
+        public List<RB_Miniprogram_Template_Extend> GetMiniprogramTemplateListModule(RB_Miniprogram_Template_Extend query,bool IsAnalyzePlus=false)
         {
-            return miniprogram_TemplateRepository.GetMiniprogramTemplateListRepository(query);
+            var list= miniprogram_TemplateRepository.GetMiniprogramTemplateListRepository(query);
+            if (IsAnalyzePlus)
+            {
+                foreach (var item in list)
+                {
+                    if (item.TemplateData != null && !string.IsNullOrEmpty(item.TemplateData))
+                    {
+                        item.ComponentDataList = JsonHelper.DeserializeObject<List<ComponentItem>>(item.TemplateData);
+                        if (item.ComponentDataList != null && item.ComponentDataList.Count > 0)
+                        {
+                            foreach (var subItem in item.ComponentDataList)
+                            {
+                                AnalyzePlusModule(subItem);
+                            }
+                        }
+                    }
+                }
+            }
+            return list;
         }
 
         /// <summary>
@@ -94,6 +113,19 @@ namespace Mall.Module.MarketingCenter
                 if (extModel.ComponentDataList != null && extModel.ComponentDataList.Count > 0)
                 {
                     foreach (var item in extModel.ComponentDataList)
+                    {
+                        AnalyzePlusModule(item);
+                    }
+                }
+            }
+            return extModel;
+        }
+
+        /// <summary>
+        /// 解析插件
+        /// </summary>
+        /// <param name="item"></param>
+        public void AnalyzePlusModule(ComponentItem item)
         {
             switch (item.Id)
             {
@@ -125,17 +157,13 @@ namespace Mall.Module.MarketingCenter
                 case "lottery": item.data = JsonHelper.DeserializeObject<lotteryItem>(item.data.ToString()); break;
                 case "advance": item.data = JsonHelper.DeserializeObject<advanceItem>(item.data.ToString()); break;
                 case "vip-card": item.data = JsonHelper.DeserializeObject<vipcardItem>(item.data.ToString()); break;
-                            case "live" :item.data = JsonHelper.DeserializeObject<liveItem>(item.data.ToString()); break;
+                case "live": item.data = JsonHelper.DeserializeObject<liveItem>(item.data.ToString()); break;
                 case "empty": item.data = JsonHelper.DeserializeObject<emptyItem>(item.data.ToString()); break;
                 case "ad": item.data = JsonHelper.DeserializeObject<adItem>(item.data.ToString()); break;
                 case "modal": item.data = JsonHelper.DeserializeObject<modalItem>(item.data.ToString()); break;
                 case "quick-nav": item.data = JsonHelper.DeserializeObject<quicknavItem>(item.data.ToString()); break;
             }
         }
-                }
-            }
-            return extModel;
-        }
 
         /// <summary>
         /// 删除小程序模板

Mall.Module.User/MiniProgramModule.cs

@@ -254,6 +254,7 @@ namespace Mall.Module.User
         }
 
       
+
         /// <summary>
         /// 判断用户是否存在
         /// </summary>
@@ -403,9 +404,9 @@ namespace Mall.Module.User
         /// <param name="isGetUserCenterMenu">是否获取用户中心菜单</param>
         /// <param name="isGetHomeData">是否获取首页配置数据</param>
         /// <returns></returns>
-        public RB_MiniProgram_Extend GetMiniProgramModule(object MallBaseId, int isGetNav = 0, bool isGetUserCenterMenu = false,bool isGetHomeData=false)
+        public RB_MiniProgram_Extend GetMiniProgramModule(RB_MiniProgram_Extend query, int isGetNav = 0, bool isGetUserCenterMenu = false,bool isGetHomeData=false)
         {
-            RB_MiniProgram_Extend extModel = programRepository.GetEntity<RB_MiniProgram_Extend>(MallBaseId);
+            RB_MiniProgram_Extend extModel = programRepository.GetMiniProgramRepository(query);
             if (extModel == null)
             {
                 extModel = new RB_MiniProgram_Extend();

Mall.Repository/MarketingCenter/RB_Miniprogram_TemplateRepository.cs

@@ -66,6 +66,10 @@ namespace Mall.Repository.MarketingCenter
                 {
                     builder.Append($" AND {nameof(RB_Miniprogram_Template_Extend.TemplateName)} like '%{query.TemplateName.Trim()}%'");
                 }
+                if (query.QIds != null && !string.IsNullOrEmpty(query.QIds.Trim()))
+                {
+                    builder.AppendFormat(" AND {0} IN({1}) ",nameof(RB_Miniprogram_Template_Extend.Id), query.QIds);
+                }
             }
             return Get<RB_Miniprogram_Template_Extend>(builder.ToString()).ToList();
         }

Mall.Repository/User/RB_MiniProgramRepository.cs

@@ -36,6 +36,32 @@ namespace Mall.Repository.User
             return Get<RB_MiniProgram_Extend>(builder.ToString()).ToList();
         }
 
+        /// <summary>
+        /// 根据查询条件获取小程序实体
+        /// </summary>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public RB_MiniProgram_Extend GetMiniProgramRepository(RB_MiniProgram_Extend query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.Append(" SELECT * FROM RB_MiniProgram WHERE 1=1 ");
+            if (query != null)
+            {
+                if (query.TenantId != null && query.TenantId > 0)
+                {
+                    builder.AppendFormat(" AND TenantId={0} ", query.TenantId);
+                }
+                if (query.MallBaseId > 0)
+                {
+                    builder.AppendFormat(" AND MallBaseId={0} ", query.MallBaseId);
+                }
+                if (query.MiniAppId != null && !string.IsNullOrEmpty(query.MiniAppId))
+                {
+                    builder.AppendFormat(" AND MiniAppId='{0}' ", query.MiniAppId);
+                }
+            }
+            return Get<RB_MiniProgram_Extend>(builder.ToString()).FirstOrDefault();
+        }
 
         /// <summary>
         /// 获取小程序分页列表

Mall.WebApi/Controllers/User/AppletLoginController.cs

@@ -126,7 +126,7 @@ namespace Mall.WebApi.Controllers.User
                     string secret = Config.JwtSecretKey;
                     string token = encoder.Encode(payload, secret);
                     #endregion
-                    var mmodel = programModule.GetMiniProgramModule(demodel.MallBaseId);
+                    var mmodel = programModule.GetMiniProgramModule(new RB_MiniProgram_Extend() { MallBaseId= demodel.MallBaseId });
                     AppletUserInfo appletUserInfo = new AppletUserInfo()
                     {
                         MallBaseId = demodel.MallBaseId,
@@ -172,7 +172,7 @@ namespace Mall.WebApi.Controllers.User
                 string secret = Config.JwtSecretKey;
                 string token = encoder.Encode(payload, secret);
                 #endregion                
-                var mmodel = programModule.GetMiniProgramModule(umodel.MallBaseId);
+                var mmodel = programModule.GetMiniProgramModule(new RB_MiniProgram_Extend() {MallBaseId= umodel.MallBaseId });
                 AppletUserInfo appletUserInfo = new AppletUserInfo()
                 {
                     MallBaseId = umodel.MallBaseId,

Mall.WebApi/Controllers/User/TenantController.cs

@@ -389,7 +389,7 @@ namespace Mall.WebApi.Controllers.User
             JObject parms = JObject.Parse(RequestParm.msg.ToString());
             var MallBaseId = parms.GetInt("MallBaseId", 0);
             int isGetNav = parms.GetInt("isGetNav", 0);
-            var extModel = programModule.GetMiniProgramModule(MallBaseId, isGetNav: isGetNav);
+            var extModel = programModule.GetMiniProgramModule(new RB_MiniProgram_Extend() { MallBaseId= MallBaseId }, isGetNav: isGetNav);
             return ApiResult.Success(data: extModel);
         }
 
@@ -428,7 +428,7 @@ namespace Mall.WebApi.Controllers.User
         /// <returns></returns>
         public ApiResult GetMiniProgramMallIndex()
         {
-            var data = programModule.GetMiniProgramModule(RequestParm.MallBaseId, isGetHomeData: true);
+            var data = programModule.GetMiniProgramModule(new RB_MiniProgram_Extend() { MallBaseId= RequestParm.MallBaseId }, isGetHomeData: true);
 
             List<object> resultList = new List<object>();
             List<object> normalList = new List<object>();