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; } 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, });