This commit is contained in:
磷叶 2025-05-24 09:27:31 +08:00
parent 18ca36f200
commit 26466a29e6

View File

@ -713,7 +713,7 @@ public class OrderServiceImpl implements OrderService {
ServiceUtil.assertion(MathUtils.biggerThan(dto.getDispatchRefund(), order.getActualReceivedDispatchFee()), "调度费可退款金额不足,当前可退款金额为%s元", order.getActualReceivedDispatchFee());
ServiceUtil.assertion(MathUtils.biggerThan(dto.getManageRefund(), order.getActualReceivedManageFee()), "管理费可退款金额不足,当前可退款金额为%s元", order.getActualReceivedManageFee());
ServiceUtil.assertion(MathUtils.biggerThan(dto.getDeductionRefund(), order.getActualReceivedDeductionFee()), "车损费可退款金额不足,当前可退款金额为%s元", order.getActualReceivedDeductionFee());
// 总退款金额不允许为0
BigDecimal totalRefund = MathUtils.addDecimal(dto.getRidingRefund(), dto.getDispatchRefund(), dto.getManageRefund(), dto.getDeductionRefund());
ServiceUtil.assertion(totalRefund.compareTo(BigDecimal.ZERO) <= 0, "退款总额不允许小于或等于0");
@ -784,7 +784,10 @@ public class OrderServiceImpl implements OrderService {
refundDto.setUserId(dto.getUserId());
refundDto.setUserName(dto.getUserName());
refundDto.setType(type);
return payService.refund(refundDto);
int refund = payService.refund(refundDto);
ServiceUtil.assertion(refund != 1, "ID为%s的支付退款失败请联系管理员处理", refundDto.getId());
return refund;
});
return result == null ? 0 : result;