From d33ea059810a6a3f93525d446707481582593796 Mon Sep 17 00:00:00 2001 From: zhuotianyuan Date: Thu, 22 Jan 2026 12:01:25 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=BF=AE=E6=AD=A3=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=9A=84API=E7=AB=AF=E7=82=B9=E8=B7=AF?= =?UTF-8?q?=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/service/freightwaves.service.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/service/freightwaves.service.ts b/src/service/freightwaves.service.ts index 7b8f0df..6719629 100644 --- a/src/service/freightwaves.service.ts +++ b/src/service/freightwaves.service.ts @@ -267,7 +267,7 @@ export class FreightwavesService { partner: this.config.partner, }; - const response = await this.sendRequest('shipService/order/rateTry', requestData); + const response = await this.sendRequest('shipService/order/createOrder', requestData); return response.data; } -- 2.40.1 From cd6c0f0bacc46d7c63b175373070ffcb59bf19d9 Mon Sep 17 00:00:00 2001 From: zhuotianyuan Date: Thu, 22 Jan 2026 12:03:45 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix(logistics):=20=E6=A0=B9=E6=8D=AE?= =?UTF-8?q?=E7=89=A9=E6=B5=81=E5=B9=B3=E5=8F=B0=E9=80=89=E6=8B=A9=E6=AD=A3?= =?UTF-8?q?=E7=A1=AE=E7=9A=84=E8=BF=90=E5=8D=95=E5=8F=B7=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 当物流平台为uniuni时使用tno字段，其他平台使用shipOrderId字段，确保同步到woocommerce的运单号正确 --- src/service/logistics.service.ts | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/service/logistics.service.ts b/src/service/logistics.service.ts index 14fb228..7285463 100644 --- a/src/service/logistics.service.ts +++ b/src/service/logistics.service.ts @@ -398,10 +398,16 @@ export class LogisticsService { const shipmentRepo = manager.getRepository(Shipment); const tracking_provider = data.shipmentPlatform; // todo: id未确定,后写进常数 + let co:any; + if (data.shipmentPlatform === 'uniuni') { + co = resShipmentOrder.data.tno; + }else{ + co = resShipmentOrder.data?.shipOrderId; + } // 同步物流信息到woocommerce const site = await this.siteService.get(Number(order.siteId), true); const res = await this.wpService.createFulfillment(site, order.externalOrderId, { - tracking_number: resShipmentOrder.data.tno, + tracking_number: co, tracking_provider: tracking_provider, }); -- 2.40.1