提交代码

Mall.Module.TradePavilion/CarrierModule.cs

@@ -232,16 +232,16 @@ namespace Mall.Module.TradePavilion
                     {nameof(RB_Carrier_Extend.Crowd),model.Crowd },
                      {nameof(RB_Carrier_Extend.FirstStoreTest),model.FirstStoreTest },
                      {nameof(RB_Carrier_Extend.OpeningStatus),model.OpeningStatus },
-                      {nameof(RB_CarrierApplyFor_Extend.Discount),model.Discount },
-                    {nameof(RB_CarrierApplyFor_Extend.Honor),model.Honor },
-                    {nameof(RB_CarrierApplyFor_Extend.YeJi),model.YeJi },
-                    {nameof(RB_CarrierApplyFor_Extend.ShopNum),model.ShopNum },
-                    {nameof(RB_CarrierApplyFor_Extend.AreaRequirement ),model.AreaRequirement  },
-                    {nameof(RB_CarrierApplyFor_Extend.EndAreaRequirement),model.EndAreaRequirement },
-                    {nameof(RB_CarrierApplyFor_Extend.BuiltUpArea),model.BuiltUpArea },
-                    {nameof(RB_CarrierApplyFor_Extend.EndBuiltUpArea),model.EndBuiltUpArea },
-                    {nameof(RB_CarrierApplyFor_Extend.FirstShopNum),model.FirstShopNum },
-                    {nameof(RB_CarrierApplyFor_Extend.StartingInfo),model.StartingInfo }
+                      {nameof(RB_Carrier_Extend.Discount),model.Discount },
+                    {nameof(RB_Carrier_Extend.Honor),model.Honor },
+                    {nameof(RB_Carrier_Extend.YeJi),model.YeJi },
+                    {nameof(RB_Carrier_Extend.ShopNum),model.ShopNum },
+                    {nameof(RB_Carrier_Extend.AreaRequirement ),model.AreaRequirement  },
+                    {nameof(RB_Carrier_Extend.EndAreaRequirement),model.EndAreaRequirement },
+                    {nameof(RB_Carrier_Extend.BuiltUpArea),model.BuiltUpArea },
+                    {nameof(RB_Carrier_Extend.EndBuiltUpArea),model.EndBuiltUpArea },
+                    {nameof(RB_Carrier_Extend.FirstShopNum),model.FirstShopNum },
+                    {nameof(RB_Carrier_Extend.StartingInfo),model.StartingInfo }
 
                 };
                 flag = carrierRepository.Update(fileds, new WhereHelper(nameof(RB_Carrier_Extend.ID), model.ID));

Mall.WebApi/Controllers/TradePavilion/AppletTradeController.cs

@@ -471,6 +471,19 @@ namespace Mall.WebApi.Controllers.TradePavilion
             if (oldModel == null) { return ApiResult.Failed("载体不存在"); }
             if (oldModel.UserId != userInfo.UserId) { return ApiResult.Failed("无法修改此载体"); }
 
+
+            if (!string.IsNullOrWhiteSpace(query.StartingInfo) && !string.IsNullOrWhiteSpace(query.Discount))
+            {
+                query.FirstStoreTest = 1;
+            }
+
+            if (query.OpenTime.HasValue)
+            {
+                if (query.OpenTime.Value <= System.DateTime.Now)
+                {
+                    query.OpeningStatus = 1;
+                }
+            }
             bool flag = carrierModule.SetCarrier(query);
             return flag ? ApiResult.Success() : ApiResult.Failed();
         }