src/adapter/woocommerce.adapter.ts

@@ -31,13 +31,11 @@ import {
   WooProductSearchParams,
   WpMediaGetListParams,
   WooFulfillment,
-  MetaDataFulfillment,
 } from '../dto/woocommerce.dto';
 import { Site } from '../entity/site.entity';
 import { WPService } from '../service/wp.service';
 import { BatchOperationDTO, BatchOperationResultDTO } from '../dto/batch.dto';
 import { toArray, toNumber } from '../utils/trans.util';
-import dayjs = require('dayjs');
 
 export class WooCommerceAdapter implements ISiteAdapter {
   // 构造函数接收站点配置与服务实例
@@ -257,7 +255,7 @@ export class WooCommerceAdapter implements ISiteAdapter {
   }
   mapMediaSearchParams(params: UnifiedSearchParamsDTO): Partial<WpMediaGetListParams> {
     const page = params.page
-    const per_page = Number(params.per_page ?? 20);
+    const per_page = Number( params.per_page ?? 20);
 
     return {
       ...params.where,
@@ -295,12 +293,12 @@ export class WooCommerceAdapter implements ISiteAdapter {
     throw new Error('Method not implemented.');
   }
 
-  async updateMedia(where: { id: string | number }, data: any): Promise<any> {
+  async updateMedia(where: {id: string | number}, data: any): Promise<any> {
     // 更新媒体信息
     return await this.wpService.updateMedia(Number(this.site.id), Number(where.id), data);
   }
 
-  async deleteMedia(where: { id: string | number }): Promise<boolean> {
+  async deleteMedia(where: {id: string | number}): Promise<boolean> {
     // 删除媒体资源
     await this.wpService.deleteMedia(Number(this.site.id), Number(where.id), true);
     return true;
@@ -350,7 +348,7 @@ export class WooCommerceAdapter implements ISiteAdapter {
 
     // 集合过滤参数
     if (where.exclude) mapped.exclude = toArray(where.exclude);
-    if (where.ids || where.number || where.id || where.include) mapped.include = [...new Set([where.number, where.id, ...toArray(where.ids), ...toArray(where.include)])].filter(Boolean);
+    if (where.ids || where.number || where.id || where.include) mapped.include = [...new Set([where.number,where.id,...toArray(where.ids),...toArray(where.include)])].filter(Boolean);
     if (toNumber(where.offset) !== undefined) mapped.offset = Number(where.offset);
     if (where.parent ?? where.parentId) mapped.parent = toArray(where.parent ?? where.parentId);
     if (where.parent_exclude ?? where.parentExclude) mapped.parent_exclude = toArray(where.parent_exclude ?? where.parentExclude);
@@ -399,17 +397,14 @@ export class WooCommerceAdapter implements ISiteAdapter {
   mapPlatformToUnifiedOrder(item: WooOrder): UnifiedOrderDTO {
     // 将 WooCommerce 订单数据映射为统一订单DTO
     // 包含账单地址与收货地址以及创建与更新时间
+
     // 映射物流追踪信息，将后端格式转换为前端期望的格式
-    const metaFulfillments: MetaDataFulfillment[] = item.meta_data?.find?.(_meta => _meta.key === "_wc_shipment_tracking_items")?.value || []
-    const fulfillments = metaFulfillments.map((track) => {
-        return ({
+    const fulfillments = (item.fulfillments || []).map((track) => ({
       tracking_id: track.tracking_id,
       tracking_number: track.tracking_number,
-          tracking_product_code: track.tracking_product_code,
       shipping_provider: track.tracking_provider,
-          date_created: dayjs(track.date_shipped).toString(),
-        })
-      });
+      date_created: track.data_sipped,
+    }));
 
     return {
       id: item.id,
@@ -451,7 +446,7 @@ export class WooCommerceAdapter implements ISiteAdapter {
   }
 
   // 订单操作方法
-  async getOrder(where: { id: string | number }): Promise<UnifiedOrderDTO> {
+  async getOrder(where: {id: string | number}): Promise<UnifiedOrderDTO> {
     // 获取单个订单详情
     const api = this.wpService.createApi(this.site, 'wc/v3');
     const res = await api.get(`orders/${where.id}`);
@@ -462,8 +457,30 @@ export class WooCommerceAdapter implements ISiteAdapter {
     const requestParams = this.mapOrderSearchParams(params);
     const { items, total, totalPages, page, per_page } = await this.wpService.fetchResourcePaged<any>(this.site, 'orders', requestParams);
 
+    // 并行获取所有订单的履行信息
+    const ordersWithFulfillments = await Promise.all(
+      items.map(async (order: any) => {
+        try {
+          // 获取订单的履行信息
+          const fulfillments = await this.getOrderFulfillments(order.id);
+          // 将履行信息添加到订单对象中
           return {
-      items: items.map(this.mapPlatformToUnifiedOrder),
+            ...order,
+            fulfillments: fulfillments || []
+          };
+        } catch (error) {
+          // 如果获取履行信息失败，仍然返回订单，只是履行信息为空数组
+          console.error(`获取订单 ${order.id} 的履行信息失败:`, error);
+          return {
+            ...order,
+            fulfillments: []
+          };
+        }
+      })
+    );
+
+    return {
+      items: ordersWithFulfillments.map(this.mapPlatformToUnifiedOrder),
       total,
       totalPages,
       page,
@@ -497,12 +514,12 @@ export class WooCommerceAdapter implements ISiteAdapter {
     return this.mapPlatformToUnifiedOrder(res.data);
   }
 
-  async updateOrder(where: { id: string | number }, data: Partial<UnifiedOrderDTO>): Promise<boolean> {
+  async updateOrder(where: {id: string | number}, data: Partial<UnifiedOrderDTO>): Promise<boolean> {
     // 更新订单并返回布尔结果
     return await this.wpService.updateOrder(this.site, String(where.id), data as any);
   }
 
-  async deleteOrder(where: { id: string | number }): Promise<boolean> {
+  async deleteOrder(where: {id: string | number}): Promise<boolean> {
     // 删除订单
     const api = this.wpService.createApi(this.site, 'wc/v3');
     await api.delete(`orders/${where.id}`, { force: true });
@@ -673,8 +690,8 @@ export class WooCommerceAdapter implements ISiteAdapter {
     return mapped;
   }
 
-  mapCreateProductParams(data: Partial<UnifiedProductDTO>): Partial<WooProduct> {
-    const { id, ...mapped } = this.mapUnifiedToPlatformProduct(data);
+  mapCreateProductParams(data: Partial<UnifiedProductDTO>):Partial<WooProduct> {
+    const {id,...mapped}=  this.mapUnifiedToPlatformProduct(data);
     // 创建不带 id
     return mapped 
   }
@@ -827,28 +844,28 @@ export class WooCommerceAdapter implements ISiteAdapter {
     };
   }
   // 判断是否是这个站点的sku
-  isSiteSkuThisSite(sku: string,) {
-    return sku.startsWith(this.site.skuPrefix + '-');
+  isSiteSkuThisSite(sku: string,){
+    return sku.startsWith(this.site.skuPrefix+'-');
   }
-  async getProduct(where: Partial<Pick<UnifiedProductDTO, 'id' | 'sku'>>): Promise<UnifiedProductDTO> {
+  async getProduct(where: Partial<Pick<UnifiedProductDTO, 'id' | 'sku'>>): Promise<UnifiedProductDTO>{
     const { id, sku } = where;
-    if (id) return this.getProductById(id);
-    if (sku) return this.getProductBySku(sku);
+    if(id) return this.getProductById(id);
+    if(sku) return this.getProductBySku(sku);
     throw new Error('必须提供id或sku参数');
   }
-  async getProductBySku(sku: string) {
+  async getProductBySku(sku: string){
     // const api = this.wpService.createApi(this.site, 'wc/v3');
     // const res = await api.get(`products`,{
     //   sku
     // });
     // const product = res.data[0];
-    const res = await this.wpService.getProducts(this.site, {
+    const res = await this.wpService.getProducts(this.site,{
       sku,
-      page: 1,
-      per_page: 1,
+      page:1,
+      per_page:1,
     });
     const product = res?.items?.[0];
-    if (!product) return null
+    if(!product) return null
     return this.mapPlatformToUnifiedProduct(product);
   }
   // 产品操作方法
@@ -959,7 +976,7 @@ export class WooCommerceAdapter implements ISiteAdapter {
   async updateProduct(where: Partial<Pick<UnifiedProductDTO, 'id' | 'sku'>>, data: Partial<UnifiedProductDTO>): Promise<boolean> {
     // 更新产品并返回统一产品DTO
     const product = await this.getProduct(where);
-    if (!product) {
+    if(!product){
       throw new Error('产品不存在');
     }
     const updateData = this.mapUpdateProductParams(data);
@@ -970,7 +987,7 @@ export class WooCommerceAdapter implements ISiteAdapter {
   async deleteProduct(where: Partial<Pick<UnifiedProductDTO, 'id' | 'sku'>>): Promise<boolean> {
     // 删除产品
     const product = await this.getProduct(where);
-    if (!product) {
+    if(!product){
       throw new Error('产品不存在');
     }
     const api = this.wpService.createApi(this.site, 'wc/v3');
@@ -1398,7 +1415,7 @@ export class WooCommerceAdapter implements ISiteAdapter {
   }
 
   // 获取单个 webhook 详情
-  async getWebhook(where: { id: string | number }): Promise<UnifiedWebhookDTO> {
+  async getWebhook(where: {id: string | number}): Promise<UnifiedWebhookDTO> {
     try {
       const result = await this.wpService.getWebhook(this.site, where.id);
       return this.mapPlatformToUnifiedWebhook(result as WooWebhook);

src/controller/order.controller.ts

@@ -2,7 +2,6 @@ import {
   Body,
   Controller,
   Del,
-  Files,
   Get,
   Inject,
   Param,
@@ -28,6 +27,7 @@ import {
 } from '../dto/order.dto';
 import { User } from '../decorator/user.decorator';
 import { ErpOrderStatus } from '../enums/base.enum';
+
 @Controller('/order')
 export class OrderController {
   @Inject()
@@ -264,21 +264,4 @@ export class OrderController {
       return errorResponse(error?.message || '导出失败');
     }
   }
-
-
-  // 导入产品(CSV 文件)
-    @ApiOkResponse()
-    @Post('/import')
-    async importWintopay(@Files() files: any) {
-      try {
-        // 条件判断:确保存在文件
-        const file = files?.[0];
-        if (!file) return errorResponse('未接收到上传文件');
-  
-        const result = await this.orderService.importWintopayTable(file);
-        return successResponse(result);
-      } catch (error) {
-        return errorResponse(error?.message || error);
-      }
-    }
 }

src/dto/site-api.dto.ts

@@ -811,8 +811,7 @@ export class FulfillmentDTO {
   tracking_id?: string;
   @ApiProperty({ description: '物流单号', required: false })
   tracking_number?: string;
-  @ApiProperty({ description: "物流产品代码" , required: false})
-  tracking_product_code?: string;
+
   @ApiProperty({ description: '物流公司', required: false })
   shipping_provider?: string;
 

src/dto/woocommerce.dto.ts

@@ -369,19 +369,9 @@ export interface WooOrder {
   date_created_gmt?: string;
   date_modified?: string;
   date_modified_gmt?: string;
+  // 物流追踪信息
+  fulfillments?: WooFulfillment[];
 }
-    export interface MetaDataFulfillment {
-      custom_tracking_link: string;
-      custom_tracking_provider: string;
-      date_shipped: number;
-      source: string;
-      status_shipped: string;
-      tracking_id: string;
-      tracking_number: string;
-      tracking_product_code: string;
-      tracking_provider: string;
-      user_id: number;
-  }
 // 这个是一个插件的物流追踪信息
 // 接口:
 export interface WooFulfillment {

src/entity/order.entity.ts

@@ -106,7 +106,7 @@ export class Order {
   @Expose()
   cart_tax: number;
 
-  @ApiProperty({ type: "总金额"})
+  @ApiProperty()
   @Column('decimal', { precision: 10, scale: 2, default: 0 })
   @Expose()
   total: number;

src/service/order.service.ts

@@ -1,6 +1,5 @@
 import { Inject, Logger, Provide } from '@midwayjs/core';
 import { WPService } from './wp.service';
-import * as xlsx from 'xlsx';
 import { Order } from '../entity/order.entity';
 import { In, Like, Repository } from 'typeorm';
 import { InjectEntityModel, TypeORMDataSourceManager } from '@midwayjs/typeorm';
@@ -33,7 +32,7 @@ import { UpdateStockDTO } from '../dto/stock.dto';
 import { StockService } from './stock.service';
 import { OrderItemOriginal } from '../entity/order_item_original.entity';
 import { SiteApiService } from './site-api.service';
-import { BatchErrorItem, SyncOperationResult,BatchOperationResult } from '../dto/api.dto';
+import { SyncOperationResult } from '../dto/api.dto';
 
 import * as fs from 'fs';
 import * as path from 'path';
@@ -1480,7 +1479,7 @@ export class OrderService {
     }
 
     let itemSql = `
-      SELECT os.productId, os.name, os.sku, SUM(os.quantity) AS totalQuantity, COUNT(DISTINCT os.orderId) AS totalOrders
+      SELECT os.productId, os.name, SUM(os.quantity) AS totalQuantity, COUNT(DISTINCT os.orderId) AS totalOrders
       FROM order_sale os
       INNER JOIN \`order\` o ON o.id = os.orderId
       WHERE o.date_paid BETWEEN ? AND ?
@@ -1502,7 +1501,7 @@ export class OrderService {
     }
     itemSql += nameCondition;
     itemSql += `
-      GROUP BY os.productId, os.name, os.sku
+      GROUP BY os.productId, os.name
       ORDER BY totalQuantity DESC
       LIMIT ? OFFSET ?
     `;
@@ -2729,58 +2728,4 @@ export class OrderService {
 
     return result;
   }
-
-
-
-    // 从 CSV 导入产品;存在则更新,不存在则创建
-    async importWintopayTable(file: any): Promise<BatchOperationResult> {
-         let created = 0;
-         let updated = 0;
-         const errors: BatchErrorItem[] = [];
-         const records = await this.getRecordsFromTable(file);
-created++
-updated++
-
-      return { total: records.length, processed: records.length - errors.length, created: 0, updated: 0, errors };
-    }
-
-      async getRecordsFromTable(file: any) {
-        // 解析文件(使用 xlsx 包自动识别文件类型并解析)
-        try {
-          let buffer: Buffer;
-    
-          // 处理文件输入，获取 buffer
-          if (Buffer.isBuffer(file)) {
-            buffer = file;
-          }
-          else if (file?.data) {
-            if (typeof file.data === 'string') {
-              buffer = fs.readFileSync(file.data);
-            } else {
-              buffer = file.data;
-            }
-          } else {
-            throw new Error('无效的文件输入');
-          }
-    
-          let records: any[] = []
-          // xlsx 包会自动根据文件内容识别文件类型(CSV 或 XLSX)
-          // 添加codepage: 65001以确保正确处理UTF-8编码的中文
-          const workbook = xlsx.read(buffer, { type: 'buffer', codepage: 65001 });
-          // 获取第一个工作表
-          const worksheet = workbook.Sheets[workbook.SheetNames[0]];
-          // 将工作表转换为 JSON 数组
-          records = xlsx.utils.sheet_to_json(worksheet);
-    
-          console.log('Parsed records count:', records.length);
-          if (records.length > 0) {
-            console.log('First record keys:', Object.keys(records[0]));
-          }
-          return records;
-        } catch (e: any) {
-          throw new Error(`文件解析失败:${e?.message || e}`);
-        }
-
-
-      }
 }