Merge branch 'HK' of http://gitlab.oytour.com/Kui2/mall.oytour.com into sdzq

Mall.Module.Product/ProductModule.cs

@@ -1498,6 +1498,7 @@ namespace Mall.Module.Product
             //2020-08-05  根据分类查找商品对应的分类包邮规则 add by :W 
             if (model.CategoryList != null && model.CategoryList.Any())
             {
+                
                 string categoryIds = string.Join(",", model.CategoryList.Select(x => x.CategoryId));
                 var freeShippingList = freeShippingRepository.GetFreeShippingListByCategoryIds(new RB_FreeShipping_Extend { MallBaseId = model.MallBaseId, TenantId = model.TenantId, CategoryIds = categoryIds });
                 if (freeShippingList != null && freeShippingList.Any() && ((model.FullNumPinkage ?? 0) == 0) && ((model.FullMoneyPinkage ?? 0) == 0))
@@ -2431,6 +2432,7 @@ namespace Mall.Module.Product
                     mall_id = model.MallBaseId,
                     mch_id = model.TenantId,//暂  商户id
                     //goods_warehouse_id = 0,//
+                    categoryIdList = model?.CategoryList?.Select(x => x.CategoryId ?? 0).ToList(),
                     status = model.GoodsStatus,
                     isAllowShare = IsAllowShare,//是否可以分享
                     advertising = model.Advertising,//广告词
@@ -3757,7 +3759,8 @@ namespace Mall.Module.Product
                         ReserveCount=qitem.OrderNum,
                         ServiceId=qitem.ID
                     }),
-                    storeDateList= storeDateList.Select(qitem => new {qitem.DayDateStr,qitem.WeekDayStr,qitem.TimeList})
+                    categoryIdList = model.CategoryList.Select(x => x.CategoryId ?? 0).ToList(),
+                    storeDateList = storeDateList.Select(qitem => new {qitem.DayDateStr,qitem.WeekDayStr,qitem.TimeList})
                 },
                 delivery = ""
             };