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}`);
+  
     }
   }