diff --git a/src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java index 0127acb..470bc9d 100644 --- a/src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java @@ -324,6 +324,7 @@ public class CashRefundServiceImpl implements RefundService { if (cashRecordDone.getNewRefundFree() == null) { cashRecordDone.setNewRefundFree(BigDecimal.valueOf(0)); } + int result = cashRefundMapper.update(cashRecordDone); CashRecordDTO cashRecordDTO = cashRefundMapper.selectById(cashRecordDone.getId()); if (result > 0) { @@ -516,10 +517,7 @@ public class CashRefundServiceImpl implements RefundService { .collect(Collectors.toList()); // 2. 本次退款总金额(取绝对值,兼容负数) - BigDecimal totalRefundAmount = BigDecimal.valueOf(userGoldRecord.getPermanentGold()).abs() - .add(BigDecimal.valueOf(userGoldRecord.getTaskGold()).abs()) - .add(BigDecimal.valueOf(userGoldRecord.getFreeJune()).abs()) - .add(BigDecimal.valueOf(userGoldRecord.getFreeDecember()).abs()); + BigDecimal totalRefundAmount = BigDecimal.valueOf(userGoldRecord.getPermanentGold()).abs(); if (totalRefundAmount.compareTo(BigDecimal.ZERO) > 0) { BigDecimal remainingRefund = totalRefundAmount; diff --git a/src/main/java/com/example/demo/serviceImpl/coin/AuditServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/coin/AuditServiceImpl.java index a4ffbaa..b765304 100644 --- a/src/main/java/com/example/demo/serviceImpl/coin/AuditServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/coin/AuditServiceImpl.java @@ -223,10 +223,7 @@ public class AuditServiceImpl implements AuditService { .collect(Collectors.toList()); // 2. 本次退款总金额 - BigDecimal totalRefundAmount = BigDecimal.valueOf(order.getPermanentGold()) - .add(BigDecimal.valueOf(order.getTaskGold())) - .add(BigDecimal.valueOf(order.getFreeJune())) - .add(BigDecimal.valueOf(order.getFreeDecember())); + BigDecimal totalRefundAmount = BigDecimal.valueOf(order.getPermanentGold()); if (totalRefundAmount.compareTo(BigDecimal.ZERO) > 0) { BigDecimal remainingRefund = totalRefundAmount;