|
|
@ -306,7 +306,8 @@ namespace BBWY.Server.Business |
|
|
|
if (orderCouponDetailResponse.Success) |
|
|
|
{ |
|
|
|
var jtoken = orderCouponDetailResponse.Data["jingdong_pop_order_queryCouponDetai_responce"]["couponDetailExternal"]["couponDetailVo"]; |
|
|
|
|
|
|
|
if (jtoken.Value<decimal>("totalShouldPay") > 0M) |
|
|
|
{ |
|
|
|
#region 订单合计信息
|
|
|
|
var orderTotal = new OrderTotalInfo() |
|
|
|
{ |
|
|
@ -449,7 +450,7 @@ namespace BBWY.Server.Business |
|
|
|
} |
|
|
|
} |
|
|
|
#endregion
|
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
@ -725,6 +726,17 @@ namespace BBWY.Server.Business |
|
|
|
orderState != null && |
|
|
|
orderState != Enums.OrderState.待付款 && |
|
|
|
orderState != Enums.OrderState.已取消) |
|
|
|
{ |
|
|
|
bool checkOrderTotal = true; |
|
|
|
if (dbOrder.StorageType == Enums.StorageType.京仓 || dbOrder.StorageType == Enums.StorageType.云仓) |
|
|
|
{ |
|
|
|
var orderTotalInfo = insertOrderTotalInfoList.FirstOrDefault(x => x.Id == dbOrder.Id); |
|
|
|
if (orderTotalInfo == null) |
|
|
|
orderTotalInfo = dbOrderTotalList.FirstOrDefault(x => x.Id == dbOrder.Id); |
|
|
|
if (orderTotalInfo == null || orderTotalInfo.TotalShouldPay == 0M) |
|
|
|
checkOrderTotal = false; |
|
|
|
} |
|
|
|
if (checkOrderTotal) |
|
|
|
{ |
|
|
|
var orderCost = dbOrderCostList.FirstOrDefault(oc => oc.OrderId == dbOrder.Id); |
|
|
|
if (orderCost == null && orderSellerPrice > 0M) |
|
|
@ -923,6 +935,7 @@ namespace BBWY.Server.Business |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
#endregion
|
|
|
|
|
|
|
|
#region 检查订单信息是否变化
|
|
|
|