From 2b8d8b7ee0d6971b37dc5dd9f0b579121242ed00 Mon Sep 17 00:00:00 2001 From: bootx Date: Sun, 29 Dec 2024 10:28:19 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=BE=AE=E4=BF=A1V2=E9=80=80=E6=AC=BE?= =?UTF-8?q?=E5=9B=9E=E8=B0=83=E9=80=80=E6=AC=BE=E5=8F=B7=E5=A4=84=E7=90=86?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wechat/service/callback/WechatRefundCallbackService.java | 4 ++-- .../daxpay/service/entity/order/refund/RefundOrder.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/daxpay-single-channel/daxpay-single-wechat/src/main/java/org/dromara/daxpay/channel/wechat/service/callback/WechatRefundCallbackService.java b/daxpay-single-channel/daxpay-single-wechat/src/main/java/org/dromara/daxpay/channel/wechat/service/callback/WechatRefundCallbackService.java index 5461a224..67c80779 100644 --- a/daxpay-single-channel/daxpay-single-wechat/src/main/java/org/dromara/daxpay/channel/wechat/service/callback/WechatRefundCallbackService.java +++ b/daxpay-single-channel/daxpay-single-wechat/src/main/java/org/dromara/daxpay/channel/wechat/service/callback/WechatRefundCallbackService.java @@ -128,9 +128,9 @@ public class WechatRefundCallbackService { // 回调数据 callbackInfo.setCallbackData(BeanUtil.beanToMap(result)); // 网关退款号 - callbackInfo.setOutTradeNo(result.getTransactionId()); + callbackInfo.setOutTradeNo(result.getRefundId()); // 退款号 - callbackInfo.setTradeNo(result.getRefundId()); + callbackInfo.setTradeNo(result.getOutRefundNo()); // 退款状态 - 成功 if (Objects.equals(RefundStatus.SUCCESS, result.getRefundStatus())){ callbackInfo.setTradeStatus(RefundStatusEnum.SUCCESS.getCode()); diff --git a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/entity/order/refund/RefundOrder.java b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/entity/order/refund/RefundOrder.java index b7d10f38..1d258d1c 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/entity/order/refund/RefundOrder.java +++ b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/entity/order/refund/RefundOrder.java @@ -39,7 +39,7 @@ public class RefundOrder extends MchAppBaseEntity implements ToResult