From 9f8b3700ffbcc616a97e7ee2ea283ef4df3d666a Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期四, 04 六月 2026 08:43:55 +0800
Subject: [PATCH] 代码生成

---
 server/web/src/main/java/com/doumee/api/web/PaymentCallback.java |   18 ++++++++++++++++--
 1 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/server/web/src/main/java/com/doumee/api/web/PaymentCallback.java b/server/web/src/main/java/com/doumee/api/web/PaymentCallback.java
index 9aaece4..668c27b 100644
--- a/server/web/src/main/java/com/doumee/api/web/PaymentCallback.java
+++ b/server/web/src/main/java/com/doumee/api/web/PaymentCallback.java
@@ -81,7 +81,8 @@
 
             if (Constants.SUCCESS.equals(result.getReturnCode())) {
                 switch (result.getAttach()) {
-                    case "storageOrder": {
+                    case "storageOrder":
+                    case "deliveryOrder": {
                         ordersService.handleStorageOrderPayNotify(outTradeNo, paymentNo);
                         break;
                     }
@@ -89,7 +90,8 @@
                         ordersService.handleShopDepositPayNotify(outTradeNo, paymentNo);
                         break;
                     }
-                    case "overdueFee": {
+                    case "overdueFee":
+                    case "deliveryOverdueFee": {
                         ordersService.handleOverdueFeePayNotify(outTradeNo, paymentNo);
                         break;
                     }
@@ -130,12 +132,14 @@
                 if (StringUtils.isNotBlank(attach)) {
                     switch (attach) {
                         case "storageOrder":
+                        case "deliveryOrder":
                             ordersService.handleStorageOrderPayNotify(outTradeNo, paymentNo);
                             break;
                         case "shopDeposit":
                             ordersService.handleShopDepositPayNotify(outTradeNo, paymentNo);
                             break;
                         case "overdueFee":
+                        case "deliveryOverdueFee":
                             ordersService.handleOverdueFeePayNotify(outTradeNo, paymentNo);
                             break;
                     }
@@ -201,6 +205,16 @@
                     ordersRefundMapper.updateById(refundRecord);
                     log.info("閫�娆捐褰曠姸鎬佸凡鏇存柊, refundRecordId={}, status={}", refundRecord.getId(), refundRecord.getStatus());
 
+                    // 鎵嬪姩閫�娆�(type=4)閫�娆炬垚鍔� 鈫� 鎵ц鎵f
+                    if (Status.SUCCESS.equals(refundStatus)
+                            && Constants.equalsInteger(refundRecord.getType(), Constants.FOUR)) {
+                        try {
+                            ordersService.processManualRefundCallback(refundRecord);
+                        } catch (Exception ex) {
+                            log.error("鎵嬪姩閫�娆炬墸娆惧鐞嗗紓甯�, refundRecordId={}", refundRecord.getId(), ex);
+                        }
+                    }
+
                     // 閫�娆炬垚鍔� 鈫� 閫氱煡浼氬憳
                     if (Status.SUCCESS.equals(refundStatus) && refundRecord.getOrderId() != null) {
                         Orders refundOrder = ordersMapper.selectById(refundRecord.getOrderId());

--
Gitblit v1.9.3