提交

Mall.Model/Entity/Product/RB_Goods.cs

@@ -454,5 +454,10 @@ namespace Mall.Model.Entity.Product
         /// 自动下架时间
         /// </summary>
         public DateTime? DownDate { get; set; }
+
+        /// <summary>
+        /// 发货地
+        /// </summary>
+        public string SendArea { get; set; }
     }
 }

Mall.Module.Product/ProductModule.cs

@@ -2297,6 +2297,7 @@ namespace Mall.Module.Product
                     isAllowShare = IsAllowShare,//是否可以分享
                     advertising = model.Advertising,//广告词
                     price = model.SellingPrice,
+                    sendArea = model.SendArea,
                     use_attr = model.IsCustomSpecification,
                     attr_groups = model.SpecificationList.Select(x => new
                     {
@@ -4309,6 +4310,8 @@ namespace Mall.Module.Product
                         { nameof(RB_Goods.IsLiveGoods),demodel.IsLiveGoods},
                         { nameof(RB_Goods.ShelvesDate),demodel.ShelvesDate },
                         { nameof(RB_Goods.DownDate),demodel.DownDate },
+                         { nameof(RB_Goods.SendArea),demodel.SendArea },
+
                     };
                     if (goodsModel.IsProcurement == 1)
                     {
@@ -4346,7 +4349,8 @@ namespace Mall.Module.Product
                         { nameof(RB_Goods.EnjoyMember),demodel.EnjoyMember},
                         { nameof(RB_Goods.SeparateSetMember),demodel.SeparateSetMember},
                         { nameof(RB_Goods.IsQuickBuy),demodel.IsQuickBuy},
-                        { nameof(RB_Goods.SupplierId),demodel.SupplierId}
+                        { nameof(RB_Goods.SupplierId),demodel.SupplierId},
+                       
                     };
                     }
                     List<WhereHelper> wheres = new List<WhereHelper>() {
@@ -4469,13 +4473,13 @@ namespace Mall.Module.Product
                                     foreach (var item in slist)
                                     {
                                         var supmodel = demodel.SpecificationList.Where(x => x.Id == item.Id).FirstOrDefault();
-                                        Dictionary<string, object> keyValues1 = new Dictionary<string, object>() 
+                                        Dictionary<string, object> keyValues1 = new Dictionary<string, object>()
                                         {
                                             { nameof(RB_Goods_Specification.EnabledImage),supmodel.EnabledImage},
                                             { nameof(RB_Goods_Specification.Name),supmodel.Name},
                                             { nameof(RB_Goods_Specification.Sort),supmodel.Sort}
                                         };
-                                        List<WhereHelper> wheres1 = new List<WhereHelper>() 
+                                        List<WhereHelper> wheres1 = new List<WhereHelper>()
                                         {
                                             new WhereHelper()
                                             {
@@ -4990,12 +4994,12 @@ namespace Mall.Module.Product
                         }
                     }
                 }
-      
+
                 return true;
             }
             catch (Exception ex)
             {
-                LogHelper.Write(ex, "SetProductGoodsInfo:"+Common.Plugin.JsonHelper.Serialize(demodel));
+                LogHelper.Write(ex, "SetProductGoodsInfo:" + Common.Plugin.JsonHelper.Serialize(demodel));
                 return false;
             }
         }

Mall.WebApi/Controllers/Product/ProductController.cs

@@ -1182,6 +1182,7 @@ namespace Mall.WebApi.Controllers.MallBase
                 x.GoodsStatus,
                 x.TenantId,
                 x.MallBaseId,
+                x.SendArea,
                 CreateDate = x.CreateDate.HasValue ? x.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : ""
             });
             return ApiResult.Success("", pagelist);
@@ -1425,6 +1426,7 @@ namespace Mall.WebApi.Controllers.MallBase
                 x.GoodsService,
                 x.SpecificationList,
                 x.SpecificationPriceList,
+                x.SendArea,
             });
             return ApiResult.Success("", pagelist);
         }
@@ -1498,6 +1500,7 @@ namespace Mall.WebApi.Controllers.MallBase
                 model?.IsProcurement,
                 model?.Commission,
                 model?.IsLiveGoods,
+                model.SendArea,
                 CategoryList = model?.CategoryList.Select(x => new
                 {
                     x.Id,
@@ -2052,6 +2055,7 @@ namespace Mall.WebApi.Controllers.MallBase
             demodel.Advertising ??= "";//广告词
             demodel.SubName ??= "";//副标题
             demodel.IsLiveGoods ??= 2;//是否直播商品  1是  2否
+            demodel.SendArea ??= "";//发货地
             if (demodel.IsProxy == 1 && demodel.CostPrice > 0)
             {
                 decimal ProxyMoney = 0;