From 6575858004622a5f72ff404c7d2b59f4e300706c Mon Sep 17 00:00:00 2001
From: Jack <46790855@qq.com>
Date: Mon, 1 Dec 2025 17:42:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B6=88=E8=AE=A2=E5=8D=95=EF=BC=8C?=
 =?UTF-8?q?=E5=90=8C=E6=97=B6=E4=B9=9F=E8=A6=81=E5=8F=96=E6=B6=88=E9=A1=BA?=
 =?UTF-8?q?=E4=B8=B0=E5=90=8C=E5=9F=8E=E7=9A=84=E9=85=8D=E9=80=81=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../order/service/impl/ShopOrderBaseServiceImpl.java | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderBaseServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderBaseServiceImpl.java
index a3ea4618..a3e0155c 100644
--- a/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderBaseServiceImpl.java
+++ b/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderBaseServiceImpl.java
@@ -5391,14 +5391,20 @@ public class ShopOrderBaseServiceImpl extends BaseServiceImpl<ShopOrderBaseMappe
         }
 
         // 取消顺丰同城配送订单
-
         // === 7. 特殊场景：顺丰同城配送、且全单退的时候，才触发顺丰同城订单取消 ===
         if (orderInfo.getDelivery_type_id() != null
                 && StateCode.DELIVERY_TYPE_SAME_CITY == orderInfo.getDelivery_type_id().intValue()) {
             try {
-                sfExpressApiService.cancelOrder(order_id, 313, "用户或商家取消订单。");
+                ThirdApiRes sfResult = sfExpressApiService.cancelOrder(order_id, 313, "用户或商家取消订单。");
+                if (sfResult != null && !sfResult.getError_code().equals(0)) {
+                    log.error("顺丰同城取消订单返回错误，orderId: {}, errorCode: {}, errorMsg: {}",
+                            order_id, sfResult.getError_code(), sfResult.getError_msg());
+                } else {
+                    log.info("顺丰同城订单取消成功，orderId: {}", order_id);
+                }
             } catch (Exception e) {
-                log.error("顺丰同城取消订单失败", e);
+                log.error("顺丰同城取消订单异常，orderId: {}", order_id, e);
+                // 可以考虑添加补偿机制或异步重试
             }
         }