提交商品新增营销标识字段

Mall.Model/Entity/Product/RB_Goods.cs

@@ -434,5 +434,11 @@ namespace Mall.Model.Entity.Product
         /// 副标题
         /// </summary>
         public string SubName { get; set; }
+
+
+        /// <summary>
+        /// 营销标识（文字+文字颜色+文字背景/  图标）
+        /// </summary>
+        public string MarketingLogo { get; set; }
     }
 }

Mall.Model/Extend/Product/RB_Goods_ShoppingCart_Extend.cs

@@ -94,5 +94,10 @@ namespace Mall.Model.Extend.Product
             get;
             set;
         }
+
+        /// <summary>
+        /// 营销标识
+        /// </summary>
+        public string MarketingLogo { get; set; }
     }
 }

Mall.Module.Product/OrderModule.cs

@@ -1997,6 +1997,7 @@ namespace Mall.Module.Product
                         sign = "",
                         confine_order_count = gmodel.LimitBuyOrderNum,//限制订单数量
                         form_id = gmodel.FormsId,//表单id
+                        marketingLogo= gmodel.MarketingLogo
                         //goodsWarehouse = new
                         //{
                         //    id = 19813,

Mall.Module.Product/ProductModule.cs

@@ -2008,6 +2008,7 @@ namespace Mall.Module.Product
                     fullMoneyPinkage = model.FreeShippingModel.FullMoneyPinkage ?? 0,
                     fullNumPinkage = model.FreeShippingModel.FullNumPinkage ?? 0,
                     freeShippingUrl = model.FreeShippingModel.FreeShippingUrl,
+                    marketingLogo= model.MarketingLogo,
                     cats = model.CategoryList.Select(x => new
                     {
                         x.CategoryId,
@@ -3840,6 +3841,7 @@ namespace Mall.Module.Product
                          { nameof(RB_Goods.PresentFXMonth),demodel.PresentFXMonth},
                          { nameof(RB_Goods.Advertising),demodel.Advertising},
                          { nameof(RB_Goods.SubName),demodel.SubName},
+                           { nameof(RB_Goods.MarketingLogo),demodel.MarketingLogo},
                     };
                     if (goodsModel.IsProcurement == 1)
                     {

Mall.Repository/Product/RB_Goods_ShoppingCartRepository.cs

@@ -45,7 +45,7 @@ namespace Mall.Repository.Product
             }
             
             string sql = $@"select sc.*,g.Name as GoodsName,g.GoodsStatus,g.CarouselImage,g.SellingPrice as Price,g.IsCustomSpecification,g.DefaultSpecificationName,
-g.EnjoyMember,g.SeparateSetMember,g.InventoryNum,g.FullNumPinkage,g.FullMoneyPinkage from RB_Goods_ShoppingCart sc
+g.EnjoyMember,g.SeparateSetMember,g.InventoryNum,g.FullNumPinkage,g.FullMoneyPinkage,g.MarketingLogo from RB_Goods_ShoppingCart sc
 inner join RB_Goods g on sc.GoodsId=g.Id
 where {where} order by g.GoodsStatus asc,sc.CreateDate desc";
             return GetPage<RB_Goods_ShoppingCart_Extend>(pageIndex, pageSize, out rowCount, sql).ToList();

Mall.WebApi/Controllers/Product/AppletGoodsController.cs

@@ -343,7 +343,8 @@ namespace Mall.WebApi.Controllers.MallBase
                         }),
                         attr = priceList,
                         goods_stock = model.InventoryNum,
-                        goods_num = model.InventoryNum
+                        goods_num = model.InventoryNum,
+                        marketingLogo= model.MarketingLogo
                     });
                 }
             }

Mall.WebApi/Controllers/Product/AppletOrderController.cs

@@ -68,6 +68,7 @@ namespace Mall.WebApi.Controllers.MallBase
                 FreeShippingFullMoneyPinkage = x.FreeShippingModel.FullMoneyPinkage ?? 0,
                 FreeShippingFullNumPinkage = x.FreeShippingModel.FullNumPinkage ?? 0,
                 x.FreeShippingModel.FreeShippingUrl,
+                x.MarketingLogo
             });
             List<object> robj = new List<object>() {
                  new {

Mall.WebApi/Controllers/Product/ProductController.cs

@@ -1546,7 +1546,8 @@ namespace Mall.WebApi.Controllers.MallBase
                 model.PresentFXGrade,
                 model.PresentFXMonth,
                 model.Advertising,
-                model.SubName
+                model.SubName,
+                model.MarketingLogo
             });
         }