huangge1199/vue-pro
1
0
Fork 0
mirror of https://gitee.com/huangge1199_admin/vue-pro.git synced 2025-02-17 09:40:34 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

!324 修改pay模块>创建支付单>存在时返回订单Id

Browse Source 
Merge pull request !324 from 骑士梦/master
This commit is contained in:
芋道源码 2022-12-12 14:16:40 +00:00 committed by Gitee
commit 988314fb74
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/order/PayOrderServiceImpl.java
View File

@ -103,7 +103,7 @@ public class PayOrderServiceImpl implements PayOrderService {
if (order != null) { if (order != null) {
log.warn("[createPayOrder][appId({}) merchantOrderId({}) 已经存在对应的支付单({})]", order.getAppId(), log.warn("[createPayOrder][appId({}) merchantOrderId({}) 已经存在对应的支付单({})]", order.getAppId(),
order.getMerchantOrderId(), JsonUtils.toJsonString(order)); // 理论来说，不会出现这个情况 order.getMerchantOrderId(), JsonUtils.toJsonString(order)); // 理论来说，不会出现这个情况
return app.getId(); return order.getId();
} }
// 创建支付交易单 // 创建支付交易单

2
yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/refund/PayRefundServiceImpl.java
View File

@ -130,7 +130,7 @@ public class PayRefundServiceImpl implements PayRefundService {
} else { } else {
// 成功，插入退款单 状态为生成.没有和渠道交互 // 成功，插入退款单 状态为生成.没有和渠道交互
// TODO @jason：搞到 convert 里。一些额外的自动，手动 set 下； // TODO @jason：搞到 convert 里。一些额外的自动，手动 set 下；
payRefundDO = PayRefundDO.builder().channelOrderNo(order.getChannelOrderNo()) payRefundDO = PayRefundDO.builder()
.appId(order.getAppId()) .appId(order.getAppId())
.channelOrderNo(order.getChannelOrderNo()) .channelOrderNo(order.getChannelOrderNo())
.channelCode(order.getChannelCode()) .channelCode(order.getChannelCode())