From be32eead2c8ff24fc2a6a7b6fa20e76f2a02f9d3 Mon Sep 17 00:00:00 2001
From: zhuotianyuan <z13055603049@163.com>
Date: Tue, 27 Jan 2026 19:55:43 +0800
Subject: [PATCH] =?UTF-8?q?feat(logistics):=20=E6=B7=BB=E5=8A=A0courierCom?=
 =?UTF-8?q?pany=E5=AD=97=E6=AE=B5=E5=B9=B6=E6=9B=B4=E6=96=B0=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

在ShipmentBookDTO和ShipmentFeeBookDTO中添加courierCompany字段
更新物流服务中shipCompany的赋值逻辑，优先使用courierCompany
---
 src/dto/logistics.dto.ts         | 6 ++++++
 src/service/logistics.service.ts | 8 +++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/dto/logistics.dto.ts b/src/dto/logistics.dto.ts
index b49b72c..48841db 100644
--- a/src/dto/logistics.dto.ts
+++ b/src/dto/logistics.dto.ts
@@ -23,6 +23,10 @@ export class ShipmentBookDTO {
   @ApiProperty()
   @Rule(RuleType.string())
   shipmentPlatform: string;
+
+  @ApiProperty()
+  @Rule(RuleType.string())
+  courierCompany: string;
 }
 
 export class ShipmentFeeBookDTO {
@@ -30,6 +34,8 @@ export class ShipmentFeeBookDTO {
   @ApiProperty()
   shipmentPlatform: string;
   @ApiProperty()
+  courierCompany: string;
+  @ApiProperty()
   stockPointId: number;
   @ApiProperty()
   sender: string;
diff --git a/src/service/logistics.service.ts b/src/service/logistics.service.ts
index 90cea59..174a93e 100644
--- a/src/service/logistics.service.ts
+++ b/src/service/logistics.service.ts
@@ -467,7 +467,7 @@ export class LogisticsService {
         }
       };
     } catch (error) {
-      if (resShipmentOrder.status === 'SUCCESS') {
+      if (resShipmentOrder?.status === 'SUCCESS') {
         await this.uniExpressService.deleteShipment(resShipmentOrder.data.tno);
       }
       throw new Error(`上游请求错误:${error}`);
@@ -737,7 +737,8 @@ export class LogisticsService {
       if (data.shipmentPlatform === 'freightwaves') {
         // 根据TMS系统对接说明文档格式化参数
         const reqBody: any = {
-          shipCompany: 'UPSYYZ7000NEW',
+          // shipCompany: 'UPSYYZ7000NEW',
+          shipCompany: data.courierCompany || "",
           partnerOrderNumber: order.siteId + '-' + order.externalOrderId,
           warehouseId: '25072621030107400060',
           shipper: {
@@ -836,7 +837,8 @@ export class LogisticsService {
     const address = shipments?.address;
     // 转换为RateTryRequest格式
     const r = {
-      shipCompany: 'UPSYYZ7000NEW', // 必填，但ShipmentFeeBookDTO中缺少
+      // shipCompany: 'UPSYYZ7000NEW',
+      shipCompany: data.courierCompany || "",
       partnerOrderNumber: `order-${Date.now()}`, // 必填，使用时间戳生成
       warehouseId: '25072621030107400060', // 可选，使用stockPointId转换
       shipper: {
-- 
2.40.1