chuangte/electripper-v2
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: chuangte:391bb3111074c5f2385d6f28707b769d847de0fb
Branches Tags
chuangte:master
chuangte:wjh
chuangte:chache-dev
chuangte:deploy
..
compare: chuangte:73875fbf4898f4c1ccdc070a728176dbe9a36e00
Branches Tags
chuangte:wjh
chuangte:chache-dev
chuangte:deploy
chuangte:master

No commits in common. "391bb3111074c5f2385d6f28707b769d847de0fb" and "73875fbf4898f4c1ccdc070a728176dbe9a36e00" have entirely different histories.
391bb31110 ... 73875fbf48

1 changed files with 2 additions and 5 deletions
Show Stats Expand all files Collapse all files

7
ruoyi-service/src/main/java/com/ruoyi/bst/order/service/impl/OrderServiceImpl.java
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,10 +784,7 @@ public class OrderServiceImpl implements OrderService {
refundDto.setUserId(dto.getUserId());
refundDto.setUserName(dto.getUserName());
refundDto.setType(type);
int refund = payService.refund(refundDto);
ServiceUtil.assertion(refund != 1, "ID为%s的支付退款失败，请联系管理员处理", refundDto.getId());
return refund;
return payService.refund(refundDto);
});
return result == null ? 0 : result;