Merge branch 'master' of http://gitlab.oytour.com/Kui2/mall.oytour.com

Mall.Model/Entity/Product/RB_Goods.cs

@@ -440,5 +440,9 @@ namespace Mall.Model.Entity.Product
         /// 营销标识（文字+文字颜色+文字背景/  图标）
         /// </summary>
         public string MarketingLogo { get; set; }
+        /// <summary>
+        /// 是否是直播商品   1是   2否
+        /// </summary>
+        public int? IsLiveGoods { get; set; }
     }
 }

Mall.Model/Entity/Product/RB_Goods_OrderDetail.cs

@@ -238,5 +238,13 @@ namespace Mall.Model.Entity.Product
         /// 微店成本价格
         /// </summary>
         public decimal? SmallShopsCostPrice { get; set; }
+        /// <summary>
+        /// 主播佣金
+        /// </summary>
+        public decimal? LiveCommission { get; set; }
+        /// <summary>
+        /// 主播佣金生成的财务单据   逗号分隔
+        /// </summary>
+        public string LiveFinanceIds { get; set; }
     }
 }

Mall.Module.Product/ProductModule.cs

@@ -4266,12 +4266,13 @@ namespace Mall.Module.Product
                         { nameof(RB_Goods.ProxyType),demodel.ProxyType},
                         { nameof(RB_Goods.ProxyRises),demodel.ProxyRises},
                         { nameof(RB_Goods.ProxyMoney),demodel.ProxyMoney},
-                         { nameof(RB_Goods.Commission),demodel.Commission},
-                         { nameof(RB_Goods.PresentFXGrade),demodel.PresentFXGrade},
-                         { nameof(RB_Goods.PresentFXMonth),demodel.PresentFXMonth},
-                         { nameof(RB_Goods.Advertising),demodel.Advertising},
-                         { nameof(RB_Goods.SubName),demodel.SubName},
-                           { nameof(RB_Goods.MarketingLogo),demodel.MarketingLogo},
+                        { nameof(RB_Goods.Commission),demodel.Commission},
+                        { nameof(RB_Goods.PresentFXGrade),demodel.PresentFXGrade},
+                        { nameof(RB_Goods.PresentFXMonth),demodel.PresentFXMonth},
+                        { nameof(RB_Goods.Advertising),demodel.Advertising},
+                        { nameof(RB_Goods.SubName),demodel.SubName},
+                        { nameof(RB_Goods.MarketingLogo),demodel.MarketingLogo},
+                        { nameof(RB_Goods.IsLiveGoods),demodel.IsLiveGoods},
                     };
                     if (goodsModel.IsProcurement == 1)
                     {

Mall.WebApi/Controllers/Product/ProductController.cs

@@ -1474,6 +1474,7 @@ namespace Mall.WebApi.Controllers.MallBase
                 model.ProxyMoney,
                 model.IsProcurement,
                 model.Commission,
+                model.IsLiveGoods,
                 CategoryList = model.CategoryList.Select(x => new
                 {
                     x.Id,
@@ -2016,6 +2017,7 @@ namespace Mall.WebApi.Controllers.MallBase
 
             demodel.Advertising ??= "";//广告词
             demodel.SubName ??= "";//副标题
+            demodel.IsLiveGoods ??= 2;//是否直播商品  1是  2否
             if (demodel.IsProxy == 1 && demodel.CostPrice > 0)
             {
                 decimal ProxyMoney = 0;