From 534eae1a566fc5927a9baccf55ae56d89d729ea7 Mon Sep 17 00:00:00 2001
From: liyj <1617420630@qq.com>
Date: Thu, 23 Oct 2025 10:10:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E5=9F=8E=E9=85=8D=E9=80=81=E6=97=B6?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=BC=E5=AE=B9=E6=89=8B=E5=8A=A8=E9=85=8D?=
 =?UTF-8?q?=E9=80=81=E7=9A=84=E5=BE=AE=E4=BF=A1=E5=8F=91=E8=B4=A7=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/SFExpressApiServiceImpl.java        |  3 ++-
 .../service/impl/WxOrderShippingServiceImpl.java     | 12 ++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/sfexpress/service/impl/SFExpressApiServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/sfexpress/service/impl/SFExpressApiServiceImpl.java
index 72c559f3..e0a51549 100644
--- a/mall-shop/src/main/java/com/suisung/mall/shop/sfexpress/service/impl/SFExpressApiServiceImpl.java
+++ b/mall-shop/src/main/java/com/suisung/mall/shop/sfexpress/service/impl/SFExpressApiServiceImpl.java
@@ -1207,9 +1207,10 @@ public class SFExpressApiServiceImpl implements SFExpressApiService {
                     syncThirdDataService.incrProductStockToRedis(stockDeltaMap);
                 }
             }
+            return CommonResult.success("操作成功");
             //出库扣减思迅库存end
         }
-        return CommonResult.success("操作成功");
+        return CommonResult.failed("操作失败："+pair.getSecond());
     }
 
     /**
diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/wechat/service/impl/WxOrderShippingServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/wechat/service/impl/WxOrderShippingServiceImpl.java
index 19ed7cdf..a0f605b9 100644
--- a/mall-shop/src/main/java/com/suisung/mall/shop/wechat/service/impl/WxOrderShippingServiceImpl.java
+++ b/mall-shop/src/main/java/com/suisung/mall/shop/wechat/service/impl/WxOrderShippingServiceImpl.java
@@ -113,16 +113,16 @@ public class WxOrderShippingServiceImpl implements WxOrderShippingService {
                 shippingItem.set("tracking_no", shopOrderLogistics.getOrder_tracking_number());
                 shippingItem.set("express_company", shopOrderLogistics.getLogistics_number());
 
-            } else if (logisticsType == 2) {
+            } else if (logisticsType == 2) {//同城配送tracking_no和express_company为非必填项，如果存在自行配送，也可以手动发货
                 ShopStoreSfOrder shopStoreSfOrder = shopStoreSfOrderService.getByShopOrderId(orderId);
-                if (shopStoreSfOrder == null) {
+                if (shopStoreSfOrder != null) {
+                    shippingItem.set("tracking_no", shopStoreSfOrder.getSf_bill_id());//非必填字段
+                    shippingItem.set("express_company", "SF");//非必填字段
+                }else {
                     log.error("无法获取顺丰同城订单记录，订单ID: {}", orderId);
-                    return Pair.of(false, "无法获取顺丰同城订单记录");
+                   // return Pair.of(false, "无法获取顺丰同城订单记录");
                 }
-                shippingItem.set("tracking_no", shopStoreSfOrder.getSf_bill_id());
-                shippingItem.set("express_company", "SF");
             }
-
             shippingItem.putOpt("contact", new JSONObject()
                     .set("receiver_contact", receiverContact));