页面修改

Mall.Model/Entity/Product/RB_Goods_Order.cs

@@ -372,5 +372,9 @@ namespace Mall.Model.Entity.Product
         /// </summary>
         public int OrderEduType { get; set; }
 
+        /// <summary>
+        /// 进阶思维rb_student表中StuId学生编号
+        /// </summary>
+        public int JJSWStuId { get; set; }
     }
 }

Mall.Module.Product/OrderModule_Part.cs

@@ -40,37 +40,37 @@ namespace Mall.Module.Product
         /// <summary>
         /// 用户课程卡
         /// </summary>
-        private RB_Education_MemberCouponRepository education_MemberCouponRepository = new RB_Education_MemberCouponRepository();
+        private readonly RB_Education_MemberCouponRepository education_MemberCouponRepository = new RB_Education_MemberCouponRepository();
         /// <summary>
         /// 课程卡实体
         /// </summary>
-        private RB_Education_CouponRepository education_CouponRepository = new RB_Education_CouponRepository();
+        private readonly RB_Education_CouponRepository education_CouponRepository = new RB_Education_CouponRepository();
         /// <summary>
         /// 课程卡适配
         /// </summary>
-        private RB_Education_CouponProductRepository education_CouponProductRepository = new RB_Education_CouponProductRepository();
+        private readonly RB_Education_CouponProductRepository education_CouponProductRepository = new RB_Education_CouponProductRepository();
         /// <summary>
         /// 课程卡使用
         /// </summary>
-        private RB_Education_MemberUseCouponRepository education_MemberUseCouponRepository = new RB_Education_MemberUseCouponRepository();
+        private readonly RB_Education_MemberUseCouponRepository education_MemberUseCouponRepository = new RB_Education_MemberUseCouponRepository();
 
         /// <summary>
         /// 套餐卡
         /// </summary>
-        private RB_Reserve_MemberCouponRepository reserve_MemberCouponRepository = new RB_Reserve_MemberCouponRepository();
+        private readonly RB_Reserve_MemberCouponRepository reserve_MemberCouponRepository = new RB_Reserve_MemberCouponRepository();
 
         /// <summary>
         /// 套餐卡实体
         /// </summary>
-        private RB_Reserve_CouponRepository reserve_CouponRepository = new RB_Reserve_CouponRepository();
+        private readonly RB_Reserve_CouponRepository reserve_CouponRepository = new RB_Reserve_CouponRepository();
         /// <summary>
         /// 套餐卡适配
         /// </summary>
-        private RB_Reserve_CouponProductRepository reserve_CouponProductRepository = new RB_Reserve_CouponProductRepository();
+        private readonly RB_Reserve_CouponProductRepository reserve_CouponProductRepository = new RB_Reserve_CouponProductRepository();
         /// <summary>
         /// 套餐卡使用
         /// </summary>
-        private RB_Reserve_MemberUseCouponRepository reserve_MemberUseCouponRepository = new RB_Reserve_MemberUseCouponRepository();
+        private readonly RB_Reserve_MemberUseCouponRepository reserve_MemberUseCouponRepository = new RB_Reserve_MemberUseCouponRepository();
         /// <summary>
         /// 教育商品订单
         /// </summary>
@@ -697,7 +697,7 @@ namespace Mall.Module.Product
             var IntegralObj = new
             {
                 can_use = IsPointsDeduction,
-                use = demodel.Use_Integral == 1 ? true : false,
+                use = demodel.Use_Integral == 1,
                 use_num = Total_use_integral,
                 deduction_price = Total_integral_price
             };
@@ -729,14 +729,14 @@ namespace Mall.Module.Product
                 coupon = new
                 {
                     enabled = true,
-                    use = CouponsMoney > 0 && demodel.User_Coupon_Id > 0 ? true : false,
+                    use = CouponsMoney > 0 && demodel.User_Coupon_Id > 0,
                     coupon_discount = CouponsMoney,
                     user_coupon_id = CouponsMoney > 0 ? demodel.User_Coupon_Id ?? 0 : 0
                 },
                 integral = IntegralObj,
                 education = new {
                     enabled = true,
-                    use = demodel.Use_Education_Id > 0 ? true : false,
+                    use = demodel.Use_Education_Id > 0,
                     use_education_id = demodel.Use_Education_Id ?? 0,
                     education_money = EducationMoney,
                     education_num = EducationNum //抵扣几套课程

Mall.WebApi/Controllers/AppletWeChat/WeChatPayController.cs

@@ -1001,7 +1001,7 @@ namespace Mall.WebApi.Controllers.AppletWeChat
         [Microsoft.AspNetCore.Authorization.AllowAnonymous]
         public ApiResult SetActivityEnrollInfoJXH()
         {
-            bool flag = false;
+            bool flag;
             var request = RequestParm;
             var userInfo = AppletUserInfo;
             if (userInfo == null)
@@ -1134,10 +1134,6 @@ namespace Mall.WebApi.Controllers.AppletWeChat
             }
             return ApiResult.Failed("支付方式错误");
         }
-
         #endregion
-
-
-
     }
 }
\ No newline at end of file

Mall.WebApi/Controllers/Product/AppletOrderController.cs

@@ -486,13 +486,16 @@ namespace Mall.WebApi.Controllers.MallBase
             }
             if (demodel.OrderEduType != 1)
             {
-                if (string.IsNullOrEmpty(demodel.Consignee))
+                if (  demodel.JJSWStuId <= 0)
                 {
-                    return ApiResult.ParamIsNull("请传递收件人");
-                }
-                if (string.IsNullOrEmpty(demodel.Mobile))
-                {
-                    return ApiResult.ParamIsNull("请传递收件人手机号码");
+                    if (string.IsNullOrEmpty(demodel.Consignee))
+                    {
+                        return ApiResult.ParamIsNull("请传递收件人");
+                    }
+                    if (string.IsNullOrEmpty(demodel.Mobile))
+                    {
+                        return ApiResult.ParamIsNull("请传递收件人手机号码");
+                    }
                 }
             }
             if (demodel.DeliveryMethod != Common.Enum.Goods.OrderDeliveryMethodEnum.VerificationShop)