排序修改

Mall.Model/Extend/MarketingCenter/RB_Miniprogram_Template_Extend.cs

@@ -627,6 +627,11 @@ namespace Mall.Model.Extend.MarketingCenter
         /// 下边距
         /// </summary>
         public string bottom { get; set; }
+
+        /// <summary>
+        /// 背景颜色
+        /// </summary>
+        public string background { get; set; }
     }
 
     /// <summary>

Mall.Module.Product/GroupBuyConfigActivityModule.cs

@@ -45,7 +45,7 @@ namespace Mall.Module.Product
         /// </summary>
         /// <param name="query"></param>
         /// <returns></returns>
-        public RB_Groupbuy_Activity_Extend GetGroupbuyActivityEntityRepository(RB_Groupbuy_Activity_Extend query)
+        public RB_Groupbuy_Activity_Extend GetGroupbuyActivityEntityModule(RB_Groupbuy_Activity_Extend query)
         {
             var extModel = groupbuy_ActivityRepository.GetGroupbuyActivityEntityRepository(query);
             return extModel;

Mall.WebApi/Controllers/Mall/MallHelper.cs

@@ -180,9 +180,10 @@ namespace Mall.WebApi.Controllers
                                             });
 
                                             List<GoodsDetailsItem2> newGoodsList = new List<GoodsDetailsItem2>();
-                                            foreach (var tempGood in tempGoodsList)
+                                            foreach (var goodItem in childItem.goodsList)
                                             {
                                                 var lastItem = new GoodsDetailsItem2();
+                                                var tempGood = tempGoodsList?.Where(qitem => qitem.Id == goodItem.id)?.FirstOrDefault();
                                                 if (tempGood != null && tempGood.Id > 0)
                                                 {
                                                     lastItem.id = tempGood.Id;
@@ -267,9 +268,10 @@ namespace Mall.WebApi.Controllers
                                         GoodsStatus = 1
                                     });
                                     List<GoodsDetailsItem2> newGoodsList = new List<GoodsDetailsItem2>();
-                                    foreach (var tempGood in tempGoodsList)
+                                    foreach (var goodItem in goodsData.list)
                                     {
                                         var childItem = new GoodsDetailsItem2();
+                                        var tempGood = tempGoodsList?.Where(qitem => qitem.Id == goodItem.id)?.FirstOrDefault();
                                         if (tempGood != null && tempGood.Id > 0)
                                         {
                                             childItem.id = tempGood.Id;

Mall.WebApi/Controllers/Product/GroupBuyController.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using Mall.Common.API;
+using Mall.Model.Extend.Product;
 using Mall.Model.Extend.User;
 using Mall.Module.Product;
 using Mall.Module.User;
@@ -76,7 +77,7 @@ namespace Mall.WebApi.Controllers.Product
         /// 获取拼团配置实体
         /// </summary>
         /// <returns></returns>
-        public ApiResult GetGroupBuyConfigModule()
+        public ApiResult GetGroupBuyConfig()
         {
             var query = Common.Plugin.JsonHelper.DeserializeObject<RB_GroupBuyConfig_Extend>(RequestParm.msg.ToString());
             query.MallBaseId = RequestParm.MallBaseId;
@@ -86,6 +87,46 @@ namespace Mall.WebApi.Controllers.Product
         }
         #endregion
 
+        /// <summary>
+        /// 获取拼团活动列表
+        /// </summary>
+        /// <returns></returns>
+        public ApiResult GetGroupbuyActivityPageList()
+        {
+            ResultPageModel pageModel  =Common.Plugin.JsonHelper.DeserializeObject<ResultPageModel>(RequestParm.msg.ToString());
+            var query = Common.Plugin.JsonHelper.DeserializeObject<RB_Groupbuy_Activity_Extend>(RequestParm.msg.ToString());
+            query.MallBaseId = RequestParm.MallBaseId;
+            query.TenantId = RequestParm.TenantId;
+            var list = groupBuyConfigActivityModule.GetGroupbuyActivityPageListModule(pageModel.pageIndex, pageModel.pageSize, out long rowsCount, query); ;
+            pageModel.pageData = list;
+            pageModel.count = Convert.ToInt32(rowsCount);
+            return ApiResult.Success(data: pageModel);
+        }
+
+        /// <summary>
+        /// 获取拼团活动实体类
+        /// </summary>
+        /// <returns></returns>
+        public ApiResult GetGroupbuyActivity()
+        {
+            var query = Common.Plugin.JsonHelper.DeserializeObject<RB_Groupbuy_Activity_Extend>(RequestParm.msg.ToString());
+            query.MallBaseId = RequestParm.MallBaseId;
+            query.TenantId = RequestParm.TenantId;
+            var extModel = groupBuyConfigActivityModule.GetGroupbuyActivityEntityModule(query);
+            return ApiResult.Success(data: extModel);
+        }
 
+        /// <summary>
+        /// 新增修改拼团活动
+        /// </summary>
+        /// <returns></returns>
+        public ApiResult SetGroupbuyActivity()
+        {
+            var extModel = Common.Plugin.JsonHelper.DeserializeObject<RB_Groupbuy_Activity_Extend>(RequestParm.msg.ToString());
+            extModel.MallBaseId = RequestParm.MallBaseId;
+            extModel.TenantId = RequestParm.TenantId;
+            bool flag = groupBuyConfigActivityModule.SetGroupbuyActivityModule(extModel);
+            return flag ? ApiResult.Success() : ApiResult.Failed();
+        }
     }
 }
\ No newline at end of file