From 1657b96694f18942f7b14c1f3a00dce29a8ed0f5 Mon Sep 17 00:00:00 2001
From: zhuotianyuan <z13055603049@163.com>
Date: Tue, 27 Jan 2026 19:26:11 +0800
Subject: [PATCH] =?UTF-8?q?fix(logistics):=20=E4=BF=AE=E5=A4=8D=E7=89=A9?=
 =?UTF-8?q?=E6=B5=81=E8=AE=A2=E5=8D=95=E7=8A=B6=E6=80=81=E6=A3=80=E6=9F=A5?=
 =?UTF-8?q?=E5=92=8C=E7=BB=93=E6=9E=9C=E5=90=88=E5=B9=B6=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复 resShipmentOrder 状态检查时的可选链操作问题
修正 partnerOrderNumber 的拼接格式
调整查询结果合并方式，避免直接 push 操作
优化错误处理，使用 Error 对象抛出异常
---
 src/service/logistics.service.ts | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/service/logistics.service.ts b/src/service/logistics.service.ts
index cb6738c..2a58e59 100644
--- a/src/service/logistics.service.ts
+++ b/src/service/logistics.service.ts
@@ -464,7 +464,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}`);
@@ -735,7 +735,7 @@ export class LogisticsService {
         const reqBody: any = {
           // shipCompany: 'UPSYYZ7000NEW',
           shipCompany: data.courierCompany || "",
-          partnerOrderNumber: order.siteId + '-' + order.externalOrderId,
+          partnerOrderNumber: order.siteId + '-1-' + order.externalOrderId,
           warehouseId: '25072621030107400060',
           shipper: {
             name: data.details.origin.contact_name, // 姓名
@@ -802,13 +802,17 @@ export class LogisticsService {
 
         //tms只返回了物流订单号，需要查询一次来获取完整的物流信息
         const queryRes = await this.freightwavesService.queryOrder({ shipOrderId: resShipmentOrder.shipOrderId }); // 查询订单
-        resShipmentOrder.push(queryRes);
+        return {
+          ...resShipmentOrder,
+          ...queryRes
+        }
       }
 
       return resShipmentOrder;
     } catch (error) {
-      console.log('物流订单处理失败:', error); // 使用console.log代替this.log
-      throw error;
+      // 处理错误，例如记录日志或抛出异常
+        throw new Error(`物流订单处理失败: ${error}`);
+  
     }
   }