2026-01-21 12:06:30 +00:00
4 changed files with 76 additions and 35 deletions
--- a/src/dto/logistics.dto.ts
+++ b/src/dto/logistics.dto.ts
@ -21,6 +21,7 @@ export class ShipmentBookDTO {
  orderIds?: number[];

  @ApiProperty()
+  @Rule(RuleType.string())
  shipmentPlatform: string;
 }

--- a/src/service/freightwaves.service.ts
+++ b/src/service/freightwaves.service.ts
@ -118,8 +118,8 @@ interface RateTryResponseData {

 // 创建订单响应数据接口
 interface CreateOrderResponseData {
-  partnerOrderNumber: string;
-  shipOrderId: string;
+  msg: string;
+  data: any;
 }

 // 查询订单响应数据接口
@ -152,8 +152,8 @@ export class FreightwavesService {
 // 默认配置
  private config: FreightwavesConfig = {
    appSecret: 'gELCHguGmdTLo!zfihfM91hae8G@9Sz23Mh6pHrt',
-    apiBaseUrl: 'https://tms.freightwaves.ca',
-    partner: '25072621035200000060',
+        apiBaseUrl: 'http://tms.freightwaves.ca:8901/',
+        partner: '25072621035200000060'
  };

  // 初始化配置
--- a/src/service/logistics.service.ts
+++ b/src/service/logistics.service.ts
@ -343,7 +343,6 @@ export class LogisticsService {

    let resShipmentOrder;
    try {
-       resShipmentOrder = this.mepShipment(data);
      //const stock_point = await this.stockPointModel.findOneBy({ id: data.stockPointId });
      // const reqBody = {
      //   sender: data.details.origin.contact_name,
@ -373,11 +372,20 @@ export class LogisticsService {
      //   }
      // }

+         resShipmentOrder =await this.mepShipment(data,order);
+
+      // if (data.shipmentPlatform === 'uniuni') {
      //   // 添加运单
      // resShipmentOrder = await this.uniExpressService.createShipment(reqBody);
+      // }

-      // // 记录物流信息，并将订单状态转到完成
-      if (resShipmentOrder.status === 'SUCCESS') {
+      // if (data.shipmentPlatform === 'freightwaves') {
+      //   // 添加运单
+      //   resShipmentOrder = await this.freightcomService.createShipment(reqBody);
+      // }
+
+      // 记录物流信息,并将订单状态转到完成
+      if (resShipmentOrder.status === 'SUCCESS'||resShipmentOrder.code === '00000200') {
        order.orderStatus = ErpOrderStatus.COMPLETED;
      } else {
        throw new Error('运单生成失败');
@ -388,11 +396,11 @@ export class LogisticsService {
      await dataSource.transaction(async manager => {
        const orderRepo = manager.getRepository(Order);
        const shipmentRepo = manager.getRepository(Shipment);
-        const tracking_provider = 'UniUni'; // todo: id未确定，后写进常数
+        const tracking_provider = data.shipmentPlatform; // todo: id未确定,后写进常数

        // 同步物流信息到woocommerce
        const site = await this.siteService.get(Number(order.siteId), true);
-        const res = await this.wpService.createShipment(site, order.externalOrderId, {
+        const res = await this.wpService.createFulfillment(site, order.externalOrderId, {
          tracking_number: resShipmentOrder.data.tno,
          tracking_provider: tracking_provider,
        });
@ -413,12 +421,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;
        }
+      }
+      
        order.orderStatus = ErpOrderStatus.COMPLETED;

        await orderRepo.save(order);
@ -443,7 +454,7 @@ export class LogisticsService {
      if (resShipmentOrder.status === 'SUCCESS') {
        await this.uniExpressService.deleteShipment(resShipmentOrder.data.tno);
      }
-      throw new Error(`上游请求错误：${error}`);
+      throw new Error(`上游请求错误:${error}`);
    }
  }

@ -670,8 +681,7 @@ export class LogisticsService {



-  
-  async mepShipment(data: ShipmentBookDTO) {
+  async mepShipment(data: ShipmentBookDTO,order:Order) {
    try {
      const stock_point = await this.stockPointModel.findOneBy({ id: data.stockPointId });
      let resShipmentOrder;
@ -701,7 +711,7 @@ export class LogisticsService {
          weight_uom: data.details.packaging_properties.packages[0].measurements.weight.unit,
          currency: 'CAD',
          custom_field: {
-            'order_id': '' // todo: 需要获取订单的externalOrderId
+            'order_id': order.externalOrderId // todo: 需要获取订单的externalOrderId
          }
        };

@ -711,10 +721,10 @@ export class LogisticsService {

      if (data.shipmentPlatform === 'freightwaves') {
        // 根据TMS系统对接说明文档格式化参数
-        const reqBody = {
-          shipCompany: '', // 渠道(可以不指定)
-          partnerOrderNumber: `order-${Date.now()}`, // 第三方客户订单编号（唯一）
-          warehouseId: String(stock_point.upStreamStockPointId), // 发货仓库编号（转换为字符串类型）
+        const reqBody: any = {
+        shipCompany: 'UPSYYZ7000NEW',
+        partnerOrderNumber: order.externalOrderId ,
+        warehouseId: '25072621030107400060',
          shipper: {
            name: data.details.origin.contact_name, // 姓名
            phone: data.details.origin.phone_number.number, // 电话（提取number属性转换为字符串）
@ -756,22 +766,22 @@ 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: 'Package' // 包裹描述（确保是字符串类型）
+              description: '订单编号:'+order.externalOrderId  // 包裹描述（确保是字符串类型）
            }
          ],
-          signService: 0 as 0 | 1, // 签名服务 0不使用, 1使用
+          signService: 0, // 签名服务 0不使用, 1使用
          declaration: {
-            boxNo: 'BOX-001', // 箱号
-            sku: 'DEFAULT-SKU', // SKU
-            cnname: '默认商品', // 中文名称
-            enname: 'Default Product', // 英文名称
-            declaredPrice: 0, // 申报价格
-            declaredQty: 1, // 申报数量
-            material: 'General', // 材质
-            intendedUse: 'General use', // 用途
-            cweight: data.details.packaging_properties.packages[0].measurements.weight.value, // 重量
-            hsCode: '39269090', // 海关编码
-            battery: 'No' // 是否含电池
+            "boxNo": "", //箱子编号
+            "sku": "", //SKU
+            "cnname": "", //中文名称
+            "enname": "", //英文名称
+            "declaredPrice": 1, //申报单价
+            "declaredQty": 1, //申报数量
+            "material": "", //材质
+            "intendedUse": "", //用途
+            "cweight": 1, //产品单重
+            "hsCode": "", //海关编码
+            "battery": "" //电池描述
          }
        };

--- a/src/service/wp.service.ts
+++ b/src/service/wp.service.ts
@ -403,4 +403,34 @@ export class WPService {
    };
    return await axios.request(config);
  }
+
+
+  async createFulfillment(
+    site: any,
+    orderId: string,
+    data: Record<string, any>
+  ) {
+    const apiUrl = site.apiUrl;
+    const { consumerKey, consumerSecret } = site;
+    const auth = Buffer.from(`${consumerKey}:${consumerSecret}`).toString(
+      'base64'
+    );
+    const config: AxiosRequestConfig = {
+      method: 'POST',
+      // 构建 URL,规避多/或少/问题
+      url: this.buildURL(
+        apiUrl,
+        '/wp-json',
+        'wc-ast/v3/orders',
+        orderId,
+        'shipment-trackings'
+      ),
+      headers: {
+        Authorization: `Basic ${auth}`,
+      },
+      data,
+    };
+    return await axios.request(config);
+  }
+
 }