|
@@ -3169,7 +3169,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
|
|
|
|
|
|
// 更新订单信息
|
|
|
studentPaymentOrder.setActualAmount(new BigDecimal(0));
|
|
|
- studentPaymentOrder.setBalancePaymentAmount(studentPaymentOrder.getExpectAmount());
|
|
|
+ studentPaymentOrder.setBalancePaymentAmount(studentPaymentOrder.getExpectAmount().subtract(studentPaymentOrder.getCouponRemitFee()));
|
|
|
studentPaymentOrder.setStatus(DealStatusEnum.SUCCESS);
|
|
|
studentPaymentOrder.setUpdateTime(now);
|
|
|
studentPaymentOrder.setOrganId(practiceGroupBuyParams.getOrganId());
|
|
@@ -3188,7 +3188,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
|
|
|
if (userCashAccount.getBalance().doubleValue() > 0) {
|
|
|
balance = userCashAccount.getBalance();
|
|
|
sysUserCashAccountService.updateBalance(practiceGroupBuyParams.getStudentId(), balance.negate(), PlatformCashAccountDetailTypeEnum.PAY_FEE, "网管课购买");
|
|
|
- amount = studentPaymentOrder.getExpectAmount().subtract(userCashAccount.getBalance());
|
|
|
+ amount = studentPaymentOrder.getExpectAmount().subtract(userCashAccount.getBalance()).subtract(studentPaymentOrder.getCouponRemitFee());
|
|
|
studentPaymentOrder.setActualAmount(amount);
|
|
|
studentPaymentOrder.setBalancePaymentAmount(userCashAccount.getBalance());
|
|
|
} else {
|