From acecd3bef4737a4d441c04c28893a43991e4c6ae Mon Sep 17 00:00:00 2001 From: zhuotianyuan Date: Thu, 22 Jan 2026 14:37:46 +0800 Subject: [PATCH] =?UTF-8?q?fix(logistics):=20=E4=BF=AE=E5=A4=8D=E7=89=A9?= =?UTF-8?q?=E6=B5=81=E6=9C=8D=E5=8A=A1=E4=B8=AD=E8=AE=A2=E5=8D=95=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E5=92=8C=E5=94=AF=E4=B8=80ID=E7=9A=84=E8=B5=8B?= =?UTF-8?q?=E5=80=BC=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修正uniuni和其他平台下unique_id和state的赋值问题，确保不同平台使用正确的值 同时将partnerOrderNumber格式修改为siteId-externalOrderId组合 --- src/service/logistics.service.ts | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/service/logistics.service.ts b/src/service/logistics.service.ts index 2ca180a..19c0ed9 100644 --- a/src/service/logistics.service.ts +++ b/src/service/logistics.service.ts @@ -398,11 +398,17 @@ export class LogisticsService { const shipmentRepo = manager.getRepository(Shipment); const tracking_provider = data.shipmentPlatform; // todo: id未确定,后写进常数 - let co:any; + let co:any; + let unique_id:any; + let state:any; if (data.shipmentPlatform === 'uniuni') { co = resShipmentOrder.data.tno; + unique_id = resShipmentOrder.data.uni_order_sn; + state = resShipmentOrder.data.uni_status_code; }else{ co = resShipmentOrder.data?.shipOrderId; + unique_id = resShipmentOrder.data?.shipOrderId; + state = ErpOrderStatus.COMPLETED; } // 同步物流信息到woocommerce const site = await this.siteService.get(Number(order.siteId), true); @@ -415,10 +421,10 @@ export class LogisticsService { const shipment = await shipmentRepo.save({ tracking_provider: tracking_provider, tracking_id: res.data.tracking_id, - unique_id: resShipmentOrder.data.uni_order_sn, + unique_id: unique_id, stockPointId: String(data.stockPointId), // todo - state: resShipmentOrder.data.uni_status_code, - return_tracking_number: resShipmentOrder.data.tno, + state: state, + return_tracking_number: co, fee: data.details.shipmentFee, order: order }); @@ -729,7 +735,7 @@ export class LogisticsService { // 根据TMS系统对接说明文档格式化参数 const reqBody: any = { shipCompany: 'UPSYYZ7000NEW', - partnerOrderNumber: order.externalOrderId , + partnerOrderNumber: order.siteId+'-'+order.externalOrderId , warehouseId: '25072621030107400060', shipper: { name: data.details.origin.contact_name, // 姓名