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

Merge remote-tracking branch 'origin/master' into wjh

Browse Source
This commit is contained in:
磷叶 2025-05-24 09:32:29 +08:00
commit 391bb31110
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ruoyi-service/src/main/java/com/ruoyi/bst/order/service/impl/OrderServiceImpl.java
View File

@ -784,7 +784,10 @@ public class OrderServiceImpl implements OrderService {
refundDto.setUserId(dto.getUserId()); refundDto.setUserId(dto.getUserId());
refundDto.setUserName(dto.getUserName()); refundDto.setUserName(dto.getUserName());
refundDto.setType(type); 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; return result == null ? 0 : result;