feat(logistics): 完善freightwaves运费试算接口实现

重构convertToFreightwavesRateTry方法，添加地址查询逻辑
移除freightwaves服务中无用的测试方法
修复订单同步日志格式和注释

src/dto/logistics.dto.ts

@@ -34,7 +34,7 @@ export class ShipmentFeeBookDTO {
   @ApiProperty()
   sender: string;
   @ApiProperty()
-  startPhone: string;
+  startPhone: string|any;
   @ApiProperty()
   startPostalCode: string;
   @ApiProperty()

src/entity/shipping_address.entity.ts

@@ -47,6 +47,11 @@ export class ShippingAddress {
   @Expose()
   phone_number_country: string;
 
+  @ApiProperty()
+  @Column()
+  @Expose()
+  email: string;
+
   @ApiProperty({
     example: '2022-12-12 11:11:11',
     description: '创建时间',

src/service/freightwaves.service.ts

@@ -314,250 +314,10 @@ export class FreightwavesService {
       ...params,
       partner: this.config.partner,
     };
-
     const response = await this.sendRequest<RefundOrderResponseData>('/shipService/order/refundOrder', requestData);
     return response.data;
   }
 
-  /**
-   * 测试创建订单方法
-   * 用于演示如何使用createOrder方法
-   */
-  async testCreateOrder() {
-    try {
-      // 设置必要的配置
-      this.setConfig({
-        appSecret: 'gELCHguGmdTLo!zfihfM91hae8G@9Sz23Mh6pHrt',
-        apiBaseUrl: 'http://tms.freightwaves.ca:8901/',
-        partner: '25072621035200000060'
-      });
-
-      // 准备测试数据
-      const testParams: Omit<CreateOrderRequest, 'partner'> = {
-        shipCompany: 'UPSYYZ7000NEW',
-        partnerOrderNumber: `test-order-${Date.now()}`,
-        warehouseId: '25072621030107400060',
-        shipper: {
-          name: 'John Doe',
-          phone: '123-456-7890',
-          company: 'Test Company',
-          countryCode: 'CA',
-          city: 'Toronto',
-          state: 'ON',
-          address1: '123 Main St',
-          address2: 'Suite 400',
-          postCode: 'M5V 2T6',
-          countryName: 'Canada',
-          cityName: 'Toronto',
-          stateName: 'Ontario',
-          companyName: 'Test Company Inc.'
-        },
-        reciver: {
-          name: 'Jane Smith',
-          phone: '987-654-3210',
-          company: 'Receiver Company',
-          countryCode: 'CA',
-          city: 'Vancouver',
-          state: 'BC',
-          address1: '456 Oak St',
-          address2: '',
-          postCode: 'V6J 2A9',
-          countryName: 'Canada',
-          cityName: 'Vancouver',
-          stateName: 'British Columbia',
-          companyName: 'Receiver Company Ltd.'
-        },
-        packages: [
-          {
-            dimensions: {
-              length: 10,
-              width: 8,
-              height: 6,
-              lengthUnit: 'IN',
-              weight: 5,
-              weightUnit: 'LB'
-            },
-            currency: 'CAD',
-            description: 'Test Package'
-          }
-        ],
-        declaration: {
-          boxNo: 'BOX-001',
-          sku: 'TEST-SKU-001',
-          cnname: '测试产品',
-          enname: 'Test Product',
-          declaredPrice: 100,
-          declaredQty: 1,
-          material: 'Plastic',
-          intendedUse: 'General use',
-          cweight: 5,
-          hsCode: '39269090',
-          battery: 'No'
-        },
-        signService: 0
-      };
-
-      // 调用创建订单方法
-      this.log('开始测试创建订单...');
-      this.log('测试参数:', testParams);
-
-      // 注意：在实际环境中取消注释以下行来执行真实请求
-      const result = await this.createOrder(testParams);
-      this.log('创建订单成功:', result);
-
-
-      // 返回模拟结果
-      return {
-        partnerOrderNumber: testParams.partnerOrderNumber,
-        shipOrderId: `simulated-shipOrderId-${Date.now()}`
-      };
-    } catch (error) {
-      this.log('测试创建订单失败:', error);
-      throw error;
-    }
-  }
-
-  /**
-   * 测试费用试算方法
-   * @returns 费用试算结果
-   */
-  async testRateTry() {
-    try {
-      // 设置必要的配置
-      this.setConfig({
-        appSecret: 'gELCHguGmdTLo!zfihfM91hae8G@9Sz23Mh6pHrt',
-        apiBaseUrl: 'http://tms.freightwaves.ca:8901',
-        partner: '25072621035200000060'
-      });
-
-      // 准备测试数据 - 符合RateTryRequest接口要求
-      const testParams: Omit<RateTryRequest, 'partner'> = {
-        shipCompany: 'UPSYYZ7000NEW',
-        partnerOrderNumber: `test-rate-try-${Date.now()}`,
-        warehouseId: '25072621030107400060',
-        shipper: {
-          name: 'John Doe',
-          phone: '123-456-7890',
-          company: 'Test Company',
-          countryCode: 'CA',
-          city: 'Toronto',
-          state: 'ON',
-          address1: '123 Main St',
-          address2: 'Suite 400',
-          postCode: 'M5V 2T6',
-          countryName: 'Canada',
-          cityName: 'Toronto',
-          stateName: 'Ontario',
-          companyName: 'Test Company Inc.'
-        },
-        reciver: {
-          name: 'Jane Smith',
-          phone: '987-654-3210',
-          company: 'Receiver Company',
-          countryCode: 'CA',
-          city: 'Vancouver',
-          state: 'BC',
-          address1: '456 Oak St',
-          address2: '',
-          postCode: 'V6J 2A9',
-          countryName: 'Canada',
-          cityName: 'Vancouver',
-          stateName: 'British Columbia',
-          companyName: 'Receiver Company Ltd.'
-        },
-        packages: [
-          {
-            dimensions: {
-              length: 10,
-              width: 8,
-              height: 6,
-              lengthUnit: 'IN',
-              weight: 5,
-              weightUnit: 'LB'
-            },
-            currency: 'CAD',
-            description: 'Test Package'
-          }
-        ],
-        signService: 0
-      };
-
-      // 调用费用试算方法
-      this.log('开始测试费用试算...');
-      this.log('测试参数:', testParams);
-
-      // 注意：在实际环境中取消注释以下行来执行真实请求
-      const result = await this.rateTry(testParams);
-      this.log('费用试算成功:', result);
-
-      this.log('测试完成：费用试算方法调用成功（模拟）');
-      this.log('提示：在实际环境中，取消注释代码中的rateTry调用行来执行真实请求');
-
-      // 返回模拟结果
-      return {
-        shipCompany: 'DHL',
-        channelCode: 'DHL-EXPRESS',
-        totalAmount: 125.50,
-        currency: 'CAD'
-      };
-    } catch (error) {
-      this.log('测试费用试算失败:', error);
-      throw error;
-    }
-  }
-
-  /**
-   * 测试查询订单方法
-   * @returns 查询订单结果
-   */
-  async testQueryOrder() {
-    try {
-      // 设置必要的配置
-      this.setConfig({
-        appSecret: 'gELCHguGmdTLo!zfihfM91hae8G@9Sz23Mh6pHrt',
-        apiBaseUrl: 'http://freightwaves.ca:8901',
-        partner: '25072621035200000060'
-      });
-
-      // 准备测试数据 - 可以通过partnerOrderNumber或shipOrderId查询
-      const testParams: Omit<QueryOrderRequest, 'partner'> = {
-        // 选择其中一个参数进行测试
-        partnerOrderNumber: 'test-order-123456789', // 示例订单号
-        // shipOrderId: 'simulated-shipOrderId-123456789' // 或者使用运单号
-      };
-
-      // 调用查询订单方法
-      this.log('开始测试查询订单...');
-      this.log('测试参数:', testParams);
-
-      // 注意：在实际环境中取消注释以下行来执行真实请求
-      const result = await this.queryOrder(testParams);
-      this.log('查询订单成功:', result);
-
-      this.log('测试完成：查询订单方法调用成功（模拟）');
-
-      // 返回模拟结果
-      return {
-        thirdOrderId: 'thirdOrder-123456789',
-        shipCompany: 'DHL',
-        expressFinish: 0,
-        expressFailMsg: '',
-        expressOrder: {
-          mainTrackingNumber: '1234567890',
-          labelPath: ['https://example.com/label.pdf'],
-          totalAmount: 100,
-          currency: 'CAD',
-          balance: 50
-        },
-        partnerOrderNumber: testParams.partnerOrderNumber,
-        shipOrderId: 'simulated-shipOrderId-123456789'
-      };
-    } catch (error) {
-      this.log('测试查询订单失败:', error);
-      throw error;
-    }
-  }
-
   /**
    * 辅助日志方法，处理logger可能未定义的情况
    * @param message 日志消息

src/service/logistics.service.ts

@@ -279,8 +279,7 @@ export class LogisticsService {
 
         shipmentRepo.remove(shipment);
 
-        const res = await this.uniExpressService.deleteShipment(shipment.return_tracking_number);
+        await this.uniExpressService.deleteShipment(shipment.return_tracking_number);
-        console.log('res', res.data); // todo
 
         await orderRepo.save(order);
 
@@ -310,7 +309,6 @@ export class LogisticsService {
         console.log('同步到woocommerce失败', error);
         return true;
       }
-
       return true;
     } catch {
       throw new Error('删除运单失败');
@@ -330,14 +328,12 @@ export class LogisticsService {
       if (data.shipmentPlatform === 'uniuni') {
         resShipmentFee = await this.uniExpressService.getRates(reqBody);
       } else if (data.shipmentPlatform === 'freightwaves') {
-
+        const fre_reqBody = await this.convertToFreightwavesRateTry(data);
-
+        resShipmentFee = await this.freightwavesService.rateTry(fre_reqBody);
-        //  resShipmentFee = await this.freightwavesService.rateTry(reqBody);
       } else {
         throw new Error('不支持的运单平台');
       }
 
-
       if (resShipmentFee.status !== 'SUCCESS') {
         throw new Error(resShipmentFee.ret_msg);
       }
@@ -362,10 +358,9 @@ export class LogisticsService {
 
     let resShipmentOrder;
     try {
-
       resShipmentOrder = await this.mepShipment(data, order);
 
-      // 记录物流信息,并将订单状态转到完成
+      // 记录物流信息,并将订单状态转到完成,uniuni状态为SUCCESS，tms.freightwaves状态为00000200
       if (resShipmentOrder.status === 'SUCCESS' || resShipmentOrder.code === '00000200') {
         order.orderStatus = ErpOrderStatus.COMPLETED;
       } else {
@@ -443,25 +438,23 @@ export class LogisticsService {
             shipmentId = shipment.id;
           }
           if (order.status !== OrderStatus.COMPLETED) {
+            // shopyy未提供更新订单接口，暂不更新订单状态
             // await this.shopyyService.updateOrder(site, order.externalOrderId, {
             //   status: OrderStatus.COMPLETED,
             // });
             order.status = OrderStatus.COMPLETED;
           }
         }
-
         order.orderStatus = ErpOrderStatus.COMPLETED;
-
         await orderRepo.save(order);
       }).catch(error => {
         transactionError = error
+        throw new Error(`请求错误:${error}`);
       });
 
       if (transactionError !== undefined) {
-        console.log('err', transactionError);
         throw transactionError;
       }
-
       // 更新产品发货信息
       this.orderService.updateOrderSales(order.id, sales);
 
@@ -733,7 +726,6 @@ export class LogisticsService {
             'order_id': order.externalOrderId // todo: 需要获取订单的externalOrderId
           }
         };
-
         // 添加运单
         resShipmentOrder = await this.uniExpressService.createShipment(reqBody);
       }
@@ -742,7 +734,7 @@ export class LogisticsService {
         // 根据TMS系统对接说明文档格式化参数
         const reqBody: any = {
           shipCompany: 'UPSYYZ7000NEW',
-          partnerOrderNumber: order.siteId + '-1-' + order.externalOrderId,
+          partnerOrderNumber: order.siteId + '-' + order.externalOrderId,
           warehouseId: '25072621030107400060',
           shipper: {
             name: data.details.origin.contact_name, // 姓名
@@ -806,10 +798,9 @@ export class LogisticsService {
         };
 
         resShipmentOrder = await this.freightwavesService.createOrder(reqBody); // 创建订单
+        //tms只返回了物流订单号，需要查询一次来获取完整的物流信息
         const queryRes = await this.freightwavesService.queryOrder({ shipOrderId: resShipmentOrder.shipOrderId }); // 查询订单
-        console.log('queryRes:', queryRes); // 打印查询结果
         resShipmentOrder.push(queryRes);
-
       }
 
       return resShipmentOrder;
@@ -824,41 +815,49 @@ export class LogisticsService {
    * @param data ShipmentFeeBookDTO数据
    * @returns RateTryRequest格式的数据
    */
-  convertToFreightwavesRateTry(data: ShipmentFeeBookDTO): Omit<RateTryRequest, 'partner'> {
+  async convertToFreightwavesRateTry(data: ShipmentFeeBookDTO): Promise<Omit<RateTryRequest, 'partner'>> {
+
+    const shipments = await this.shippingAddressModel.findOne({
+      where: {
+        id: data.address_id,
+      },
+    })
+
+    const address = shipments?.address;
     // 转换为RateTryRequest格式
-    return {
+    const r = {
       shipCompany: 'UPSYYZ7000NEW', // 必填，但ShipmentFeeBookDTO中缺少
       partnerOrderNumber: `order-${Date.now()}`, // 必填，使用时间戳生成
       warehouseId: '25072621030107400060', // 可选，使用stockPointId转换
       shipper: {
         name: data.sender, // 必填
-        phone: data.startPhone, // 必填
+        phone: data.startPhone.phone, // 必填
-        company: '', // 必填，但ShipmentFeeBookDTO中缺少
+        company: address.country, // 必填，但ShipmentFeeBookDTO中缺少
         countryCode: data.shipperCountryCode, // 必填
-        city: '', // 必填，但ShipmentFeeBookDTO中缺少
+        city: address.city || '', // 必填，但ShipmentFeeBookDTO中缺少
-        state: '', // 必填，但ShipmentFeeBookDTO中缺少
+        state: address.region || '', // 必填，但ShipmentFeeBookDTO中缺少
-        address1: data.pickupAddress, // 必填
+        address1: address.address_line_1, // 必填
-        address2: '', // 必填，但ShipmentFeeBookDTO中缺少
+        address2: address.address_line_1 || '', // 必填，但ShipmentFeeBookDTO中缺少
         postCode: data.startPostalCode, // 必填
-        countryName: '', // 必填，但ShipmentFeeBookDTO中缺少
+        countryName: address.country || '', // 必填，但ShipmentFeeBookDTO中缺少
-        cityName: '', // 必填，但ShipmentFeeBookDTO中缺少
+        cityName: address.city || '', // 必填，但ShipmentFeeBookDTO中缺少
-        stateName: '', // 必填，但ShipmentFeeBookDTO中缺少
+        stateName: address.region || '', // 必填，但ShipmentFeeBookDTO中缺少
-        companyName: '', // 必填，但ShipmentFeeBookDTO中缺少
+        companyName: address.country || '', // 必填，但ShipmentFeeBookDTO中缺少
       },
       reciver: {
         name: data.receiver, // 必填
         phone: data.receiverPhone, // 必填
-        company: '', // 必填，但ShipmentFeeBookDTO中缺少
+        company: address.country,// 必填，但ShipmentFeeBookDTO中缺少
         countryCode: data.country, // 必填，使用country代替countryCode
         city: data.city, // 必填
         state: data.province, // 必填，使用province代替state
         address1: data.deliveryAddress, // 必填
-        address2: '', // 必填，但ShipmentFeeBookDTO中缺少
+        address2: data.deliveryAddress,  // 必填，但ShipmentFeeBookDTO中缺少
         postCode: data.postalCode, // 必填
-        countryName: '', // 必填，但ShipmentFeeBookDTO中缺少
+        countryName: address.country, // 必填，但ShipmentFeeBookDTO中缺少
-        cityName: data.city, // 必填，使用city代替cityName
+        cityName: data.city || '', // 必填，使用city代替cityName
-        stateName: data.province, // 必填，使用province代替stateName
+        stateName: data.province || '', // 必填，使用province代替stateName
-        companyName: '', // 必填，但ShipmentFeeBookDTO中缺少
+        companyName: address.country || '', // 必填，但ShipmentFeeBookDTO中缺少
       },
       packages: [
         {
@@ -866,9 +865,9 @@ export class LogisticsService {
             length: data.length, // 必填
             width: data.width, // 必填
             height: data.height, // 必填
-            lengthUnit: (data.dimensionUom.toUpperCase() === 'CM' ? 'CM' : 'IN') as 'CM' | 'IN', // 必填，转换为有效的单位
+            lengthUnit: (data.dimensionUom === 'IN' ? 'IN' : 'CM') as 'IN' | 'CM', // 必填，转换为有效的单位
             weight: data.weight, // 必填
-            weightUnit: (data.weightUom.toUpperCase() === 'KG' ? 'KG' : 'LB') as 'KG' | 'LB', // 必填，转换为有效的单位
+            weightUnit: (data.weightUom === 'LBS' ? 'LB' : 'KG') as 'LB' | 'KG', // 必填，转换为有效的单位  
           },
           currency: 'CAD', // 必填，但ShipmentFeeBookDTO中缺少，使用默认值
           description: 'Package', // 必填，但ShipmentFeeBookDTO中缺少，使用默认值
@@ -876,31 +875,6 @@ export class LogisticsService {
       ],
       signService: 0, // 可选，默认不使用签名服务
     };
-  }
+    return r as any;
-
-  /**
-   * 获取ShipmentFeeBookDTO缺少的freightwaves必填字段
-   * @returns 缺少的必填字段列表
-   */
-  getMissingFreightwavesFields(): string[] {
-    return [
-      'shipCompany', // 渠道
-      'partnerOrderNumber', // 第三方客户订单编号
-      'shipper.company', // 发货人公司
-      'shipper.city', // 发货人城市
-      'shipper.state', // 发货人州/省Code
-      'shipper.address2', // 发货人详细地址2
-      'shipper.countryName', // 发货人国家名称
-      'shipper.cityName', // 发货人城市名称
-      'shipper.stateName', // 发货人州/省名称
-      'shipper.companyName', // 发货人公司名称
-      'reciver.company', // 收货人公司
-      'reciver.address2', // 收货人详细地址2
-      'reciver.countryName', // 收货人国家名称
-      'reciver.companyName', // 收货人公司名称
-      'packages[0].currency', // 包裹币种
-      'packages[0].description', // 包裹描述
-      'partner', // 商户ID
-    ];
   }
 }