From 9a0e977707f4c06af6f57056f8e72f5992d472c1 Mon Sep 17 00:00:00 2001
From: bootx <xxm1995@outlook.com>
Date: Sun, 12 Jan 2025 20:21:03 +0800
Subject: [PATCH] =?UTF-8?q?fix(refund):=20=E4=BF=AE=E5=A4=8D=E9=80=80?=
 =?UTF-8?q?=E6=AC=BE=E6=88=90=E5=8A=9F=E7=8A=B6=E6=80=81=E4=B8=8B=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E4=BF=A1=E6=81=AF=E8=A2=AB=E6=B8=85=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../daxpay/service/entity/order/refund/RefundOrder.java        | 2 ++
 .../service/service/trade/refund/RefundAssistService.java      | 1 +
 .../service/service/trade/refund/RefundCallbackService.java    | 3 ++-
 3 files changed, 5 insertions(+), 1 deletion(-)

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 1d258d1c..338f3837 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
@@ -76,9 +76,11 @@ public class RefundOrder extends MchAppBaseEntity implements ToResult<RefundOrde
     private String status;
 
     /** 错误码 */
+    @TableField(updateStrategy = FieldStrategy.ALWAYS)
     private String errorCode;
 
     /** 错误信息 */
+    @TableField(updateStrategy = FieldStrategy.ALWAYS)
     private String errorMsg;
 
     /** 异步通知地址 */
diff --git a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/service/trade/refund/RefundAssistService.java b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/service/trade/refund/RefundAssistService.java
index aeacade5..10362af5 100644
--- a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/service/trade/refund/RefundAssistService.java
+++ b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/service/trade/refund/RefundAssistService.java
@@ -172,6 +172,7 @@ public class RefundAssistService {
         }
         // 设置退款为完成状态和完成时间
         refundOrder.setStatus(RefundStatusEnum.SUCCESS.getCode())
+                .setErrorMsg(null)
                 .setFinishTime(finishTime);
         payOrder.setRefundStatus(afterPayRefundStatus.getCode());
 
diff --git a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/service/trade/refund/RefundCallbackService.java b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/service/trade/refund/RefundCallbackService.java
index 13e57845..5c526f3f 100644
--- a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/service/trade/refund/RefundCallbackService.java
+++ b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/service/trade/refund/RefundCallbackService.java
@@ -102,7 +102,8 @@ public class RefundCallbackService {
         }
         // 设置退款为完成状态和完成时间
         refundOrder.setStatus(RefundStatusEnum.SUCCESS.getCode())
-                .setFinishTime(callbackInfo.getFinishTime());
+                .setFinishTime(callbackInfo.getFinishTime())
+                .setErrorMsg(null);
         payOrder.setRefundStatus(payRefundStatusEnum.getCode());
 
         // 更新订单和退款相关订单