src/dto/customer.dto.ts

@@ -27,9 +27,6 @@ export class QueryCustomerListDTO {
 
   @ApiProperty()
   customerId: number;
-
-  @ApiProperty()
-  phone: string;
 }
 
 export class CustomerTagDTO {

src/dto/logistics.dto.ts

@@ -23,10 +23,6 @@ export class ShipmentBookDTO {
   @ApiProperty()
   @Rule(RuleType.string())
   shipmentPlatform: string;
-
-  @ApiProperty()
-  @Rule(RuleType.any())
-  courierCompany: string;
 }
 
 export class ShipmentFeeBookDTO {
@@ -34,8 +30,6 @@ export class ShipmentFeeBookDTO {
   @ApiProperty()
   shipmentPlatform: string;
   @ApiProperty()
-  courierCompany: string;
-  @ApiProperty()
   stockPointId: number;
   @ApiProperty()
   sender: string;

src/service/customer.service.ts

@@ -28,17 +28,11 @@ export class CustomerService {
       first_purchase_date,
       customerId,
       rate,
-      phone,
     } = param;
 
     const whereConds: string[] = [];
     const havingConds: string[] = [];
 
-    // phone过滤
-    if (phone) {
-      whereConds.push(`o.billing LIKE '%${phone}%'`)
-    }
-
     // 邮箱搜索
     if (email) {
       whereConds.push(`o.customer_email LIKE '%${email}%'`);

src/service/logistics.service.ts

@@ -339,6 +339,8 @@ export class LogisticsService {
         throw new Error('不支持的运单平台');
       }
 
+
+
     } catch (e) {
       throw e;
     }
@@ -361,7 +363,12 @@ export class LogisticsService {
     try {
       resShipmentOrder = await this.mepShipment(data, order);
 
+      // 记录物流信息,并将订单状态转到完成,uniuni状态为SUCCESS，tms.freightwaves状态为00000200
+      if (resShipmentOrder.status === 'SUCCESS' || resShipmentOrder.code === '00000200') {
         order.orderStatus = ErpOrderStatus.COMPLETED;
+      } else {
+        throw new Error('运单生成失败');
+      }
       const dataSource = this.dataSourceManager.getDataSource('default');
       let transactionError = undefined;
       let shipmentId = undefined;
@@ -460,7 +467,7 @@ export class LogisticsService {
         }
       };
     } catch (error) {
-      if (resShipmentOrder?.status === 'SUCCESS') {
+      if (resShipmentOrder.status === 'SUCCESS') {
         await this.uniExpressService.deleteShipment(resShipmentOrder.data.tno);
       }
       throw new Error(`上游请求错误:${error}`);
@@ -725,18 +732,12 @@ export class LogisticsService {
         };
         // 添加运单
         resShipmentOrder = await this.uniExpressService.createShipment(reqBody);
-
-        // 记录物流信息,并将订单状态转到完成,uniuni状态为SUCCESS，tms.freightwaves状态为00000200
-        if (resShipmentOrder.status !== 'SUCCESS') {
-          throw new Error('运单生成失败');
-        }
       }
 
       if (data.shipmentPlatform === 'freightwaves') {
         // 根据TMS系统对接说明文档格式化参数
         const reqBody: any = {
-          // shipCompany: 'UPSYYZ7000NEW',
+          shipCompany: 'UPSYYZ7000NEW',
-          shipCompany: data.courierCompany,
           partnerOrderNumber: order.siteId + '-' + order.externalOrderId,
           warehouseId: '25072621030107400060',
           shipper: {
@@ -803,10 +804,7 @@ export class LogisticsService {
         resShipmentOrder = await this.freightwavesService.createOrder(reqBody); // 创建订单
         //tms只返回了物流订单号，需要查询一次来获取完整的物流信息
         const queryRes = await this.freightwavesService.queryOrder({ shipOrderId: resShipmentOrder.shipOrderId }); // 查询订单
-        return {
+        resShipmentOrder.push(queryRes);
-          ...resShipmentOrder,
-          ...queryRes
-        }
       }
 
       return resShipmentOrder;
@@ -817,7 +815,11 @@ export class LogisticsService {
   }
 
 
-  
+  /**
+   * 将ShipmentFeeBookDTO转换为freightwaves的RateTryRequest格式
+   * @param data ShipmentFeeBookDTO数据
+   * @returns RateTryRequest格式的数据
+   */
   /**
    * 将ShipmentFeeBookDTO转换为freightwaves的RateTryRequest格式
    * @param data ShipmentFeeBookDTO数据
@@ -834,8 +836,7 @@ export class LogisticsService {
     const address = shipments?.address;
     // 转换为RateTryRequest格式
     const r = {
-      // shipCompany: 'UPSYYZ7000NEW',
+      shipCompany: 'UPSYYZ7000NEW', // 必填，但ShipmentFeeBookDTO中缺少
-      shipCompany: data.courierCompany,
       partnerOrderNumber: `order-${Date.now()}`, // 必填，使用时间戳生成
       warehouseId: '25072621030107400060', // 可选，使用stockPointId转换
       shipper: {