diff --git a/src/service/logistics.service.ts b/src/service/logistics.service.ts index 19c0ed9..997bd17 100644 --- a/src/service/logistics.service.ts +++ b/src/service/logistics.service.ts @@ -73,7 +73,7 @@ export class LogisticsService { @Inject() uniExpressService: UniExpressService; - @Inject() + @Inject() freightwavesService: FreightwavesService; @Inject() @@ -141,7 +141,7 @@ export class LogisticsService { } -//"expressFinish": 0, //是否快递创建完成(1:完成 0:未完成,需要轮询 2:失败) + //"expressFinish": 0, //是否快递创建完成(1:完成 0:未完成,需要轮询 2:失败) async updateFreightwavesShipmentState(shipment: Shipment) { try { const data = await this.freightwavesService.queryOrder({ shipOrderId: shipment.order_id.toString() }); @@ -151,9 +151,9 @@ export class LogisticsService { throw new Error('获取运单状态失败,原因为' + data.expressFailMsg) } - if (data.expressFinish === 0) { - shipment.state = '203'; - shipment.finished = true; + if (data.expressFinish === 0) { + shipment.state = '203'; + shipment.finished = true; } this.shipmentModel.save(shipment); @@ -372,7 +372,7 @@ export class LogisticsService { // } // } - resShipmentOrder =await this.mepShipment(data,order); + resShipmentOrder = await this.mepShipment(data, order); // if (data.shipmentPlatform === 'uniuni') { // // 添加运单 @@ -385,7 +385,7 @@ export class LogisticsService { // } // 记录物流信息,并将订单状态转到完成 - if (resShipmentOrder.status === 'SUCCESS'||resShipmentOrder.code === '00000200') { + if (resShipmentOrder.status === 'SUCCESS' || resShipmentOrder.code === '00000200') { order.orderStatus = ErpOrderStatus.COMPLETED; } else { throw new Error('运单生成失败'); @@ -398,18 +398,18 @@ export class LogisticsService { const shipmentRepo = manager.getRepository(Shipment); const tracking_provider = data.shipmentPlatform; // todo: id未确定,后写进常数 - let co:any; - let unique_id:any; - let state:any; - if (data.shipmentPlatform === 'uniuni') { + 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{ + } else { co = resShipmentOrder.data?.shipOrderId; unique_id = resShipmentOrder.data?.shipOrderId; state = ErpOrderStatus.COMPLETED; - } + } // 同步物流信息到woocommerce const site = await this.siteService.get(Number(order.siteId), true); const res = await this.wpService.createFulfillment(site, order.externalOrderId, { @@ -433,15 +433,15 @@ export class LogisticsService { } // 同步订单状态到woocommerce - if(order.source_type!="shopyy"){ - if (order.status !== OrderStatus.COMPLETED) { - await this.wpService.updateOrder(site, order.externalOrderId, { - status: OrderStatus.COMPLETED, - }); - order.status = OrderStatus.COMPLETED; + if (order.source_type != "shopyy") { + if (order.status !== OrderStatus.COMPLETED) { + await this.wpService.updateOrder(site, order.externalOrderId, { + status: OrderStatus.COMPLETED, + }); + order.status = OrderStatus.COMPLETED; + } } - } - + order.orderStatus = ErpOrderStatus.COMPLETED; await orderRepo.save(order); @@ -693,7 +693,7 @@ export class LogisticsService { - async mepShipment(data: ShipmentBookDTO,order:Order) { + async mepShipment(data: ShipmentBookDTO, order: Order) { try { const stock_point = await this.stockPointModel.findOneBy({ id: data.stockPointId }); let resShipmentOrder; @@ -734,9 +734,9 @@ export class LogisticsService { if (data.shipmentPlatform === 'freightwaves') { // 根据TMS系统对接说明文档格式化参数 const reqBody: any = { - shipCompany: 'UPSYYZ7000NEW', - partnerOrderNumber: order.siteId+'-'+order.externalOrderId , - warehouseId: '25072621030107400060', + shipCompany: 'UPSYYZ7000NEW', + partnerOrderNumber: order.siteId + '-' + order.externalOrderId, + warehouseId: '25072621030107400060', shipper: { name: data.details.origin.contact_name, // 姓名 phone: data.details.origin.phone_number.number, // 电话(提取number属性转换为字符串) @@ -778,7 +778,7 @@ export class LogisticsService { weightUnit: (data.details.packaging_properties.packages[0].measurements.weight.unit === 'kg' ? 'KG' : 'LB') as 'KG' | 'LB' // 重量单位(LB,KG) }, currency: 'CAD', // 币种(默认CAD) - description: '订单编号:'+order.externalOrderId // 包裹描述(确保是字符串类型) + description: '订单编号:' + order.externalOrderId // 包裹描述(确保是字符串类型) } ], signService: 0