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

Mall.Model/Extend/Product/RB_Goods_Order_Extend.cs

@@ -166,6 +166,10 @@ namespace Mall.Model.Extend.Product
         /// </summary>
         public int? User_Coupon_Id { get; set; }
         /// <summary>
+        /// 使用课程卡id
+        /// </summary>
+        public int? Use_Education_Id { get; set; }
+        /// <summary>
         /// 优惠券描述
         /// </summary>
         public string CouponDestription { get; set; }

Mall.Module.Product/OrderModule.cs

@@ -37,7 +37,7 @@ namespace Mall.Module.Product
     /// <summary>
     /// 商品处理层
     /// </summary>
-    public class OrderModule
+    public partial class OrderModule
     {
         /// <summary>
         /// 素材管理

Mall.WebApi/Controllers/Education/EducationController.cs

@@ -399,7 +399,7 @@ namespace Mall.WebApi.Controllers.Education
                     {
                         return ApiResult.ParamIsNull("请传递视频封面图");
                     }
-                    if ((item.VideoTime ?? 0) <= 0)
+                    if ((item.VideoTime ?? 0) < 0)
                     {
                         return ApiResult.ParamIsNull("请传递视频时长");
                     }

Mall.WebApi/Controllers/Product/AppletOrderController.cs

@@ -387,6 +387,39 @@ namespace Mall.WebApi.Controllers.MallBase
             return orderModule.GetAppletGoodsSettlementInfoForZY(demodel);
         }
 
+        /// <summary>
+        /// 结算页面详情(教育)
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetAppletCourseSettlementInfo()
+        {
+            var req = RequestParm;
+            var userInfo = AppletUserInfo;
+            RB_Goods_Order_Extend demodel = JsonConvert.DeserializeObject<RB_Goods_Order_Extend>(req.msg.ToString());
+
+            if (demodel.DetailList == null || !demodel.DetailList.Any())
+            {
+                return ApiResult.ParamIsNull("请传递商品信息");
+            }
+            foreach (var item in demodel.DetailList)
+            {
+                if ((item.GoodsId ?? 0) <= 0)
+                {
+                    return ApiResult.ParamIsNull("请传递商品id");
+                }
+                if ((item.Number ?? 0) <= 0)
+                {
+                    return ApiResult.ParamIsNull("请传递商品数量");
+                }
+            }
+            demodel.TenantId = userInfo.TenantId;
+            demodel.MallBaseId = userInfo.MallBaseId;
+            demodel.UserId = userInfo.UserId;
+            demodel.SmallShopsId = req.SmallShopsId;
+            return orderModule.GetAppletCourseSettlementInfo(demodel);
+        }
+
         /// <summary>
         /// 结算页面修改快递，获取快递费用
         /// </summary>