Commit fb663a984c697ed5c4ce1d906b35f7d5f3456404
Committed by
骑士梦
骑士梦
1 parent
c93eb07c
fixed 86ef58d from https://gitee.com/qshome/ruoyi-vue-pro/pulls/324
修改`pay模块>创建支付单>存在时返回订单Id`
Showing
1 changed file
with
1 additions
and
1 deletions
yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/order/PayOrderServiceImpl.java
| @@ -103,7 +103,7 @@ public class PayOrderServiceImpl implements PayOrderService { | @@ -103,7 +103,7 @@ public class PayOrderServiceImpl implements PayOrderService { | ||
| 103 | if (order != null) { | 103 | if (order != null) { |
| 104 | log.warn("[createPayOrder][appId({}) merchantOrderId({}) 已经存在对应的支付单({})]", order.getAppId(), | 104 | log.warn("[createPayOrder][appId({}) merchantOrderId({}) 已经存在对应的支付单({})]", order.getAppId(), |
| 105 | order.getMerchantOrderId(), JsonUtils.toJsonString(order)); // 理论来说，不会出现这个情况 | 105 | order.getMerchantOrderId(), JsonUtils.toJsonString(order)); // 理论来说，不会出现这个情况 |
| 106 | - return app.getId(); | 106 | + return order.getId(); |
| 107 | } | 107 | } |
| 108 | 108 | ||
| 109 | // 创建支付交易单 | 109 | // 创建支付交易单 |