From c93eb07cc858bf67b59a2eb5a19dea67d1b545e9 Mon Sep 17 00:00:00 2001 From: qs Date: Mon, 12 Dec 2022 11:55:35 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fixed=20c2f0f9e=20from=20https://gitee.com/?= =?UTF-8?q?qshome/ruoyi-vue-pro/pulls/324=20=E4=BF=AE=E6=94=B9`pay?= =?UTF-8?q?=E6=A8=A1=E5=9D=97>=E6=8F=90=E4=BA=A4=E9=80=80=E6=AC=BE?= =?UTF-8?q?=E7=94=B3=E8=AF=B7>=E9=87=8D=E5=A4=8D=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E5=B1=9E=E6=80=A7`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yudao/module/pay/service/refund/PayRefundServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/refund/PayRefundServiceImpl.java b/yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/refund/PayRefundServiceImpl.java index d51d00c20..c243a23c3 100755 --- a/yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/refund/PayRefundServiceImpl.java +++ b/yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/refund/PayRefundServiceImpl.java @@ -130,7 +130,7 @@ public class PayRefundServiceImpl implements PayRefundService { } else { // 成功，插入退款单 状态为生成.没有和渠道交互 // TODO @jason：搞到 convert 里。一些额外的自动，手动 set 下； - payRefundDO = PayRefundDO.builder().channelOrderNo(order.getChannelOrderNo()) + payRefundDO = PayRefundDO.builder() .appId(order.getAppId()) .channelOrderNo(order.getChannelOrderNo()) .channelCode(order.getChannelCode()) From fb663a984c697ed5c4ce1d906b35f7d5f3456404 Mon Sep 17 00:00:00 2001 From: qs Date: Mon, 12 Dec 2022 09:46:12 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fixed=2086ef58d=20from=20https://gitee.com/?= =?UTF-8?q?qshome/ruoyi-vue-pro/pulls/324=20=E4=BF=AE=E6=94=B9`pay?= =?UTF-8?q?=E6=A8=A1=E5=9D=97>=E5=88=9B=E5=BB=BA=E6=94=AF=E4=BB=98?= =?UTF-8?q?=E5=8D=95>=E5=AD=98=E5=9C=A8=E6=97=B6=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E8=AE=A2=E5=8D=95Id`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yudao/module/pay/service/order/PayOrderServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/order/PayOrderServiceImpl.java b/yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/order/PayOrderServiceImpl.java index 67a3e7152..e5dac0333 100755 --- a/yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/order/PayOrderServiceImpl.java +++ b/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 { if (order != null) { log.warn("[createPayOrder][appId({}) merchantOrderId({}) 已经存在对应的支付单({})]", order.getAppId(), order.getMerchantOrderId(), JsonUtils.toJsonString(order)); // 理论来说，不会出现这个情况 - return app.getId(); + return order.getId(); } // 创建支付交易单