feat(物流): 添加freightwaves物流平台支持

实现freightwaves物流平台的集成，包括：
1. 新增freightwaves服务类，提供订单创建、查询等功能
2. 添加定时任务同步运单状态
3. 扩展物流DTO以支持多平台选择
4. 修改物流服务支持freightwaves平台订单处理

src/adapter/shopyy.adapter.ts

@@ -996,6 +996,7 @@ export class ShopyyAdapter implements ISiteAdapter {
   private async getProductBySku(sku: string): Promise<UnifiedProductDTO> {
     // 使用Shopyy API的搜索功能通过sku查询产品
     const response = await this.getAllProducts({ where: { sku } });
+    console.log('getProductBySku', response)
     const product = response?.[0]
     if (!product) {
       throw new Error(`未找到sku为${sku}的产品`);
@@ -1125,6 +1126,7 @@ export class ShopyyAdapter implements ISiteAdapter {
   // ========== 产品变体映射方法 ==========
   mapPlatformToUnifiedVariation(variant: ShopyyVariant): UnifiedProductVariationDTO {
     // 映射变体
+    console.log('ivarianttem', variant)
     return {
       id: variant.id,
       name: variant.title || '',

src/config/config.default.ts

@@ -42,7 +42,6 @@ import DictSeeder from '../db/seeds/dict.seeder';
 import CategorySeeder from '../db/seeds/category.seeder';
 import CategoryAttributeSeeder from '../db/seeds/category_attribute.seeder';
 import { SiteSku } from '../entity/site-sku.entity';
-import { logisticsAlias } from '../entity/logistics_alias.entity';
 
 export default {
   // use for cookie sign key, should change to your own and keep security
@@ -89,7 +88,6 @@ export default {
         Area,
         CategoryAttribute,
         Category,
-        logisticsAlias,
       ],
       synchronize: true,
       logging: false,

src/controller/area.controller.ts

@@ -40,6 +40,7 @@ export class AreaController {
       }));
       return successResponse(countryList, '查询成功');
     } catch (error) {
+      console.log(error);
       return errorResponse(error?.message || error);
     }
   }
@@ -53,6 +54,7 @@ export class AreaController {
       const newArea = await this.areaService.createArea(area);
       return successResponse(newArea, '创建成功');
     } catch (error) {
+      console.log(error);
       return errorResponse(error?.message || error);
     }
   }
@@ -66,6 +68,7 @@ export class AreaController {
       const updatedArea = await this.areaService.updateArea(id, area);
       return successResponse(updatedArea, '更新成功');
     } catch (error) {
+      console.log(error);
       return errorResponse(error?.message || error);
     }
   }
@@ -78,6 +81,7 @@ export class AreaController {
       await this.areaService.deleteArea(id);
       return successResponse(null, '删除成功');
     } catch (error) {
+      console.log(error);
       return errorResponse(error?.message || error);
     }
   }
@@ -91,6 +95,7 @@ export class AreaController {
       const { list, total } = await this.areaService.getAreaList(query);
       return successResponse({ list, total }, '查询成功');
     } catch (error) {
+      console.log(error);
       return errorResponse(error?.message || error);
     }
   }
@@ -106,6 +111,7 @@ export class AreaController {
       }
       return successResponse(area, '查询成功');
     } catch (error) {
+      console.log(error);
       return errorResponse(error?.message || error);
     }
   }

src/controller/order.controller.ts

@@ -42,7 +42,8 @@ export class OrderController {
       const result = await this.orderService.syncOrders(siteId, params);
       return successResponse(result);
     } catch (error) {
-      return errorResponse(`同步失败,${error?.message || '未知错误'}`);
+      console.log(error);
+      return errorResponse('同步失败');
     }
   }
 
@@ -58,6 +59,7 @@ export class OrderController {
       const result = await this.orderService.syncOrderById(siteId, orderId);
       return successResponse(result);
     } catch (error) {
+      console.log(error);
       return errorResponse('同步失败');
     }
   }

src/dto/logistics.dto.ts

@@ -28,7 +28,6 @@ export class ShipmentBookDTO {
   @Rule(RuleType.any())
   courierCompany: string;
 }
-
 export class ShipmentFeeBookDTO {
 
   @ApiProperty()

src/entity/logistics_alias.entity.ts

@@ -1,34 +0,0 @@
-
-import { ApiProperty } from '@midwayjs/swagger';
-import { Entity, CreateDateColumn, UpdateDateColumn, PrimaryGeneratedColumn, Column } from 'typeorm';
-
-@Entity('logistics_alias')
-export class logisticsAlias {
-  @PrimaryGeneratedColumn()
-  id: number;
-
-  @ApiProperty({ type: 'string' })
-  @Column()
-  logistics_company: string
-
-  @ApiProperty({ type: 'string' })
-  @Column()
-  logistics_alias: string
-
-  @ApiProperty({ type: 'string' })
-  @Column()
-  platform: string
-
-
-  // 是否可删除
-  @Column({ default: true, comment: '是否可删除' })
-  deletable: boolean;
-  // 创建时间
-  @CreateDateColumn()
-  createdAt: Date;
-
-  // 更新时间
-  @UpdateDateColumn()
-  updatedAt: Date;
-
-}

src/entity/site-sku.entity.ts

@@ -6,7 +6,6 @@ import {
 } from 'typeorm';
 import { ApiProperty } from '@midwayjs/swagger';
 import { Product } from './product.entity';
-// 这个其实是 alias 后面改一下
 @Entity('product_site_sku')
 export class SiteSku {
   @ApiProperty({ description: 'sku'})

src/service/Wintopay.service.ts

@@ -1,96 +0,0 @@
-import { Inject, Provide } from '@midwayjs/core';
-import axios from 'axios';
-import dayjs = require('dayjs');
-import utc = require('dayjs/plugin/utc');
-import timezone = require('dayjs/plugin/timezone');
-
-// 扩展dayjs功能
-dayjs.extend(utc);
-dayjs.extend(timezone);
-
-
-// Wintopay 物流更新请求接口
-interface LogisticsUpdateRequest {
-  trade_id: string; // 订单的流水号
-  track_number: string; // 物流单号
-  track_brand: string; // 物流公司编号
-}
-
-// Wintopay 物流更新响应接口
-interface LogisticsUpdateResponse {
-  code: string;
-  message: string;
-  data: {
-    trade_id: string;
-    track_brand: string;
-    track_number: string;
-    time: number;
-  };
-  error: any;
-  request_id: string;
-}
-
-@Provide()
-export class WintopayService {
-  @Inject() logger;
-
-  // 默认配置
-  private config = {
-    //测试环境配置，在生产环境记得换掉    
-    apiBaseUrl: 'https://stage-merchant-api.wintopay.com',
-    Authorization: 'Bearer kV8w1er8dFw9p9g2kb0mer398hD8hfWk',
-  };
-
-  // 发送请求
-  private async sendRequest<T>(url: string, data: any): Promise<T> {
-    try {
-      const headers = {
-        'Content-Type': 'application/json',
-        'Authorization': this.config.Authorization,
-      };
-
-      // 发送请求 - 临时禁用SSL证书验证以解决UNABLE_TO_VERIFY_LEAF_SIGNATURE错误
-      const response = await axios.post<T>(
-        `${this.config.apiBaseUrl}${url}`,
-        data,
-        {
-          headers,
-          httpsAgent: new (require('https').Agent)({
-            rejectUnauthorized: false
-          })
-        }
-      );
-
-      return response.data;
-    } catch (error) {
-      this.logger.error('Wintopay API请求失败:', error);
-      throw error;
-    }
-  }
-
-
-  /**
-   * 更新订单物流信息
-   * @param params 物流更新参数
-   * @returns 物流更新响应
-   */
-  async logisticsUpdate(params: LogisticsUpdateRequest): Promise<LogisticsUpdateResponse> {
-    try {
-      this.logger.info('开始更新物流信息:', params);
-
-      const response = await this.sendRequest<LogisticsUpdateResponse>('/v1/logistics/update', params);
-
-      this.logger.info('物流更新成功:', response);
-      return response;
-    } catch (error: any) {
-      this.logger.error('物流更新失败:', error);
-
-      // 处理API返回的错误
-      if (error.response?.data) {
-        throw new Error(`物流更新失败: ${error.response.data.message || '未知错误'}`);
-      }
-
-      throw new Error(`物流更新请求失败: ${error.message || '网络错误'}`);
-    }
-  }
-}

src/service/customer.service.ts

@@ -373,7 +373,7 @@ export class CustomerService {
       per_page = 20,
       where ={},
     } = params;
-    if (where?.phone) {
+    if (where.phone) {
       where.phone = Like(`%${where.phone}%`);
     }
     

src/service/logistics.service.ts

@@ -327,20 +327,17 @@ export class LogisticsService {
       let resShipmentFee: any;
       if (data.shipmentPlatform === 'uniuni') {
         resShipmentFee = await this.uniExpressService.getRates(reqBody);
-        if (resShipmentFee.status !== 'SUCCESS') {
-          throw new Error(resShipmentFee.ret_msg);
-        }
-        return resShipmentFee.data.totalAfterTax * 100;
       } else if (data.shipmentPlatform === 'freightwaves') {
         const fre_reqBody = await this.convertToFreightwavesRateTry(data);
         resShipmentFee = await this.freightwavesService.rateTry(fre_reqBody);
-        return resShipmentFee.totalAmount * 100;
       } else {
         throw new Error('不支持的运单平台');
       }
 
-
+      if (resShipmentFee.status !== 'SUCCESS') {
-
+        throw new Error(resShipmentFee.ret_msg);
+      }
+      return resShipmentFee.data.totalAfterTax * 100;
     } catch (e) {
       throw e;
     }
@@ -363,7 +360,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;
@@ -382,8 +384,8 @@ export class LogisticsService {
           unique_id = resShipmentOrder.data.uni_order_sn;
           state = resShipmentOrder.data.uni_status_code;
         } else {
-          co = resShipmentOrder.shipOrderId;
+          co = resShipmentOrder.data?.shipOrderId;
-          unique_id = resShipmentOrder.shipOrderId;
+          unique_id = resShipmentOrder.data?.shipOrderId;
           state = ErpOrderStatus.COMPLETED;
         }
 
@@ -726,20 +728,14 @@ 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: data.courierCompany,
+          shipCompany: data.courierCompany || "",
-          partnerOrderNumber: order.siteId + '-' + order.externalOrderId,
+          partnerOrderNumber: order.siteId + '-1-' + order.externalOrderId,
           warehouseId: '25072621030107400060',
           shipper: {
             name: data.details.origin.contact_name, // 姓名
@@ -837,7 +833,7 @@ export class LogisticsService {
     // 转换为RateTryRequest格式
     const r = {
       //shipCompany: 'UPSYYZ7000NEW', // 必填，但ShipmentFeeBookDTO中缺少
-      shipCompany: data.courierCompany,
+      shipCompany: data.courierCompany || "",
       partnerOrderNumber: `order-${Date.now()}`, // 必填，使用时间戳生成
       warehouseId: '25072621030107400060', // 可选，使用stockPointId转换
       shipper: {

src/service/order.service.ts

@@ -42,7 +42,6 @@ import { UnifiedOrderDTO } from '../dto/site-api.dto';
 import { CustomerService } from './customer.service';
 import { ProductService } from './product.service';
 import { Site } from '../entity/site.entity';
-import { logisticsAlias } from '../entity/logistics_alias.entity';
 @Provide()
 export class OrderService {
 
@@ -55,9 +54,6 @@ export class OrderService {
   @InjectEntityModel(Order)
   orderModel: Repository<Order>;
 
-  @InjectEntityModel(logisticsAlias)
-  logisticsAliasModel: Repository<logisticsAlias>;
-
   @InjectEntityModel(User)
   userModel: Repository<User>;
 
@@ -137,7 +133,7 @@ export class OrderService {
   async syncOrders(siteId: number, params: Record<string, any> = {}): Promise<SyncOperationResult> {
     // 调用 WooCommerce API 获取订单
     const result = await (await this.siteApiService.getAdapter(siteId)).getAllOrders(params);
-    this.logger.info('开始进入循环同步订单', result.length, '个订单')
+
     // 初始化同步结果对象
     const syncResult: SyncOperationResult = {
       total: result.length,
@@ -147,6 +143,7 @@ export class OrderService {
       updated: 0,
       errors: []
     };
+    this.logger.info('开始进入循环同步订单', result.length, '个订单')
     // 遍历每个订单进行同步
     for (const order of result) {
       try {
@@ -482,20 +479,6 @@ export class OrderService {
     const existingOrder = await this.orderModel.findOne({
       where: { externalOrderId, siteId: siteId },
     });
-    // 提前不然存在就不更新客户信息了
-    // 创建或更新客户信息
-    await this.customerService.upsertCustomer({
-      email: order.customer_email,
-      site_id: siteId,
-      origin_id: String(order.customer_id),
-      billing: order.billing,
-      shipping: order.shipping,
-      first_name: order?.billing?.first_name || order?.shipping?.first_name,
-      last_name: order?.billing?.last_name || order?.shipping?.last_name,
-      fullname: order?.billing?.fullname || order?.shipping?.fullname || order?.billing?.first_name + ' ' + order?.billing?.last_name,
-      phone: order?.billing?.phone || order?.shipping?.phone,
-      // tags:['fromOrder']
-    });
     // 如果订单已存在
     if (existingOrder) {
       // 检查是否可以更新 ERP 状态
@@ -512,7 +495,20 @@ export class OrderService {
     }
     // 如果订单不存在,则映射订单状态
     entity.orderStatus = this.mapOrderStatus(entity.status);
+    // 创建或更新客户信息
+    await this.customerService.upsertCustomer({
+      email: order.customer_email,
+      site_id: siteId,
+      origin_id: String(order.customer_id),
+      billing: order.billing,
+      shipping: order.shipping,
+      first_name: order?.billing?.first_name || order?.shipping?.first_name,
+      last_name: order?.billing?.last_name || order?.shipping?.last_name,
+      fullname: order?.billing?.fullname || order?.shipping?.fullname,
+      phone: order?.billing?.phone || order?.shipping?.phone,
 
+      // tags:['fromOrder']
+    });
     // const customer = await this.customerModel.findOne({
     //   where: { email: order.customer_email },
     // });
@@ -737,13 +733,14 @@ export class OrderService {
     if (!orderItem.sku) return;
 
     // 从数据库查询产品，关联查询组件
-    const componentDetails = await this.productService.getComponentDetailFromSiteSku({ sku: orderItem.sku, name: orderItem.name }, orderItem.quantity, site);
+    const componentDetails = await this.productService.getComponentDetailFromSiteSku({ sku: orderItem.sku, name: orderItem.name }, site);
     if(!componentDetails?.length){
       return 
     }
 
     const orderSales: OrderSale[] = componentDetails.map(({product, parentProduct, quantity}) => {
       if (!product) return null
+      console.log('product',product)
       const attrsObj = this.productService.getAttributesObject(product.attributes)
       const orderSale = plainToClass(OrderSale, {
         orderId: orderItem.orderId,
@@ -2458,18 +2455,18 @@ export class OrderService {
    */
   // TODO 
   async exportOrder(ids: number[]) {
-    // 日期	订单号	姓名地址	邮箱	号码	盒数	换盒数	换货内容	快递号	商品1	数量1	商品2	数量2...
+    // 日期	订单号	姓名地址	邮箱	号码	订单内容	盒数	换盒数	换货内容	快递号
     interface ExportData {
       '日期': string;
       '订单号': string;
       '姓名地址': string;
       '邮箱': string;
       '号码': string;
+      '订单内容': string;
       '盒数': number;
       '换盒数': number;
       '换货内容': string;
       '快递号': string;
-      [key: string]: any; // 支持动态添加的商品和数量列
     }
 
     try {
@@ -2516,15 +2513,6 @@ export class OrderService {
           return acc;
         }, {} as Record<number, OrderItem[]>);
 
-        // 计算最大商品数量
-        let maxItemsCount = 0;
-        orders.forEach(order => {
-          const items = orderItemsByOrderId[order.id] || [];
-          if (items.length > maxItemsCount) {
-            maxItemsCount = items.length;
-          }
-        });
-
         // 构建导出数据
         const exportDataList: ExportData[] = orders.map(order => {
           // 获取订单的订单项
@@ -2533,6 +2521,9 @@ export class OrderService {
           // 计算总盒数
           const boxCount = items.reduce((total, item) => total + item.quantity, 0);
 
+          // 构建订单内容
+          const orderContent = items.map(item => `${item.name}  x ${item.quantity}`).join('; ');
+
           // 构建姓名地址
           const shipping = order.shipping;
           const billing = order.billing;
@@ -2557,32 +2548,18 @@ export class OrderService {
           const exchangeBoxCount = 0;
           const exchangeContent = '';
 
-          // 构建基础数据对象
+          return {
-          const baseData: ExportData = {
             '日期': order.date_created?.toISOString().split('T')[0] || '',
             '订单号': order.externalOrderId || '',
             '姓名地址': nameAddress,
             '邮箱': order.customer_email || '',
             '号码': phone,
+            '订单内容': orderContent,
             '盒数': boxCount,
             '换盒数': exchangeBoxCount,
             '换货内容': exchangeContent,
             '快递号': trackingNumber
           };
-
-          // 添加商品和数量列
-          items.forEach((item, index) => {
-            baseData[`商品${index + 1}`] = item.name;
-            baseData[`数量${index + 1}`] = item.quantity;
-          });
-
-          // 填充空值，确保所有行的列数一致
-          for (let i = items.length; i < maxItemsCount; i++) {
-            baseData[`商品${i + 1}`] = '';
-            baseData[`数量${i + 1}`] = '';
-          }
-
-          return baseData;
         });
 
         // 返回CSV字符串内容给前端
@@ -2870,11 +2847,6 @@ export class OrderService {
            chargeback: headers.indexOf('拒付')
          };
          
-    const logisticsAliases = await this.logisticsAliasModel.find();
-
-    // 构建物流公司别名映射
-    const logisticsAliasMap = new Map(logisticsAliases.map(alias => [alias.logistics_alias, alias.logistics_company]));
-
          // 遍历数据行
          for (let i = 0; i < dataRows.length; i++) {
            const row = dataRows[i];
@@ -2886,11 +2858,9 @@ export class OrderService {
            }
            
            try {
-        let orderNumbers = orderNumber;
+            let orderNumbers="";
-        // 确保 orderNumber 是字符串类型
+            if (orderNumber.includes('_')&&orderNumber.includes('-')) {
-        const orderNumberStr = String(orderNumber);
+            orderNumbers = orderNumber.split('_')[0].toString();
-        if (orderNumberStr.includes('_') && orderNumberStr.includes('-')) {
-          orderNumbers = orderNumberStr.split('_')[0].toString();
              orderNumbers = orderNumbers.split('-')[1];
             }
              // 通过订单号查询订单
@@ -2901,11 +2871,9 @@ export class OrderService {
                
                if (fulfillments && fulfillments.length > 0) {
                  const fulfillment = fulfillments[0]; // 假设每个订单只有一个物流信息 
-
-            const shipping_provider = logisticsAliasMap.get(fulfillment.shipping_provider);
                  // 回填物流信息
                  if (columnIndices.logisticsCompany !== -1) {
-              row[columnIndices.logisticsCompany] = shipping_provider || '';
+                   row[columnIndices.logisticsCompany] = fulfillment.shipping_provider || '';
                  }
                  if (columnIndices.trackingNumber !== -1) {
                    row[columnIndices.trackingNumber] = fulfillment.tracking_number || '';

src/service/product.service.ts

@@ -1785,14 +1785,8 @@ export class ProductService {
       attributes: attributes.length > 0 ? attributes : undefined,
     }
   }
-  isMixedSku(sku: string) {
+  // 获取库存单品列表
-    const splitSKu = sku.split('-')
+  async getComponentDetailFromSiteSku(siteProduct: { sku: string, name?: string }, site: Site): Promise<{ product: Product,parentProduct?: Product, quantity: number }[]>  {
-    const last = splitSKu[splitSKu.length - 1]
-    const second = splitSKu[splitSKu.length - 2]
-    // 这里判断 second 是否是数字
-    return sku.includes('-MX-') || sku.includes('-Mixed-') || /^\d+$/.test(second) && /^\d+$/.test(last)
-  }
-  async getComponentDetailFromSiteSku(siteProduct: { sku: string, name: string }, quantity: number = 1, site: Site): Promise<{ product: Product, parentProduct?: Product, quantity: number }[]> {
     if (!siteProduct.sku) {
       throw new Error('siteSku 不能为空')
     }
@@ -1804,17 +1798,18 @@ export class ProductService {
     if(!product?.components?.length){
       return [{
         product,
-        quantity
+        quantity:1
       }]
     }
 
     return await Promise.all(product.components.map(async comp => {
       return {
         product: await this.productModel.findOne({
-          where: { id: comp.productId },
+          where: { sku: comp.sku },
+          relations: ['category', 'attributes', 'attributes.dict', 'components']
         }),
         parentProduct: product, // 这里得记录一下他的爸爸用来记录
-        quantity: comp.quantity * quantity,
+        quantity: comp.quantity,
       }
     })) 
   }
@@ -2037,9 +2032,9 @@ export class ProductService {
       // 将工作表转换为 JSON 数组
       records = xlsx.utils.sheet_to_json(worksheet);
 
-      this.logger.debug('Parsed records count:', records.length);
+      console.log('Parsed records count:', records.length);
       if (records.length > 0) {
-        this.logger.debug('First record keys:', Object.keys(records[0]));
+        console.log('First record keys:', Object.keys(records[0]));
       }
       return records;
     } catch (e: any) {
@@ -2053,7 +2048,6 @@ export class ProductService {
     let updated = 0;
     const errors: BatchErrorItem[] = [];
     const records = await this.getRecordsFromTable(file);
-    this.logger.debug('Total records count:', records.length);
     // 逐条处理记录
     for (const rec of records) {
       try {
@@ -2082,7 +2076,7 @@ export class ProductService {
         errors.push({ identifier: '' + rec.sku, error: `产品${rec?.sku}导入失败:${e?.message || String(e)}` });
       }
     }
-    this.logger.info(`导入 ${records.length} 条记录,成功创建 ${created} 条,更新 ${updated} 条,失败 ${errors.length} 条,错误详情:${JSON.stringify(errors)}`);
+    this.logger.debug(`导入 ${records.length} 条记录,成功创建 ${created} 条,更新 ${updated} 条,失败 ${errors.length} 条,错误详情:${JSON.stringify(errors)}`);
     return { total: records.length, processed: records.length - errors.length, created, updated, errors };
   }
 
@@ -2144,6 +2138,7 @@ export class ProductService {
 
     return product;
   }
+
   // 根据站点SKU查询产品
   async getProductBySiteSku(siteSku: string, site?: Site): Promise<Product> {
     // 使用查询构建器来正确查询关联表

src/service/wp.service.ts

@@ -1205,12 +1205,10 @@ export class WPService implements IPlatformService {
           throw new Error('source_url 不存在');
         }
         // 下载源文件为 Buffer
-        const resp = await axios.get(srcUrl, {
+        const resp = await axios.get(srcUrl, { responseType: 'arraybuffer',    timeout: 30000,
-          responseType: 'arraybuffer', timeout: 30000,
     headers: {
       'User-Agent': 'Mozilla/5.0 (compatible; Node.js Axios)',
-          }
+    } });
-        });
         const inputBuffer = Buffer.from(resp.data);
         // 条件判断 如果下载的 Buffer 为空则抛出错误
         if (!inputBuffer || inputBuffer.length === 0) {