From 4eeda35c2d0e62d1020474cfc5fd754138c73030 Mon Sep 17 00:00:00 2001
From: zhuotianyuan <z13055603049@163.com>
Date: Thu, 29 Jan 2026 11:01:32 +0800
Subject: [PATCH] =?UTF-8?q?fix(logistics):=20=E4=BF=AE=E6=94=B9courierComp?=
 =?UTF-8?q?any=E9=AA=8C=E8=AF=81=E8=A7=84=E5=88=99=E5=B9=B6=E7=A7=BB?=
 =?UTF-8?q?=E9=99=A4=E5=86=97=E4=BD=99=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

将logistics.dto.ts中的courierCompany验证规则从string()改为any()
移除logistics.service.ts中关于courierCompany的条件判断逻辑，直接使用原始值
---
 src/dto/logistics.dto.ts         |  2 +-
 src/service/logistics.service.ts | 19 +++----------------
 2 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/src/dto/logistics.dto.ts b/src/dto/logistics.dto.ts
index 48841db..f0bd6ba 100644
--- a/src/dto/logistics.dto.ts
+++ b/src/dto/logistics.dto.ts
@@ -25,7 +25,7 @@ export class ShipmentBookDTO {
   shipmentPlatform: string;
 
   @ApiProperty()
-  @Rule(RuleType.string())
+  @Rule(RuleType.any())
   courierCompany: string;
 }
 
diff --git a/src/service/logistics.service.ts b/src/service/logistics.service.ts
index 07815aa..046ccd9 100644
--- a/src/service/logistics.service.ts
+++ b/src/service/logistics.service.ts
@@ -733,15 +733,10 @@ export class LogisticsService {
       }
 
       if (data.shipmentPlatform === 'freightwaves') {
-
-        let courierCompany: string = "";
-        if (data.courierCompany != "最优物流") {
-          courierCompany = data.courierCompany;
-        }
         // 根据TMS系统对接说明文档格式化参数
         const reqBody: any = {
           // shipCompany: 'UPSYYZ7000NEW',
-          shipCompany: courierCompany,
+          shipCompany: data.courierCompany,
           partnerOrderNumber: order.siteId + '-' + order.externalOrderId,
           warehouseId: '25072621030107400060',
           shipper: {
@@ -822,11 +817,7 @@ export class LogisticsService {
   }
 
 
-  /**
-   * 将ShipmentFeeBookDTO转换为freightwaves的RateTryRequest格式
-   * @param data ShipmentFeeBookDTO数据
-   * @returns RateTryRequest格式的数据
-   */
+  
   /**
    * 将ShipmentFeeBookDTO转换为freightwaves的RateTryRequest格式
    * @param data ShipmentFeeBookDTO数据
@@ -841,14 +832,10 @@ export class LogisticsService {
     })
 
     const address = shipments?.address;
-    let courierCompany: string = "";
-    if (data.courierCompany != "最优物流") {
-      courierCompany = data.courierCompany;
-    }
     // 转换为RateTryRequest格式
     const r = {
       // shipCompany: 'UPSYYZ7000NEW',
-      shipCompany: courierCompany,
+      shipCompany: data.courierCompany,
       partnerOrderNumber: `order-${Date.now()}`, // 必填，使用时间戳生成
       warehouseId: '25072621030107400060', // 可选，使用stockPointId转换
       shipper: {