课程和购物车调整

Mall.Model/Extend/Product/RB_Goods_ShoppingCart_Extend.cs

@@ -24,6 +24,11 @@ namespace Mall.Model.Extend.Product
         /// </summary>
         public decimal? CourseScore { get; set; }
 
+        /// <summary>
+        /// 商品类型   2网课商品
+        /// </summary>
+        public int GoodsClassify { get; set; }
+
         /// <summary>
         /// 商品状态   1销售中  2下架中  3 失效
         /// </summary>        

Mall.Module.Product/OrderModule.cs

@@ -360,6 +360,13 @@ namespace Mall.Module.Product
                     smallPList = smallShops_PriceRepository.GetList(new RB_SmallShops_Price_Extend() { SmallShopsId = demodel.SmallShopsId, GoodsIds = goodsIds });
                 }
                 #endregion
+                #region 课程购买
+                List<RB_Goods_Order_Extend> CourseOrderList = new List<RB_Goods_Order_Extend>();
+                if (demodel.GoodsClassify == 2)
+                {
+                    CourseOrderList = goods_OrderRepository.GetCourseOrderIsPay(GoodsIds: goodsIds, UserId: demodel.UserId ?? 0);
+                }
+                #endregion
                 foreach (var item in list)
                 {
                     item.CoverImage = "";
@@ -388,6 +395,15 @@ namespace Mall.Module.Product
                             item.GoodsStatus = 3;
                         }
                     }
+                    //验证课程是否已下单
+                    if (demodel.GoodsClassify == 2)
+                    {
+                        var coModel = CourseOrderList.Where(x => x.GoodsId == item.GoodsId).FirstOrDefault();
+                        if (coModel != null)
+                        {
+                            item.GoodsStatus = 3;
+                        }
+                    }
                     //规格赋值
                     item.SpecificationList = new List<string>();
                     if (item.GoodsStatus != 3)
@@ -550,8 +566,6 @@ namespace Mall.Module.Product
                     {
                         item.FreeShippingModel = new RB_FreeShipping_Extend();
                     }
-
-
                 }
             }
             return list;

Mall.Repository/Product/RB_Goods_ShoppingCartRepository.cs

@@ -49,7 +49,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,g.MarketingLogo,g.CourseScore from RB_Goods_ShoppingCart sc
+g.EnjoyMember,g.SeparateSetMember,g.InventoryNum,g.FullNumPinkage,g.FullMoneyPinkage,g.MarketingLogo,g.CourseScore,g.GoodsClassify 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/Education/EducationController.cs

@@ -347,7 +347,7 @@ namespace Mall.WebApi.Controllers.Education
             {
                 return ApiResult.ParamIsNull("请输入售价");
             }
-            if ((demodel.OriginalPrice ?? 0) <= 0)
+            if ((demodel.OriginalPrice ?? 0) < 0)
             {
                 return ApiResult.ParamIsNull("请输入原价");
             }

Mall.WebApi/Controllers/Product/AppletOrderController.cs

@@ -71,10 +71,10 @@ namespace Mall.WebApi.Controllers.MallBase
                 x.GoodsName,
                 x.CoverImage,
                 x.Price,
-                x.InventoryNum,
+                InventoryNum = x.GoodsClassify == 2 ? 1 : x.InventoryNum,
                 x.SpecificationList,
                 x.SpecificationSort,
-                x.Number,
+                Number = x.GoodsClassify == 2 ? 1 : x.Number,
                 x.GoodsStatus,
                 x.TenantId,
                 x.MallBaseId,