8 changed files with 184 additions and 359 deletions
--- a/src/config/config.default.ts
+++ b/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,
--- a/src/dto/logistics.dto.ts
+++ b/src/dto/logistics.dto.ts
@ -25,7 +25,7 @@ export class ShipmentBookDTO {
  shipmentPlatform: string;

  @ApiProperty()
-  @Rule(RuleType.any())
+  @Rule(RuleType.string())
  courierCompany: string;
 }

--- a/src/entity/logistics_alias.entity.ts
+++ b/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;
-
-}
--- a/src/service/Wintopay.service.ts
+++ b/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 || '网络错误'}`);
-    }
-  }
-}
--- a/src/service/logistics.service.ts
+++ b/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;
-          unique_id = resShipmentOrder.shipOrderId;
+          co = resShipmentOrder.data?.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,
-          partnerOrderNumber: order.siteId + '-' + order.externalOrderId,
+          shipCompany: data.courierCompany || "",
+          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: {
--- a/src/service/order.service.ts
+++ b/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>;

@ -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 = '';

-          // 构建基础数据对象
-          const baseData: ExportData = {
+          return {
            '日期': 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;
-        // 确保 orderNumber 是字符串类型
-        const orderNumberStr = String(orderNumber);
-        if (orderNumberStr.includes('_') && orderNumberStr.includes('-')) {
-          orderNumbers = orderNumberStr.split('_')[0].toString();
+            let orderNumbers="";
+            if (orderNumber.includes('_')&&orderNumber.includes('-')) {
+            orderNumbers = orderNumber.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 || '';
--- a/src/service/product.service.ts
+++ b/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('-')
-    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 }[]> {
+  // 获取库存单品列表
+  async getComponentDetailFromSiteSku(siteProduct: { sku: string, name?: string }, 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,
      }
    })) 
  }
@ -2155,7 +2150,7 @@ export class ProductService {
      .leftJoinAndSelect('product.components', 'components')
      .leftJoinAndSelect('product.siteSkus', 'siteSku')
      .where('siteSku.sku LIKE :siteSku', { siteSku: `%${siteSku}%` })
-      .orWhere('product.sku = :siteSku', { siteSku });
+      .orWhere('product.sku = :siteSku', { siteSku })

    if (site) {
      queryBuilder.orWhere('product.sku = :processedSku', {
--- a/src/service/wp.service.ts
+++ b/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, {
-          responseType: 'arraybuffer', timeout: 30000,
+        const resp = await axios.get(srcUrl, { 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) {