Commit 3518c518 authored by 黄奎's avatar 黄奎

页面修改

parent f6c58a4b
...@@ -4915,6 +4915,7 @@ namespace Mall.Module.Product ...@@ -4915,6 +4915,7 @@ namespace Mall.Module.Product
} }
decimal TotalMoney = 0; decimal TotalMoney = 0;
decimal TotalDepositMoney = 0;//总定金
string GoodsIds = ""; string GoodsIds = "";
int TotalIntegralNumber = 0;//总使用积分 int TotalIntegralNumber = 0;//总使用积分
decimal TotalIntegralMoney = 0;//总使用积分抵扣金额 decimal TotalIntegralMoney = 0;//总使用积分抵扣金额
...@@ -5068,6 +5069,7 @@ namespace Mall.Module.Product ...@@ -5068,6 +5069,7 @@ namespace Mall.Module.Product
foreach (var item in demodel.DetailList) foreach (var item in demodel.DetailList)
{ {
var gmodel = gList.Where(x => x.Id == item.GoodsId).FirstOrDefault(); var gmodel = gList.Where(x => x.Id == item.GoodsId).FirstOrDefault();
if (gmodel == null || gmodel.GoodsStatus != 1) if (gmodel == null || gmodel.GoodsStatus != 1)
{ {
...@@ -5079,6 +5081,7 @@ namespace Mall.Module.Product ...@@ -5079,6 +5081,7 @@ namespace Mall.Module.Product
message = "有非线下服务类商品"; message = "有非线下服务类商品";
return false; return false;
} }
TotalDepositMoney += gmodel.DepositMoney*(item?.Number??0);
var categoryList = clist.Where(x => x.GoodsId == item.GoodsId).ToList(); var categoryList = clist.Where(x => x.GoodsId == item.GoodsId).ToList();
item.CommissionPrice = gmodel.Commission;// 粉象 返佣金额 item.CommissionPrice = gmodel.Commission;// 粉象 返佣金额
...@@ -5555,11 +5558,27 @@ namespace Mall.Module.Product ...@@ -5555,11 +5558,27 @@ namespace Mall.Module.Product
return false; return false;
} }
//验证总额 if (demodel.PaymentWay == OrderPaymentTypeEnum.OnlinePayment)
if (demodel.Income != (TotalMoney - EducationMoney))
{ {
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; demodel.PreferPrice = TotalMoney + CouponsMoney;
......
...@@ -74,8 +74,8 @@ namespace Mall.WebApi.Controllers ...@@ -74,8 +74,8 @@ namespace Mall.WebApi.Controllers
{ {
get { get {
var parm = this.RequestParm; var parm = this.RequestParm;
// AppletUserInfo userInfo = UserReidsCache.GetAppletUserLoginInfo(parm.uid); AppletUserInfo userInfo = UserReidsCache.GetAppletUserLoginInfo(parm.uid);
AppletUserInfo userInfo = UserReidsCache.GetAppletUserLoginInfo("112603"); // AppletUserInfo userInfo = UserReidsCache.GetAppletUserLoginInfo("112603");
return userInfo; return userInfo;
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment