From 7a6c7c7aaee61ffc8d9d9247f0286579335da95fa31b57a705ab21a754b8bd03 Mon Sep 17 00:00:00 2001
From: yanglei <yanglei@stargraph.cn>
Date: Thu, 18 Dec 2025 12:49:34 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E9=80=80=E6=AC=BE=E5=9B=9E?=
 =?UTF-8?q?=E8=B0=83=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/EbikeRefundServiceImpl.java  | 23 ++++++++++++-------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/ebike-payment/src/main/java/com/cdzy/payment/service/impl/EbikeRefundServiceImpl.java b/ebike-payment/src/main/java/com/cdzy/payment/service/impl/EbikeRefundServiceImpl.java
index b899d80..b9852b0 100644
--- a/ebike-payment/src/main/java/com/cdzy/payment/service/impl/EbikeRefundServiceImpl.java
+++ b/ebike-payment/src/main/java/com/cdzy/payment/service/impl/EbikeRefundServiceImpl.java
@@ -93,7 +93,17 @@ public class EbikeRefundServiceImpl extends ServiceImpl<EbikeRefundMapper, Ebike
         if (refundNotification == null) {
             return false;
         }
-        EbikeRefund ebikeRefund = getByRefundOrderId(refundNotification.getOutRefundNo());
+        String refundOrderId = refundNotification.getOutRefundNo();
+        EbikeRefund ebikeRefund = getByRefundOrderId(refundOrderId);
+        if (ebikeRefund == null) {
+            log.error("未找到对应的退款记录，refundOrderId: {}", refundOrderId);
+            return false;
+        }
+        if (ebikeRefund.getRefundStatus() == RefundStatus.APPLYING) {
+            log.info("退款已处理成功。refundOrderId: {}", refundOrderId);
+            return true;
+        }
+        log.info("退款回调订单Id:{}, 退款回调订单状态:{}", refundOrderId, refundNotification.getRefundStatus().ordinal());
         ebikeRefund.setRefundStatus(refundNotification.getRefundStatus().ordinal());
         if (Status.SUCCESS.equals(refundNotification.getRefundStatus())) {
             String refundTime = refundNotification.getSuccessTime();
@@ -102,9 +112,7 @@ public class EbikeRefundServiceImpl extends ServiceImpl<EbikeRefundMapper, Ebike
             BigDecimal refundAmount = calculateRefundCallbackAmount(refundNotification);
             ebikeRefund.setRefund(refundAmount);
         }
-        Long refundOrderId = Long.valueOf(refundNotification.getOutTradeNo());
-        log.info("退款回调订单Id:{}, 退款回调订单状态:{}", refundOrderId, refundNotification.getRefundStatus().ordinal());
-        Long orderId = queryOrderId(refundOrderId);
+        Long orderId = ebikeRefund.getOrderId();
         // 更新订单退款状态
         switch (refundNotification.getRefundStatus()) {
             case PROCESSING, CLOSED -> ebikeOrderService.refund(orderId);
@@ -160,19 +168,18 @@ public class EbikeRefundServiceImpl extends ServiceImpl<EbikeRefundMapper, Ebike
      *
      * @param refundOrderId 根据退款回调退款订单号查询订单号
      */
-    private Long queryOrderId(Long refundOrderId) {
+    private Long queryOrderId(String refundOrderId) {
         if (refundOrderId == null) {
             log.warn("退款订单ID为空，无法查询主订单ID");
             return null;
         }
         //查询退款中且状态为2的订单
         QueryWrapper queryWrapper = QueryWrapper.create()
-                .where(EBIKE_REFUND.REFUND_ORDER_ID.eq(refundOrderId))
-                .where(EBIKE_REFUND.REFUND_STATUS.eq(RefundStatus.PROCESSED));
+                .where(EBIKE_REFUND.REFUND_ORDER_ID.eq(refundOrderId));
         EbikeRefund ebikeRefund = this.mapper.selectOneByQuery(queryWrapper);
 
         if (ebikeRefund == null) {
-            log.warn("未找到状态为'退款中'的退款记录，退款单ID: {}", refundOrderId);
+            log.warn("未找到退款订单号为的退款记录，退款单ID: {}", refundOrderId);
             return null;
         }
         return ebikeRefund.getOrderId();