111

Mall.Module.TradePavilion/CarrierModule.cs

@@ -249,9 +249,9 @@ namespace Mall.Module.TradePavilion
                     {nameof(RB_Carrier_Extend.CarrierTarget),model.CarrierTarget },
                     {nameof(RB_Carrier_Extend.Location),model.Location },
                     {nameof(RB_Carrier_Extend.Crowd),model.Crowd },
-                     {nameof(RB_Carrier_Extend.FirstStoreTest),model.FirstStoreTest },
-                     {nameof(RB_Carrier_Extend.OpeningStatus),model.OpeningStatus },
-                      {nameof(RB_Carrier_Extend.Discount),model.Discount },
+                    {nameof(RB_Carrier_Extend.FirstStoreTest),model.FirstStoreTest },
+                    {nameof(RB_Carrier_Extend.OpeningStatus),model.OpeningStatus },
+                    {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 },
@@ -261,36 +261,39 @@ namespace Mall.Module.TradePavilion
                     {nameof(RB_Carrier_Extend.EndBuiltUpArea),model.EndBuiltUpArea },
                     {nameof(RB_Carrier_Extend.FirstShopNum),model.FirstShopNum },
                     {nameof(RB_Carrier_Extend.StartingInfo),model.StartingInfo },
-                     {nameof(RB_Carrier_Extend.ContactPhone),model.ContactPhone },
+                    {nameof(RB_Carrier_Extend.ContactPhone),model.ContactPhone },
                     {nameof(RB_Carrier_Extend.ContactName),model.ContactName }
 
                 };
                 flag = carrierRepository.Update(fileds, new WhereHelper(nameof(RB_Carrier_Extend.ID), model.ID));
-                if (flag)
-                {
-                    var oldCarrierMetroList = carrierMetroRepository.GetCarrierMetroList(new RB_CarrierMetro_Extend { TenantId = model.TenantId, MallBaseId = model.MallBaseId, CarrierId = model.ID });
-                    carrierMetroRepository.DeleteBatch(oldCarrierMetroList);
-                    model.CarrierMetroList.ForEach(x => x.CarrierId = model.ID);
-                    model.CarrierMetroList.ForEach(x => x.Status = 0);
-                    model.CarrierMetroList.ForEach(x => x.TenantId = model.TenantId);
-                    model.CarrierMetroList.ForEach(x => x.MallBaseId = model.MallBaseId);
-                    carrierMetroRepository.InsertBatch(model.CarrierMetroList);
-                }
+              
             }
             else
             {
                 Id = carrierRepository.Insert(model);
-                if (Id > 0)
+                model.ID = Id;
+                flag = Id > 0;
+            }
+
+            if (flag)
+            {
+                var oldCarrierMetroList = carrierMetroRepository.GetCarrierMetroList(new RB_CarrierMetro_Extend { TenantId = model.TenantId, MallBaseId = model.MallBaseId, CarrierId = model.ID });
+                if (oldCarrierMetroList != null && oldCarrierMetroList.Count > 0)
+                {
+                    carrierMetroRepository.DeleteBatch(oldCarrierMetroList);
+                }
+                if (model.CarrierMetroList != null && model.CarrierMetroList.Count > 0)
                 {
-                    model.CarrierMetroList.ForEach(x => x.CarrierId = Id);
-                    model.CarrierMetroList.ForEach(x => x.Status = 0);
-                    model.CarrierMetroList.ForEach(x => x.TenantId = model.TenantId);
-                    model.CarrierMetroList.ForEach(x => x.MallBaseId = model.MallBaseId);
+                    foreach (var item in model.CarrierMetroList)
+                    {
+                        item.CarrierId = model.ID;
+                        item.Status = 0;
+                        item.TenantId = model.TenantId;
+                        item.MallBaseId = model.MallBaseId;
+                    }
                     carrierMetroRepository.InsertBatch(model.CarrierMetroList);
                 }
-                flag = Id > 0;
             }
-
             return flag;
         }
 

Mall.WebApi/Controllers/TradePavilion/TradeController.cs

@@ -1688,11 +1688,11 @@ namespace Mall.WebApi.Controllers.TradePavilion
             {
                 query.FirstShopNum = "";
             }
+            query.MallBaseId = RequestParm.MallBaseId;
+            query.TenantId = RequestParm.TenantId;
             if (query.ID == 0)
             {
                 query.CreateDate = System.DateTime.Now;
-                query.MallBaseId = RequestParm.MallBaseId;
-                query.TenantId = RequestParm.TenantId;
             }
             if (!string.IsNullOrWhiteSpace(query.StartingInfo))
             {
@@ -1709,6 +1709,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
             query.EndAreaRequirement ??= 0;
             query.YeJi ??= 0;
             query.UpdateDate = System.DateTime.Now;
+            
             bool flag = carrierModule.SetCarrier(query);
             return flag ? ApiResult.Success() : ApiResult.Failed();
         }