src/service/logistics.service.ts

@@ -399,16 +399,10 @@ export class LogisticsService {
         const tracking_provider = data.shipmentPlatform; // todo: id未确定,后写进常数
 
          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);
@@ -421,10 +415,10 @@ export class LogisticsService {
           const shipment = await shipmentRepo.save({
             tracking_provider: tracking_provider,
             tracking_id: res.data.tracking_id,
-            unique_id: unique_id,
+            unique_id: resShipmentOrder.data.uni_order_sn,
             stockPointId: String(data.stockPointId), // todo
-            state: state,
-            return_tracking_number: co,
+            state: resShipmentOrder.data.uni_status_code,
+            return_tracking_number: resShipmentOrder.data.tno,
             fee: data.details.shipmentFee,
             order: order
           });
@@ -735,7 +729,7 @@ export class LogisticsService {
         // 根据TMS系统对接说明文档格式化参数
         const reqBody: any = {
         shipCompany: 'UPSYYZ7000NEW',
-          partnerOrderNumber: order.siteId + '-' + order.externalOrderId,
+        partnerOrderNumber: order.externalOrderId ,
         warehouseId: '25072621030107400060',
           shipper: {
             name: data.details.origin.contact_name, // 姓名