页面修改

Mall.Module.Product/OrderModule.cs

@@ -4915,6 +4915,7 @@ namespace Mall.Module.Product
             }
 
             decimal TotalMoney = 0;
+            decimal TotalDepositMoney = 0;//总定金
             string GoodsIds = "";
             int TotalIntegralNumber = 0;//总使用积分
             decimal TotalIntegralMoney = 0;//总使用积分抵扣金额
@@ -5068,6 +5069,7 @@ namespace Mall.Module.Product
 
                 foreach (var item in demodel.DetailList)
                 {
+                  
                     var gmodel = gList.Where(x => x.Id == item.GoodsId).FirstOrDefault();
                     if (gmodel == null || gmodel.GoodsStatus != 1)
                     {
@@ -5079,6 +5081,7 @@ namespace Mall.Module.Product
                         message = "有非线下服务类商品";
                         return false;
                     }
+                    TotalDepositMoney += gmodel.DepositMoney*(item?.Number??0);
                     var categoryList = clist.Where(x => x.GoodsId == item.GoodsId).ToList();
 
                     item.CommissionPrice = gmodel.Commission;// 粉象 返佣金额
@@ -5555,11 +5558,27 @@ namespace Mall.Module.Product
                 return false;
             }
 
-            //验证总额
-            if (demodel.Income != (TotalMoney - EducationMoney))
+            if (demodel.PaymentWay == OrderPaymentTypeEnum.OnlinePayment)
             {
-                message = "订单合计金额不正确";
-                return false;
+                //验证总额
+                if (demodel.Income != (TotalMoney - EducationMoney))
+                {
+                    message = "订单合计金额不正确";
+                    return false;
+                }
+            }
+            if (demodel.PaymentWay == OrderPaymentTypeEnum.PayDeposit)
+            {
+                //验证总额
+                if (demodel.Income != (TotalDepositMoney - EducationMoney))
+                {
+                    message = "订单合计金额不正确";
+                    return false;
+                }
+            }
+            if (demodel.PaymentWay == OrderPaymentTypeEnum.OfflinePay)
+            {
+                demodel.OrderStatus = OrderStatusEnum.WaitReceiving;
             }
             demodel.PreferPrice = TotalMoney + CouponsMoney;
 

Mall.WebApi/Controllers/BaseController.cs

@@ -74,8 +74,8 @@ namespace Mall.WebApi.Controllers
         {
             get {
                 var parm = this.RequestParm;
-               // AppletUserInfo userInfo = UserReidsCache.GetAppletUserLoginInfo(parm.uid);
-                AppletUserInfo userInfo = UserReidsCache.GetAppletUserLoginInfo("112603");
+                AppletUserInfo userInfo = UserReidsCache.GetAppletUserLoginInfo(parm.uid);
+               // AppletUserInfo userInfo = UserReidsCache.GetAppletUserLoginInfo("112603");
                 return userInfo;
             }
         }