购物车调整 + 教育订单付款后调整+返佣

Mall.Model/Extend/Product/RB_Goods_ShoppingCart_Extend.cs

@@ -19,6 +19,11 @@ namespace Mall.Model.Extend.Product
         /// </summary>
         public string GoodsName { get; set; }
 
+        /// <summary>
+        /// 课程评分
+        /// </summary>
+        public decimal? CourseScore { get; set; }
+
         /// <summary>
         /// 商品状态   1销售中  2下架中  3 失效
         /// </summary>        

Mall.Repository/Product/RB_Goods_ShoppingCartRepository.cs

@@ -43,9 +43,13 @@ namespace Mall.Repository.Product
             if (dmodel.GoodsStatus > 0) {
                 where += $@" and g.{nameof(RB_Goods_Extend.GoodsStatus)}={dmodel.GoodsStatus}";
             }
+            if (dmodel.GoodsClassify >= 0)
+            {
+                where += $@" and g.{nameof(RB_Goods_Extend.GoodsClassify)}={dmodel.GoodsClassify}";
+            }
 
             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,g.MarketingLogo from RB_Goods_ShoppingCart sc
+g.EnjoyMember,g.SeparateSetMember,g.InventoryNum,g.FullNumPinkage,g.FullMoneyPinkage,g.MarketingLogo,g.CourseScore 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/AppletOrderController.cs

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