|
|
@@ -1029,8 +1029,6 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
|
|
|
setDistributeOrderMark(orderDon, goodsDon.getType(), userId);
|
|
|
}
|
|
|
orderDon.setRealMoney(orderDon.getMoney());
|
|
|
- //扣除使用优惠券、余额的订单金额
|
|
|
- deductOrderMoney(orderDon, couponUser, payRequest.getBalance(), user, sku.getPrice(), goodsDon.getType(), payRequest.getGcCash(), payRequest.getGcpIds(), false, null);
|
|
|
//独立规格续费升级
|
|
|
RenewUpgradePackage renewUpgradeIndependentPackage = null;
|
|
|
if ((payRequest.getPackageId() != null || payRequest.getOriginalOrderId() != null) && sku.getNum() == 1) {
|
|
|
@@ -1046,6 +1044,8 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
|
|
|
BigDecimal discount = renewUpgradeIndependentPackage.getDiscount();
|
|
|
orderDon.setMoney(sku.getPrice().multiply(discount));
|
|
|
}
|
|
|
+ //扣除使用优惠券、余额的订单金额
|
|
|
+ deductOrderMoney(orderDon, couponUser, payRequest.getBalance(), user, sku.getPrice(), goodsDon.getType(), payRequest.getGcCash(), payRequest.getGcpIds(), false, null);
|
|
|
this.saveOrUpdate(orderDon);
|
|
|
if (orderDon.getStatus() == OrderDon.Status.noPayment) {
|
|
|
jobManager.addJob(EXPIRY_TIME, () -> {
|