From 5488e1b7c6651586b9c6170a8dc41c3bbdd048bd Mon Sep 17 00:00:00 2001
From: zhuotianyuan <z13055603049@163.com>
Date: Wed, 28 Jan 2026 19:36:51 +0800
Subject: [PATCH] =?UTF-8?q?fix(logistics):=20=E4=BF=AE=E5=A4=8D=E8=B4=A7?=
 =?UTF-8?q?=E8=BF=90=E5=B9=B3=E5=8F=B0courierCompany=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E5=A4=84=E7=90=86=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

当courierCompany为"最优物流"时设置为空字符串，否则使用原值
---
 src/service/logistics.service.ts | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/service/logistics.service.ts b/src/service/logistics.service.ts
index b43f3d0..a0c158a 100644
--- a/src/service/logistics.service.ts
+++ b/src/service/logistics.service.ts
@@ -734,10 +734,15 @@ export class LogisticsService {
       }
 
       if (data.shipmentPlatform === 'freightwaves') {
+
+        let courierCompany: string = "";
+        if (data.courierCompany != "最优物流") {
+          courierCompany = data.courierCompany;
+        }
         // 根据TMS系统对接说明文档格式化参数
         const reqBody: any = {
           // shipCompany: 'UPSYYZ7000NEW',
-          shipCompany: data.courierCompany || "",
+          shipCompany: courierCompany,
           partnerOrderNumber: order.siteId + '-' + order.externalOrderId,
           warehouseId: '25072621030107400060',
           shipper: {
@@ -831,12 +836,15 @@ export class LogisticsService {
         id: data.address_id,
       },
     })
-
     const address = shipments?.address;
+    let courierCompany: string = "";
+    if (data.courierCompany != "最优物流") {
+      courierCompany = data.courierCompany;
+    }
     // 转换为RateTryRequest格式
     const r = {
       //shipCompany: 'UPSYYZ7000NEW', // 必填，但ShipmentFeeBookDTO中缺少
-      shipCompany: data.courierCompany || "",
+      shipCompany: courierCompany,
       partnerOrderNumber: `order-${Date.now()}`, // 必填，使用时间戳生成
       warehouseId: '25072621030107400060', // 可选，使用stockPointId转换
       shipper: {