新增拼团配置

Mall.Model/Entity/User/RB_GroupBuyConfig.cs

@@ -67,11 +67,6 @@ namespace Mall.Model.Entity.User
         /// </summary>
         public string Goods_Poster { get; set; }
 
-        /// <summary>
-        /// 广告
-        /// </summary>
-        public string Advertisement { get; set; }
-
         /// <summary>
         /// 拼团广告状态(1-开启)
         /// </summary>
@@ -96,5 +91,20 @@ namespace Mall.Model.Entity.User
         /// 微信拼团失败通知
         /// </summary>
         public string WeChat_pintuan_fail_notice { get; set; }
+
+        /// <summary>
+        /// 广告样式
+        /// </summary>
+        public int Style { get; set; }
+
+        /// <summary>
+        /// 轮播图JSON
+        /// </summary>
+        public string BannerJson { get; set; }
+
+        /// <summary>
+        /// 广告JSON
+        /// </summary>
+        public string MagicJson { get; set; }
     }
 }

Mall.Model/Extend/User/RB_GroupBuyConfig_Extend.cs

@@ -18,14 +18,8 @@ namespace Mall.Model.Extend.User
         /// </summary>
         public List<string> Payment_TypeList
         {
-            get
-            {
-                if (!string.IsNullOrWhiteSpace(this.Payment_Type))
-                {
-                    return Common.Plugin.JsonHelper.DeserializeObject<List<string>>(this.Payment_Type);
-                }
-                return new List<string>();
-            }
+            get;
+            set;
         }
 
         /// <summary>
@@ -33,14 +27,61 @@ namespace Mall.Model.Extend.User
         /// </summary>
         public List<string> Send_TypeList
         {
-            get
-            {
-                if (!string.IsNullOrWhiteSpace(this.Send_Type))
-                {
-                    return Common.Plugin.JsonHelper.DeserializeObject<List<string>>(this.Send_Type);
-                }
-                return new List<string>();
-            }
+            get;
+            set;
         }
+
+        /// <summary>
+        /// 轮播图列表
+        /// </summary>
+        public List<GroupBuyBannerItem> BannerList { get; set; }
+
+        /// <summary>
+        /// 广告列表
+        /// </summary>
+        public List<GroupBuyMagicItem> MagicDataList { get; set; }
+    }
+
+    /// <summary>
+    /// 拼团配置-轮播图
+    /// </summary>
+    public class GroupBuyBannerItem
+    {
+        /// <summary>
+        /// 导航图标
+        /// </summary>
+        public string NavImg { get; set; }
+
+        /// <summary>
+        /// 导航链接
+        /// </summary>
+        public string NavLink { get; set; }
+
+        /// <summary>
+        /// 导航名称
+        /// </summary>
+        public string NavName { get; set; }
+
+    }
+
+    /// <summary>
+    /// 拼团配置-广告
+    /// </summary>
+    public class GroupBuyMagicItem
+    {
+        /// <summary>
+        /// 图片地址
+        /// </summary>
+        public string ImgUrl { get; set; }
+
+        /// <summary>
+        /// 链接地址
+        /// </summary>
+        public string Link { get; set; }
+
+        /// <summary>
+        /// 大小
+        /// </summary>
+        public string size { get; set; }
     }
 }
\ No newline at end of file

Mall.Module.User/GroupBuyConfigModule.cs

@@ -40,9 +40,10 @@ namespace Mall.Module.User
                     {nameof(RB_GroupBuyConfig_Extend.Is_Member_Price),extModel.Is_Member_Price },
                     {nameof(RB_GroupBuyConfig_Extend.Is_Integral),extModel.Is_Integral },
                     {nameof(RB_GroupBuyConfig_Extend.RuleText),extModel.RuleText },
-                    //{nameof(RB_GroupBuyConfig_Extend.Goods_Poster),extModel.Goods_Poster },
-                    //{nameof(RB_GroupBuyConfig_Extend.Advertisement),extModel.Advertisement },
                     {nameof(RB_GroupBuyConfig_Extend.Is_Advertisement),extModel.Is_Advertisement },
+                    {nameof(RB_GroupBuyConfig_Extend.Style),extModel.Style },
+                    {nameof(RB_GroupBuyConfig_Extend.BannerJson),extModel.BannerJson },
+                    {nameof(RB_GroupBuyConfig_Extend.MagicJson),extModel.MagicJson },
                 };
                 flag = groupBuyConfigRepository.Update(fileds, new WhereHelper(nameof(RB_GroupBuyConfig_Extend.GroupByConfigId), extModel.GroupByConfigId));
             }

Mall.Repository/User/RB_GroupBuyConfigRepository.cs

@@ -40,7 +40,31 @@ WHERE 1=1
                     builder.AppendFormat(" AND {0}={1} ", nameof(RB_GroupBuyConfig_Extend.GroupByConfigId), query.GroupByConfigId);
                 }
             }
-            return Get<RB_GroupBuyConfig_Extend>(builder.ToString()).FirstOrDefault();
+            var extModel= Get<RB_GroupBuyConfig_Extend>(builder.ToString()).FirstOrDefault();
+            if (extModel != null)
+            {
+                extModel.Payment_TypeList = new List<string>();
+                if (!string.IsNullOrWhiteSpace(extModel.Payment_Type))
+                {
+                    extModel.Payment_TypeList = Common.Plugin.JsonHelper.DeserializeObject<List<string>>(extModel.Payment_Type);
+                }
+                extModel.Send_TypeList = new List<string>();
+                if (!string.IsNullOrEmpty(extModel.Send_Type))
+                {
+                    extModel.Send_TypeList = Common.Plugin.JsonHelper.DeserializeObject<List<string>>(extModel.Send_Type);
+                }
+                extModel.BannerList = new List<GroupBuyBannerItem>();
+                if (!string.IsNullOrWhiteSpace(extModel.BannerJson))
+                {
+                    extModel.BannerList = Common.Plugin.JsonHelper.DeserializeObject<List<GroupBuyBannerItem>>(extModel.BannerJson);
+                }
+                extModel.MagicDataList = new List<GroupBuyMagicItem>();
+                if (!string.IsNullOrWhiteSpace(extModel.MagicJson))
+                {
+                    extModel.MagicDataList = Common.Plugin.JsonHelper.DeserializeObject<List<GroupBuyMagicItem>>(extModel.MagicJson);
+                }
+            }
+            return extModel;
         }
     }
 }

Mall.WebApi/Controllers/Product/GroupBuyController.cs

@@ -40,6 +40,14 @@ namespace Mall.WebApi.Controllers.Product
             {
                 extModel.Send_Type = Common.Plugin.JsonHelper.Serialize(extModel.Send_TypeList);
             }
+            if (extModel.MagicDataList != null && extModel.MagicDataList.Count > 0)
+            { 
+               extModel.MagicJson = Common.Plugin.JsonHelper.Serialize(extModel.MagicDataList);
+            }
+            if (extModel.BannerList != null && extModel.BannerList.Count > 0)
+            {
+                extModel.BannerJson = Common.Plugin.JsonHelper.Serialize(extModel.BannerList);
+            }
             var flag = groupBuyConfigModule.SetGroupBuyConfigModule(extModel);
             return flag ? ApiResult.Success() : ApiResult.Failed();
         }