feat(shopyy): 实现全量商品查询功能并优化产品相关逻辑

- 新增ShopyyAllProductQuery类支持全量商品查询参数
- 实现getAllProducts方法支持带条件查询
- 优化getProductBySku方法使用新查询接口
- 公开request方法便于子类调用
- 增加错误日志记录产品查找失败情况
- 修复产品permalink生成逻辑

package-lock.json

@@ -523,23 +523,6 @@
         "node": ">=18"
       }
     },
-    "node_modules/@faker-js/faker": {
-      "version": "10.1.0",
-      "resolved": "https://registry.npmjs.org/@faker-js/faker/-/faker-10.1.0.tgz",
-      "integrity": "sha512-C3mrr3b5dRVlKPJdfrAXS8+dq+rq8Qm5SNRazca0JKgw1HQERFmrVb0towvMmw5uu8hHKNiQasMaR/tydf3Zsg==",
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/fakerjs"
-        }
-      ],
-      "license": "MIT",
-      "peer": true,
-      "engines": {
-        "node": "^20.19.0 || ^22.13.0 || ^23.5.0 || >=24.0.0",
-        "npm": ">=10"
-      }
-    },
     "node_modules/@hapi/bourne": {
       "version": "3.0.0",
       "resolved": "https://registry.npmmirror.com/@hapi/bourne/-/bourne-3.0.0.tgz",

src/controller/media.controller.ts

@@ -1,79 +0,0 @@
-import { Controller, Get, Inject, Query, Post, Del, Param, Files, Fields, Body } from '@midwayjs/core';
-import { WPService } from '../service/wp.service';
-import { successResponse, errorResponse } from '../utils/response.util';
-
-@Controller('/media')
-export class MediaController {
-  @Inject()
-  wpService: WPService;
-
-  @Get('/list')
-  async list(
-    @Query('siteId') siteId: number,
-    @Query('page') page: number = 1,
-    @Query('pageSize') pageSize: number = 20
-  ) {
-    try {
-      if (!siteId) {
-        return errorResponse('siteId is required');
-      }
-      const result = await this.wpService.getMedia(siteId, page, pageSize);
-      return successResponse(result);
-    } catch (error) {
-      return errorResponse(error.message);
-    }
-  }
-
-  @Post('/upload')
-  async upload(@Fields() fields, @Files() files) {
-    try {
-      const siteId = fields.siteId;
-      if (!siteId) {
-        return errorResponse('siteId is required');
-      }
-      if (!files || files.length === 0) {
-        return errorResponse('file is required');
-      }
-      const file = files[0];
-      const result = await this.wpService.createMedia(siteId, file);
-      return successResponse(result);
-    } catch (error) {
-      return errorResponse(error.message);
-    }
-  }
-
-  @Post('/update/:id')
-  async update(@Param('id') id: number, @Body() body) {
-    try {
-      const siteId = body.siteId;
-      if (!siteId) {
-        return errorResponse('siteId is required');
-      }
-      // 过滤出需要更新的字段
-      const { title, caption, description, alt_text } = body;
-      const data: any = {};
-      if (title !== undefined) data.title = title;
-      if (caption !== undefined) data.caption = caption;
-      if (description !== undefined) data.description = description;
-      if (alt_text !== undefined) data.alt_text = alt_text;
-
-      const result = await this.wpService.updateMedia(siteId, id, data);
-      return successResponse(result);
-    } catch (error) {
-      return errorResponse(error.message);
-    }
-  }
-
-  @Del('/:id')
-  async delete(@Param('id') id: number, @Query('siteId') siteId: number, @Query('force') force: boolean = true) {
-    try {
-      if (!siteId) {
-        return errorResponse('siteId is required');
-      }
-      const result = await this.wpService.deleteMedia(siteId, id, force);
-      return successResponse(result);
-    } catch (error) {
-      return errorResponse(error.message);
-    }
-  }
-}

src/controller/product.controller.ts

@@ -698,10 +698,10 @@ export class ProductController {
   // 从站点同步产品到本地
   @ApiOkResponse({ description: '从站点同步产品到本地', type: ProductRes })
   @Post('/sync-from-site')
-  async syncProductFromSite(@Body() body: { siteId: number; siteProductId: string | number }) {
+  async syncProductFromSite(@Body() body: { siteId: number; siteProductId: string | number ,sku: string}) {
     try {
-      const { siteId, siteProductId } = body;
+      const { siteId, siteProductId, sku } = body;
-      const product = await this.productService.syncProductFromSite(siteId, siteProductId);
+      const product = await this.productService.syncProductFromSite(siteId, siteProductId, sku);
       return successResponse(product);
     } catch (error) {
       return errorResponse(error?.message || error);
@@ -713,25 +713,26 @@ export class ProductController {
   @Post('/batch-sync-from-site')
   async batchSyncFromSite(@Body() body: { siteId: number; siteProductIds: (string | number)[] }) {
     try {
-      const { siteId, siteProductIds } = body;
+      throw new Error('批量同步产品到本地暂未实现');
-      const result = await this.productService.batchSyncFromSite(siteId, siteProductIds);
+      // const { siteId, siteProductIds } = body;
-      // 将服务层返回的结果转换为统一格式
+      // const result = await this.productService.batchSyncFromSite(siteId, siteProductIds.map((id) => ({ siteProductId: id, sku: '' })));
-      const errors = result.errors.map((error: string) => {
+      // // 将服务层返回的结果转换为统一格式
-        // 提取产品ID部分作为标识符
+      // const errors = result.errors.map((error: string) => {
-        const match = error.match(/站点产品ID (\d+) /);
+      //   // 提取产品ID部分作为标识符
-        const identifier = match ? match[1] : 'unknown';
+      //   const match = error.match(/站点产品ID (\d+) /);
-        return {
+      //   const identifier = match ? match[1] : 'unknown';
-          identifier: identifier,
+      //   return {
-          error: error
+      //     identifier: identifier,
-        };
+      //     error: error
-      });
+      //   };
+      // });
       
-      return successResponse({
+      // return successResponse({
-        total: siteProductIds.length,
+      //   total: siteProductIds.length,
-        processed: result.synced + errors.length,
+      //   processed: result.synced + errors.length,
-        synced: result.synced,
+      //   synced: result.synced,
-        errors: errors
+      //   errors: errors
-      });
+      // });
     } catch (error) {
       return errorResponse(error?.message || error);
     }

src/controller/site-api.controller.ts

@@ -7,7 +7,6 @@ import {
   CancelFulfillmentDTO,
   CreateReviewDTO,
   CreateWebhookDTO,
-  FulfillmentDTO,
   UnifiedCustomerDTO,
   UnifiedCustomerPaginationDTO,
   UnifiedMediaPaginationDTO,
@@ -106,7 +105,7 @@ export class SiteApiController {
     this.logger.debug(`[Site API] 更新评论开始, siteId: ${siteId}, id: ${id}, body: ${JSON.stringify(body)}`);
     try {
       const adapter = await this.siteApiService.getAdapter(siteId);
-      const data = await adapter.updateReview(id, body);
+      const data = await adapter.updateReview({ id }, body);
       this.logger.debug(`[Site API] 更新评论成功, siteId: ${siteId}, id: ${id}`);
       return successResponse(data);
     } catch (error) {
@@ -124,7 +123,7 @@ export class SiteApiController {
     this.logger.debug(`[Site API] 删除评论开始, siteId: ${siteId}, id: ${id}`);
     try {
       const adapter = await this.siteApiService.getAdapter(siteId);
-      const data = await adapter.deleteReview(id);
+      const data = await adapter.deleteReview({ id });
       this.logger.debug(`[Site API] 删除评论成功, siteId: ${siteId}, id: ${id}`);
       return successResponse(data);
     } catch (error) {
@@ -160,7 +159,7 @@ export class SiteApiController {
     this.logger.debug(`[Site API] 获取单个webhook开始, siteId: ${siteId}, id: ${id}`);
     try {
       const adapter = await this.siteApiService.getAdapter(siteId);
-      const data = await adapter.getWebhook(id);
+      const data = await adapter.getWebhook({ id });
       this.logger.debug(`[Site API] 获取单个webhook成功, siteId: ${siteId}, id: ${id}`);
       return successResponse(data);
     } catch (error) {
@@ -199,7 +198,7 @@ export class SiteApiController {
     this.logger.debug(`[Site API] 更新webhook开始, siteId: ${siteId}, id: ${id}, body: ${JSON.stringify(body)}`);
     try {
       const adapter = await this.siteApiService.getAdapter(siteId);
-      const data = await adapter.updateWebhook(id, body);
+      const data = await adapter.updateWebhook({ id }, body);
       this.logger.debug(`[Site API] 更新webhook成功, siteId: ${siteId}, id: ${id}`);
       return successResponse(data);
     } catch (error) {
@@ -217,7 +216,7 @@ export class SiteApiController {
     this.logger.debug(`[Site API] 删除webhook开始, siteId: ${siteId}, id: ${id}`);
     try {
       const adapter = await this.siteApiService.getAdapter(siteId);
-      const data = await adapter.deleteWebhook(id);
+      const data = await adapter.deleteWebhook({ id });
       this.logger.debug(`[Site API] 删除webhook成功, siteId: ${siteId}, id: ${id}`);
       return successResponse(data);
     } catch (error) {
@@ -327,7 +326,7 @@ export class SiteApiController {
       if (site.type === 'woocommerce') {
         const page = query.page || 1;
         const perPage = (query.per_page) || 100;
-        const res = await this.siteApiService.wpService.getProducts(site, page, perPage);
+        const res = await this.siteApiService.wpService.getProducts(site, { page, per_page: perPage });
         const header = ['id', 'name', 'type', 'status', 'sku', 'regular_price', 'sale_price', 'stock_status', 'stock_quantity'];
         const rows = (res.items || []).map((p: any) => [p.id, p.name, p.type, p.status, p.sku, p.regular_price, p.sale_price, p.stock_status, p.stock_quantity]);
         const toCsvValue = (val: any) => {
@@ -360,7 +359,7 @@ export class SiteApiController {
     this.logger.info(`[Site API] 获取单个产品开始, siteId: ${siteId}, productId: ${id}`);
     try {
       const adapter = await this.siteApiService.getAdapter(siteId);
-      const data = await adapter.getProduct(id);
+      const data = await adapter.getProduct({ id });
 
       // 如果获取到商品数据，则增强ERP产品信息
       if (data) {
@@ -485,7 +484,7 @@ export class SiteApiController {
     this.logger.info(`[Site API] 更新产品开始, siteId: ${siteId}, productId: ${id}`);
     try {
       const adapter = await this.siteApiService.getAdapter(siteId);
-      const data = await adapter.updateProduct(id, body);
+      const data = await adapter.updateProduct({ id }, body);
       this.logger.info(`[Site API] 更新产品成功, siteId: ${siteId}, productId: ${id}`);
       return successResponse(data);
     } catch (error) {
@@ -540,7 +539,7 @@ export class SiteApiController {
     this.logger.info(`[Site API] 删除产品开始, siteId: ${siteId}, productId: ${id}`);
     try {
       const adapter = await this.siteApiService.getAdapter(siteId);
-      const success = await adapter.deleteProduct(id);
+      const success = await adapter.deleteProduct({ id });
       this.logger.info(`[Site API] 删除产品成功, siteId: ${siteId}, productId: ${id}`);
       return successResponse(success);
     } catch (error) {
@@ -585,7 +584,7 @@ export class SiteApiController {
         for (const item of body.update) {
           try {
             const id = item.id;
-            const data = await adapter.updateProduct(id, item);
+            const data = await adapter.updateProduct({ id }, item);
             updated.push(data);
           } catch (e) {
             errors.push({ 
@@ -598,7 +597,7 @@ export class SiteApiController {
       if (body.delete?.length) {
         for (const id of body.delete) {
           try {
-            const ok = await adapter.deleteProduct(id);
+            const ok = await adapter.deleteProduct({ id });
             if (ok) deleted.push(id);
             else errors.push({ 
               identifier: String(id), 
@@ -672,6 +671,26 @@ export class SiteApiController {
     }
   }
 
+  @Get('/:siteId/orders/count')
+  @ApiOkResponse({ type: Object })
+  async countOrders(
+    @Param('siteId') siteId: number,
+    @Query() query: any
+  ) {
+    this.logger.info(`[Site API] 获取订单总数开始, siteId: ${siteId}`);
+    try {
+
+
+      const adapter = await this.siteApiService.getAdapter(siteId);
+      const total = await adapter.countOrders(query);
+      this.logger.info(`[Site API] 获取订单总数成功, siteId: ${siteId}, total: ${total}`);
+      return successResponse({ total });
+    } catch (error) {
+      this.logger.error(`[Site API] 获取订单总数失败, siteId: ${siteId}, 错误信息: ${error.message}`);
+      return errorResponse(error.message);
+    }
+  }
+
   @Get('/:siteId/customers/:customerId/orders')
   @ApiOkResponse({ type: UnifiedOrderPaginationDTO })
   async getCustomerOrders(
@@ -752,7 +771,7 @@ export class SiteApiController {
     this.logger.info(`[Site API] 获取单个订单开始, siteId: ${siteId}, orderId: ${id}`);
     try {
       const adapter = await this.siteApiService.getAdapter(siteId);
-      const data = await adapter.getOrder(id);
+      const data = await adapter.getOrder({ id });
       this.logger.info(`[Site API] 获取单个订单成功, siteId: ${siteId}, orderId: ${id}`);
       return successResponse(data);
     } catch (error) {
@@ -824,7 +843,7 @@ export class SiteApiController {
     this.logger.info(`[Site API] 更新订单开始, siteId: ${siteId}, orderId: ${id}`);
     try {
       const adapter = await this.siteApiService.getAdapter(siteId);
-      const ok = await adapter.updateOrder(id, body);
+      const ok = await adapter.updateOrder({ id }, body);
       this.logger.info(`[Site API] 更新订单成功, siteId: ${siteId}, orderId: ${id}`);
       return successResponse(ok);
     } catch (error) {
@@ -842,7 +861,7 @@ export class SiteApiController {
     this.logger.info(`[Site API] 删除订单开始, siteId: ${siteId}, orderId: ${id}`);
     try {
       const adapter = await this.siteApiService.getAdapter(siteId);
-      const ok = await adapter.deleteOrder(id);
+      const ok = await adapter.deleteOrder({ id });
       this.logger.info(`[Site API] 删除订单成功, siteId: ${siteId}, orderId: ${id}`);
       return successResponse(ok);
     } catch (error) {
@@ -882,7 +901,7 @@ export class SiteApiController {
         for (const item of body.update) {
           try {
             const id = item.id;
-            const ok = await adapter.updateOrder(id, item);
+            const ok = await adapter.updateOrder({ id }, item);
             if (ok) updated.push(item);
             else errors.push({ 
               identifier: String(item.id || 'unknown'), 
@@ -899,7 +918,7 @@ export class SiteApiController {
       if (body.delete?.length) {
         for (const id of body.delete) {
           try {
-            const ok = await adapter.deleteOrder(id);
+            const ok = await adapter.deleteOrder({ id });
             if (ok) deleted.push(id);
             else errors.push({ 
               identifier: String(id), 
@@ -966,25 +985,6 @@ export class SiteApiController {
     }
   }
 
-  @Post('/:siteId/orders/:id/fulfill')
-  @ApiOkResponse({ type: Object })
-  async fulfillOrder(
-    @Param('siteId') siteId: number,
-    @Param('id') id: string,
-    @Body() body: FulfillmentDTO
-  ) {
-    this.logger.info(`[Site API] 订单履约开始, siteId: ${siteId}, orderId: ${id}`);
-    try {
-      const adapter = await this.siteApiService.getAdapter(siteId);
-      const data = await adapter.fulfillOrder(id, body);
-      this.logger.info(`[Site API] 订单履约成功, siteId: ${siteId}, orderId: ${id}`);
-      return successResponse(data);
-    } catch (error) {
-      this.logger.error(`[Site API] 订单履约失败, siteId: ${siteId}, orderId: ${id}, 错误信息: ${error.message}`);
-      return errorResponse(error.message);
-    }
-  }
-
   @Post('/:siteId/orders/:id/cancel-fulfill')
   @ApiOkResponse({ type: Object })
   async cancelFulfillment(
@@ -1050,13 +1050,13 @@ export class SiteApiController {
     }
   }
 
-  @Get('/:siteId/orders/:orderId/trackings')
+  @Get('/:siteId/orders/:orderId/fulfillments')
   @ApiOkResponse({ type: Object })
-  async getOrderTrackings(
+  async getOrderFulfillments(
     @Param('siteId') siteId: number,
     @Param('orderId') orderId: string
   ) {
-    this.logger.info(`[Site API] 获取订单物流跟踪信息开始, siteId: ${siteId}, orderId: ${orderId}`);
+    this.logger.info(`[Site API] 获取订单履约信息开始, siteId: ${siteId}, orderId: ${orderId}`);
     try {
       const adapter = await this.siteApiService.getAdapter(siteId);
       const data = await adapter.getOrderFulfillments(orderId);
@@ -1435,7 +1435,7 @@ export class SiteApiController {
     this.logger.info(`[Site API] 获取单个客户开始, siteId: ${siteId}, customerId: ${id}`);
     try {
       const adapter = await this.siteApiService.getAdapter(siteId);
-      const data = await adapter.getCustomer(id);
+      const data = await adapter.getCustomer({ id });
       this.logger.info(`[Site API] 获取单个客户成功, siteId: ${siteId}, customerId: ${id}`);
       return successResponse(data);
     } catch (error) {
@@ -1507,7 +1507,7 @@ export class SiteApiController {
     this.logger.info(`[Site API] 更新客户开始, siteId: ${siteId}, customerId: ${id}`);
     try {
       const adapter = await this.siteApiService.getAdapter(siteId);
-      const data = await adapter.updateCustomer(id, body);
+      const data = await adapter.updateCustomer({ id }, body);
       this.logger.info(`[Site API] 更新客户成功, siteId: ${siteId}, customerId: ${id}`);
       return successResponse(data);
     } catch (error) {
@@ -1525,7 +1525,7 @@ export class SiteApiController {
     this.logger.info(`[Site API] 删除客户开始, siteId: ${siteId}, customerId: ${id}`);
     try {
       const adapter = await this.siteApiService.getAdapter(siteId);
-      const success = await adapter.deleteCustomer(id);
+      const success = await adapter.deleteCustomer({ id });
       this.logger.info(`[Site API] 删除客户成功, siteId: ${siteId}, customerId: ${id}`);
       return successResponse(success);
     } catch (error) {
@@ -1561,7 +1561,7 @@ export class SiteApiController {
         for (const item of body.update) {
           try {
             const id = item.id;
-            const data = await adapter.updateCustomer(id, item);
+            const data = await adapter.updateCustomer({ id }, item);
             updated.push(data);
           } catch (e) {
             failed.push({ action: 'update', item, error: (e as any).message });
@@ -1571,7 +1571,7 @@ export class SiteApiController {
       if (body.delete?.length) {
         for (const id of body.delete) {
           try {
-            const ok = await adapter.deleteCustomer(id);
+            const ok = await adapter.deleteCustomer({ id });
             if (ok) deleted.push(id);
             else failed.push({ action: 'delete', id, error: 'delete failed' });
           } catch (e) {

src/db/seeds/template.seeder.ts

@@ -23,19 +23,38 @@ export default class TemplateSeeder implements Seeder {
     const templates = [
       {
         name: 'product.sku',
-        value: "<%= [it.category.shortName].concat(it.attributes.map(a => a.shortName)).join('-') %>",
+        value: `<%
+  // 按分类判断属性排序逻辑
+  if (it.category.name === 'nicotine-pouches') {
+    // 1. 定义 nicotine-pouches 专属的属性固定顺序
+    const fixedOrder = ['brand','category', 'flavor', 'strength', 'humidity'];
+    sortedAttrShortNames = fixedOrder.map(attrKey => {
+      if(attrKey === 'category') return it.category.shortName
+      // 排序
+      const matchedAttr = it.attributes.find(a => a?.dict?.name === attrKey);
+      return matchedAttr ? matchedAttr.shortName : '';
+    }).filter(Boolean); // 移除空值，避免多余的 "-"
+  } else {
+    // 非目标分类，保留 attributes 原有顺序
+    sortedAttrShortNames = it.attributes.map(a => a.shortName);
+  }
+
+  // 4. 拼接分类名 + 排序后的属性名
+  %><%= sortedAttrShortNames.join('-') %><%
+%>`,
         description: '产品SKU模板',
         testData: JSON.stringify({
-          category: {
+          "category": {
-            shortName: 'CAT',
+            "name": "nicotine-pouches",
+            "shortName": "NP"
           },
-          attributes: [
+          "attributes": [
-            { shortName: 'BR' },
+            { "dict": {"name": "brand"},"shortName": "YOONE" },
-            { shortName: 'FL' },
+            { "dict": {"name": "flavor"},"shortName": "FL" },
-            { shortName: '10MG' },
+            { "dict": {"name": "strength"},"shortName": "10MG" },
-            { shortName: 'DRY' },
+            { "dict": {"name": "humidity"},"shortName": "DRY" }
-          ],
+          ]
-        }),
+}),
       },
       {
         name: 'product.title',

src/dto/shopyy.dto.ts

@@ -4,6 +4,53 @@ export interface ShopyyTag {
   id?: number;
   name?: string;
 }
+export interface ShopyyProductQuery {
+  page: string;
+  limit: string;
+}
+/**
+ * Shopyy 全量商品查询参数类
+ * 用于封装获取 Shopyy 商品列表时的各种筛选和分页条件
+ * 参考文档: https://www.apizza.net/project/e114fb8e628e0f604379f5b26f0d8330/browse
+ */
+export class ShopyyAllProductQuery {
+  /** 分页大小，限制返回的商品数量 */
+  limit?: string;
+  /** 起始ID，用于分页，返回ID大于该值的商品 */
+  since_id?: string;
+  /** 商品ID，精确匹配单个商品 */
+  id?: string;
+  /** 商品标题，支持模糊查询 */
+  title?: string;
+  /** 商品状态，例如：上架、下架、删除等（具体值参考 Shopyy 接口文档） */
+  status?: string;
+  /** 商品SKU编码，库存保有单位，精确或模糊匹配 */
+  sku?: string;
+  /** 商品SPU编码，标准化产品单元，用于归类同款商品 */
+  spu?: string;
+  /** 商品分类ID，筛选指定分类下的商品 */
+  collection_id?: string;
+  /** 变体价格最小值，筛选变体价格大于等于该值的商品 */
+  variant_price_min?: string;
+  /** 变体价格最大值，筛选变体价格小于等于该值的商品 */
+  variant_price_max?: string;
+  /** 变体划线价（原价）最小值，筛选变体划线价大于等于该值的商品 */
+  variant_compare_at_price_min?: string;
+  /** 变体划线价（原价）最大值，筛选变体划线价小于等于该值的商品 */
+  variant_compare_at_price_max?: string;
+  /** 变体重量最小值，筛选变体重量大于等于该值的商品（单位参考接口文档） */
+  variant_weight_min?: string;
+  /** 变体重量最大值，筛选变体重量小于等于该值的商品（单位参考接口文档） */
+  variant_weight_max?: string;
+  /** 商品创建时间最小值，格式参考接口文档（如：YYYY-MM-DD HH:mm:ss） */
+  created_at_min?: string;
+  /** 商品创建时间最大值，格式参考接口文档（如：YYYY-MM-DD HH:mm:ss） */
+  created_at_max?: string;
+  /** 商品更新时间最小值，格式参考接口文档（如：YYYY-MM-DD HH:mm:ss） */
+  updated_at_min?: string;
+  /** 商品更新时间最大值，格式参考接口文档（如：YYYY-MM-DD HH:mm:ss） */
+  updated_at_max?: string;
+}
 // 产品类型
 export interface ShopyyProduct {
   // 产品主键
@@ -83,6 +130,42 @@ export interface ShopyyVariant {
   position?: number | string;
   sku_code?: string;
 }
+//
+// 订单查询参数类型
+export interface ShopyyOrderQuery {
+  // 订单ID集合 多个ID用','联接 例：1,2,3
+  ids?: string;
+  // 订单状态 100 未完成；110 待处理；180 已完成（确认收货）; 190 取消；
+  status?: string;
+  // 物流状态 300 未发货；310 部分发货；320 已发货；330(确认收货)
+  fulfillment_status?: string;
+  // 支付状态 200 待支付；210 支付中；220 部分支付；230 已支付；240 支付失败；250 部分退款；260 已退款 ；290 已取消；
+  financial_status?: string;
+  // 支付时间 下限值
+  pay_at_min?: string;
+  // 支付时间 上限值
+  pay_at_max?: string;
+  // 创建开始时间
+  created_at_min?: number;
+  // 创建结束时间
+  created_at_max?: number;
+  // 更新时间开始
+  updated_at_min?: string;
+  // 更新时间结束
+  updated_at_max?: string;
+  // 起始ID
+  since_id?: string;
+  // 页码
+  page?: string;
+  // 每页条数
+  limit?: string;
+  // 排序字段（默认id） id=订单ID updated_at=最后更新时间 pay_at=支付时间
+  order_field?: string;
+  // 排序方式（默认desc） desc=降序 asc=升序
+  order_by?: string;
+  // 订单列表类型
+  group?: string;
+}
 
 // 订单类型
 export interface ShopyyOrder {
@@ -219,7 +302,8 @@ export interface ShopyyOrder {
       // 创建时间
       created_at?: number;
       // 发货商品表 id
-      id?: number }>;
+      id?: number
+    }>;
   }>;
   shipping_zone_plans?: Array<{
     shipping_price?: number | string;

src/dto/site-api.dto.ts

@@ -2,6 +2,7 @@ import { ApiProperty } from '@midwayjs/swagger';
 import {
   UnifiedPaginationDTO,
 } from './api.dto';
+import { Dict } from '../entity/dict.entity';
 // export class UnifiedOrderWhere{
 //   []
 // }
@@ -17,6 +18,11 @@ export enum OrderFulfillmentStatus {
   // 确认发货
   CONFIRMED,
 }
+// 
+export class UnifiedProductWhere {
+  sku?: string;
+  [prop:string]:any
+}
 export class UnifiedTagDTO {
   // 标签DTO用于承载统一标签数据
   @ApiProperty({ description: '标签ID' })
@@ -137,6 +143,8 @@ export class UnifiedProductAttributeDTO {
 
   @ApiProperty({ description: '变体属性值（单个值）', required: false })
   option?: string;
+  // 这个是属性的父级字典项
+  dict?: Dict;
 }
 
 export class UnifiedProductVariationDTO {

src/dto/woocommerce.dto.ts

@@ -117,9 +117,9 @@ export interface WooProduct {
   // 购买备注
   purchase_note?: string;
   // 分类列表
-  categories?: Array<{ id: number; name?: string; slug?: string }>;
+  categories?: Array<{ id?: number; name?: string; slug?: string }>;
   // 标签列表
-  tags?: Array<{ id: number; name?: string; slug?: string }>;
+  tags?: Array<{ id?: number; name?: string; slug?: string }>;
   // 菜单排序
   menu_order?: number;
   // 元数据

src/entity/dict.entity.ts

@@ -29,6 +29,10 @@ export class Dict {
   @OneToMany(() => DictItem, item => item.dict)
   items: DictItem[];
 
+  // 排序
+  @Column({ default: 0, comment: '排序' })
+  sort: number;
+  
   // 是否可删除
   @Column({ default: true, comment: '是否可删除' })
   deletable: boolean;

src/entity/product.entity.ts

@@ -65,9 +65,6 @@ export class Product {
   @Column({ type: 'decimal', precision: 10, scale: 2, default: 0 })
   promotionPrice: number;
 
-
-
-
   // 分类关联
   @ManyToOne(() => Category, category => category.products)
   @JoinColumn({ name: 'categoryId' })

src/interface/site-adapter.interface.ts

@@ -20,45 +20,70 @@ import { UnifiedPaginationDTO, UnifiedSearchParamsDTO } from '../dto/api.dto';
 import { BatchOperationDTO, BatchOperationResultDTO } from '../dto/batch.dto';
 
 export interface ISiteAdapter {
+  // ========== 客户映射方法 ==========
   /**
-   * 获取产品列表
+   * 将平台客户数据转换为统一客户数据格式
+   * @param data 平台特定客户数据
+   * @returns 统一客户数据格式
    */
-  getProducts(params: UnifiedSearchParamsDTO): Promise<UnifiedPaginationDTO<UnifiedProductDTO>>;
+  mapPlatformToUnifiedCustomer(data: any): UnifiedCustomerDTO;
 
   /**
-   * 获取所有产品
+   * 将统一客户数据格式转换为平台客户数据
+   * @param data 统一客户数据格式
+   * @returns 平台特定客户数据
    */
-  getAllProducts(params?: UnifiedSearchParamsDTO): Promise<UnifiedProductDTO[]>;
+  mapUnifiedToPlatformCustomer(data: Partial<UnifiedCustomerDTO>): any;
 
   /**
-   * 获取单个产品
+   * 获取单个客户
    */
-  getProduct(id: string | number): Promise<UnifiedProductDTO>;
+  getCustomer(where: Partial<Pick<UnifiedCustomerDTO, 'id' | 'email' | 'phone'>>): Promise<UnifiedCustomerDTO>;
 
   /**
-   * 获取订单列表
+   * 获取客户列表
    */
-  getOrders(params: UnifiedSearchParamsDTO): Promise<UnifiedPaginationDTO<UnifiedOrderDTO>>;
+  getCustomers(params: UnifiedSearchParamsDTO): Promise<UnifiedPaginationDTO<UnifiedCustomerDTO>>;
 
   /**
-   * 获取所有订单
+   * 获取所有客户
    */
-  getAllOrders(params?: UnifiedSearchParamsDTO): Promise<UnifiedOrderDTO[]>;
+  getAllCustomers(params?: UnifiedSearchParamsDTO): Promise<UnifiedCustomerDTO[]>;
 
   /**
-   * 获取单个订单
+   * 创建客户
    */
-  getOrder(id: string | number): Promise<UnifiedOrderDTO>;
+  createCustomer(data: Partial<UnifiedCustomerDTO>): Promise<UnifiedCustomerDTO>;
 
   /**
-   * 获取订阅列表
+   * 更新客户
    */
-  getSubscriptions(params: UnifiedSearchParamsDTO): Promise<UnifiedPaginationDTO<UnifiedSubscriptionDTO>>;
+  updateCustomer(where: Partial<Pick<UnifiedCustomerDTO, 'id' | 'email' | 'phone'>>, data: Partial<UnifiedCustomerDTO>): Promise<UnifiedCustomerDTO>;
 
   /**
-   * 获取所有订阅
+   * 删除客户
    */
-  getAllSubscriptions(params?: UnifiedSearchParamsDTO): Promise<UnifiedSubscriptionDTO[]>;
+  deleteCustomer(where: Partial<Pick<UnifiedCustomerDTO, 'id' | 'email' | 'phone'>>): Promise<boolean>;
+
+  /**
+   * 批量处理客户
+   */
+  batchProcessCustomers?(data: BatchOperationDTO): Promise<BatchOperationResultDTO>;
+
+  // ========== 媒体映射方法 ==========
+  /**
+   * 将平台媒体数据转换为统一媒体数据格式
+   * @param data 平台特定媒体数据
+   * @returns 统一媒体数据格式
+   */
+  mapPlatformToUnifiedMedia(data: any): UnifiedMediaDTO;
+
+  /**
+   * 将统一媒体数据格式转换为平台媒体数据
+   * @param data 统一媒体数据格式
+   * @returns 平台特定媒体数据
+   */
+  mapUnifiedToPlatformMedia(data: Partial<UnifiedMediaDTO>): any;
 
   /**
    * 获取媒体列表
@@ -75,75 +100,69 @@ export interface ISiteAdapter {
    */
   createMedia(file: any): Promise<UnifiedMediaDTO>;
 
+  // ========== 订单映射方法 ==========
   /**
-   * 获取评论列表
+   * 将平台订单数据转换为统一订单数据格式
+   * @param data 平台特定订单数据
+   * @returns 统一订单数据格式
    */
-  getReviews(params: UnifiedSearchParamsDTO): Promise<UnifiedPaginationDTO<UnifiedReviewDTO>>;
+  mapPlatformToUnifiedOrder(data: any): UnifiedOrderDTO;
 
   /**
-   * 获取所有评论
+   * 将统一订单数据格式转换为平台订单数据
+   * @param data 统一订单数据格式
+   * @returns 平台特定订单数据
    */
-  getAllReviews(params?: UnifiedSearchParamsDTO): Promise<UnifiedReviewDTO[]>;
+  mapUnifiedToPlatformOrder(data: Partial<UnifiedOrderDTO>): any;
 
   /**
-   * 创建评论
+   * 将统一订单创建参数转换为平台订单创建参数
+   * @param data 统一订单创建参数
+   * @returns 平台订单创建参数
    */
-  createReview(data: CreateReviewDTO): Promise<UnifiedReviewDTO>;
+  mapCreateOrderParams(data: Partial<UnifiedOrderDTO>): any;
 
   /**
-   * 更新评论
+   * 将统一订单更新参数转换为平台订单更新参数
+   * @param data 统一订单更新参数
+   * @returns 平台订单更新参数
    */
-  updateReview(id: number, data: UpdateReviewDTO): Promise<UnifiedReviewDTO>;
+  mapUpdateOrderParams(data: Partial<UnifiedOrderDTO>): any;
 
   /**
-   * 删除评论
+   * 获取单个订单
    */
-  deleteReview(id: number): Promise<boolean>;
+  getOrder(where: Partial<Pick<UnifiedOrderDTO, 'id'>>): Promise<UnifiedOrderDTO>;
 
   /**
-   * 创建产品
+   * 获取订单列表
    */
-  createProduct(data: Partial<UnifiedProductDTO>): Promise<UnifiedProductDTO>;
+  getOrders(params: UnifiedSearchParamsDTO): Promise<UnifiedPaginationDTO<UnifiedOrderDTO>>;
 
   /**
-   * 更新产品
+   * 获取所有订单
    */
-  updateProduct(id: string | number, data: Partial<UnifiedProductDTO>): Promise<boolean>;
+  getAllOrders(params?: UnifiedSearchParamsDTO): Promise<UnifiedOrderDTO[]>;
 
   /**
-   * 删除产品
+   * 获取订单总数
    */
-  deleteProduct(id: string | number): Promise<boolean>;
+  countOrders(params: Record<string, any>): Promise<number>;
 
   /**
-   * 获取产品变体列表
+   * 创建订单
    */
-  getVariations(productId: string | number, params: UnifiedSearchParamsDTO): Promise<UnifiedVariationPaginationDTO>;
+  createOrder(data: Partial<UnifiedOrderDTO>): Promise<UnifiedOrderDTO>;
 
   /**
-   * 获取所有产品变体
+   * 更新订单
    */
-  getAllVariations(productId: string | number, params?: UnifiedSearchParamsDTO): Promise<UnifiedProductVariationDTO[]>;
+  updateOrder(where: Partial<Pick<UnifiedOrderDTO, 'id'>>, data: Partial<UnifiedOrderDTO>): Promise<boolean>;
 
   /**
-   * 获取单个产品变体
+   * 删除订单
    */
-  getVariation(productId: string | number, variationId: string | number): Promise<UnifiedProductVariationDTO>;
+  deleteOrder(where: Partial<Pick<UnifiedOrderDTO, 'id'>>): Promise<boolean>;
-
-  /**
-   * 创建产品变体
-   */
-  createVariation(productId: string | number, data: CreateVariationDTO): Promise<UnifiedProductVariationDTO>;
-
-  /**
-   * 更新产品变体
-   */
-  updateVariation(productId: string | number, variationId: string | number, data: UpdateVariationDTO): Promise<UnifiedProductVariationDTO>;
-
-  /**
-   * 删除产品变体
-   */
-  deleteVariation(productId: string | number, variationId: string | number): Promise<boolean>;
 
   /**
    * 获取订单备注
@@ -155,71 +174,6 @@ export interface ISiteAdapter {
    */
   createOrderNote(orderId: string | number, data: any): Promise<any>;
 
-  batchProcessProducts?(data: BatchOperationDTO): Promise<BatchOperationResultDTO>;
-
-  createOrder(data: Partial<UnifiedOrderDTO>): Promise<UnifiedOrderDTO>;
-  updateOrder(id: string | number, data: Partial<UnifiedOrderDTO>): Promise<boolean>;
-  deleteOrder(id: string | number): Promise<boolean>;
-
-  batchProcessOrders?(data: BatchOperationDTO): Promise<BatchOperationResultDTO>;
-
-  getCustomers(params: UnifiedSearchParamsDTO): Promise<UnifiedPaginationDTO<UnifiedCustomerDTO>>;
-  getAllCustomers(params?: UnifiedSearchParamsDTO): Promise<UnifiedCustomerDTO[]>;
-  getCustomer(id: string | number): Promise<UnifiedCustomerDTO>;
-  createCustomer(data: Partial<UnifiedCustomerDTO>): Promise<UnifiedCustomerDTO>;
-  updateCustomer(id: string | number, data: Partial<UnifiedCustomerDTO>): Promise<UnifiedCustomerDTO>;
-  deleteCustomer(id: string | number): Promise<boolean>;
-
-  batchProcessCustomers?(data: BatchOperationDTO): Promise<BatchOperationResultDTO>;
-
-  /**
-   * 获取webhooks列表
-   */
-  getWebhooks(params: UnifiedSearchParamsDTO): Promise<UnifiedWebhookPaginationDTO>;
-
-  /**
-   * 获取所有webhooks
-   */
-  getAllWebhooks(params?: UnifiedSearchParamsDTO): Promise<UnifiedWebhookDTO[]>;
-
-  /**
-   * 获取单个webhook
-   */
-  getWebhook(id: string | number): Promise<UnifiedWebhookDTO>;
-
-  /**
-   * 创建webhook
-   */
-  createWebhook(data: CreateWebhookDTO): Promise<UnifiedWebhookDTO>;
-
-  /**
-   * 更新webhook
-   */
-  updateWebhook(id: string | number, data: UpdateWebhookDTO): Promise<UnifiedWebhookDTO>;
-
-  /**
-   * 删除webhook
-   */
-  deleteWebhook(id: string | number): Promise<boolean>;
-
-  /**
-   * 获取站点链接列表
-   */
-  getLinks(): Promise<Array<{title: string, url: string}>>;
-
-  /**
-   * 订单履行（发货）
-   */
-  fulfillOrder(orderId: string | number, data: {
-    tracking_number?: string;
-    shipping_provider?: string;
-    shipping_method?: string;
-    items?: Array<{
-      order_item_id: number;
-      quantity: number;
-    }>;
-  }): Promise<any>;
-
   /**
    * 取消订单履行
    */
@@ -267,4 +221,276 @@ export interface ISiteAdapter {
    * 删除订单履行信息
    */
   deleteOrderFulfillment(orderId: string | number, fulfillmentId: string): Promise<boolean>;
+
+  /**
+   * 批量处理订单
+   */
+  batchProcessOrders?(data: BatchOperationDTO): Promise<BatchOperationResultDTO>;
+
+  // ========== 产品映射方法 ==========
+  /**
+   * 将平台产品数据转换为统一产品数据格式
+   * @param data 平台特定产品数据
+   * @returns 统一产品数据格式
+   */
+  mapPlatformToUnifiedProduct(data: any): UnifiedProductDTO;
+
+  /**
+   * 将统一产品数据格式转换为平台产品数据
+   * @param data 统一产品数据格式
+   * @returns 平台特定产品数据
+   */
+  mapUnifiedToPlatformProduct(data: Partial<UnifiedProductDTO>): any;
+
+  /**
+   * 将统一产品创建参数转换为平台产品创建参数
+   * @param data 统一产品创建参数
+   * @returns 平台产品创建参数
+   */
+  mapCreateProductParams(data: Partial<UnifiedProductDTO>): any;
+
+  /**
+   * 将统一产品更新参数转换为平台产品更新参数
+   * @param data 统一产品更新参数
+   * @returns 平台产品更新参数
+   */
+  mapUpdateProductParams(data: Partial<UnifiedProductDTO>): any;
+
+  /**
+   * 获取单个产品
+   */
+  getProduct(where: Partial<Pick<UnifiedProductDTO, 'id' | 'sku'>>): Promise<UnifiedProductDTO>;
+
+  /**
+   * 获取产品列表
+   */
+  getProducts(params: UnifiedSearchParamsDTO): Promise<UnifiedPaginationDTO<UnifiedProductDTO>>;
+
+  /**
+   * 获取所有产品
+   */
+  getAllProducts(params?: UnifiedSearchParamsDTO): Promise<UnifiedProductDTO[]>;
+
+  /**
+   * 创建产品
+   */
+  createProduct(data: Partial<UnifiedProductDTO>): Promise<UnifiedProductDTO>;
+
+  /**
+   * 更新产品
+   */
+  updateProduct(where: Partial<Pick<UnifiedProductDTO, 'id' | 'sku'>>, data: Partial<UnifiedProductDTO>): Promise<boolean>;
+
+  /**
+   * 删除产品
+   */
+  deleteProduct(where: Partial<Pick<UnifiedProductDTO, 'id' | 'sku'>>): Promise<boolean>;
+
+  /**
+   * 批量处理产品
+   */
+  batchProcessProducts?(data: BatchOperationDTO): Promise<BatchOperationResultDTO>;
+
+  // ========== 评论映射方法 ==========
+  /**
+   * 将平台评论数据转换为统一评论数据格式
+   * @param data 平台特定评论数据
+   * @returns 统一评论数据格式
+   */
+  mapPlatformToUnifiedReview(data: any): UnifiedReviewDTO;
+
+  /**
+   * 将统一评论数据格式转换为平台评论数据
+   * @param data 统一评论数据格式
+   * @returns 平台特定评论数据
+   */
+  mapUnifiedToPlatformReview(data: Partial<UnifiedReviewDTO>): any;
+
+  /**
+   * 将统一评论创建参数转换为平台评论创建参数
+   * @param data 统一评论创建参数
+   * @returns 平台评论创建参数
+   */
+  mapCreateReviewParams(data: CreateReviewDTO): any;
+
+  /**
+   * 将统一评论更新参数转换为平台评论更新参数
+   * @param data 统一评论更新参数
+   * @returns 平台评论更新参数
+   */
+  mapUpdateReviewParams(data: UpdateReviewDTO): any;
+
+  /**
+   * 获取评论列表
+   */
+  getReviews(params: UnifiedSearchParamsDTO): Promise<UnifiedPaginationDTO<UnifiedReviewDTO>>;
+
+  /**
+   * 获取所有评论
+   */
+  getAllReviews(params?: UnifiedSearchParamsDTO): Promise<UnifiedReviewDTO[]>;
+
+  /**
+   * 创建评论
+   */
+  createReview(data: CreateReviewDTO): Promise<UnifiedReviewDTO>;
+
+  /**
+   * 更新评论
+   */
+  updateReview(where: Partial<Pick<UnifiedReviewDTO, 'id'>>, data: UpdateReviewDTO): Promise<UnifiedReviewDTO>;
+
+  /**
+   * 删除评论
+   */
+  deleteReview(where: Partial<Pick<UnifiedReviewDTO, 'id'>>): Promise<boolean>;
+
+  // ========== 订阅映射方法 ==========
+  /**
+   * 将平台订阅数据转换为统一订阅数据格式
+   * @param data 平台特定订阅数据
+   * @returns 统一订阅数据格式
+   */
+  mapPlatformToUnifiedSubscription(data: any): UnifiedSubscriptionDTO;
+
+  /**
+   * 将统一订阅数据格式转换为平台订阅数据
+   * @param data 统一订阅数据格式
+   * @returns 平台特定订阅数据
+   */
+  mapUnifiedToPlatformSubscription(data: Partial<UnifiedSubscriptionDTO>): any;
+
+  /**
+   * 获取订阅列表
+   */
+  getSubscriptions(params: UnifiedSearchParamsDTO): Promise<UnifiedPaginationDTO<UnifiedSubscriptionDTO>>;
+
+  /**
+   * 获取所有订阅
+   */
+  getAllSubscriptions(params?: UnifiedSearchParamsDTO): Promise<UnifiedSubscriptionDTO[]>;
+
+  // ========== 产品变体映射方法 ==========
+  /**
+   * 将平台产品变体数据转换为统一产品变体数据格式
+   * @param data 平台特定产品变体数据
+   * @returns 统一产品变体数据格式
+   */
+  mapPlatformToUnifiedVariation(data: any): UnifiedProductVariationDTO;
+
+  /**
+   * 将统一产品变体数据格式转换为平台产品变体数据
+   * @param data 统一产品变体数据格式
+   * @returns 平台特定产品变体数据
+   */
+  mapUnifiedToPlatformVariation(data: Partial<UnifiedProductVariationDTO>): any;
+
+  /**
+   * 将统一产品变体创建参数转换为平台产品变体创建参数
+   * @param data 统一产品变体创建参数
+   * @returns 平台产品变体创建参数
+   */
+  mapCreateVariationParams(data: CreateVariationDTO): any;
+
+  /**
+   * 将统一产品变体更新参数转换为平台产品变体更新参数
+   * @param data 统一产品变体更新参数
+   * @returns 平台产品变体更新参数
+   */
+  mapUpdateVariationParams(data: UpdateVariationDTO): any;
+
+  /**
+   * 获取单个产品变体
+   */
+  getVariation(productId: string | number, variationId: string | number): Promise<UnifiedProductVariationDTO>;
+
+  /**
+   * 获取产品变体列表
+   */
+  getVariations(productId: string | number, params: UnifiedSearchParamsDTO): Promise<UnifiedVariationPaginationDTO>;
+
+  /**
+   * 获取所有产品变体
+   */
+  getAllVariations(productId: string | number, params?: UnifiedSearchParamsDTO): Promise<UnifiedProductVariationDTO[]>;
+
+  /**
+   * 创建产品变体
+   */
+  createVariation(productId: string | number, data: CreateVariationDTO): Promise<UnifiedProductVariationDTO>;
+
+  /**
+   * 更新产品变体
+   */
+  updateVariation(productId: string | number, variationId: string | number, data: UpdateVariationDTO): Promise<UnifiedProductVariationDTO>;
+
+  /**
+   * 删除产品变体
+   */
+  deleteVariation(productId: string | number, variationId: string | number): Promise<boolean>;
+
+  // ========== Webhook映射方法 ==========
+  /**
+   * 将平台Webhook数据转换为统一Webhook数据格式
+   * @param data 平台特定Webhook数据
+   * @returns 统一Webhook数据格式
+   */
+  mapPlatformToUnifiedWebhook(data: any): UnifiedWebhookDTO;
+
+  /**
+   * 将统一Webhook数据格式转换为平台Webhook数据
+   * @param data 统一Webhook数据格式
+   * @returns 平台特定Webhook数据
+   */
+  mapUnifiedToPlatformWebhook(data: Partial<UnifiedWebhookDTO>): any;
+
+  /**
+   * 将统一Webhook创建参数转换为平台Webhook创建参数
+   * @param data 统一Webhook创建参数
+   * @returns 平台Webhook创建参数
+   */
+  mapCreateWebhookParams(data: CreateWebhookDTO): any;
+
+  /**
+   * 将统一Webhook更新参数转换为平台Webhook更新参数
+   * @param data 统一Webhook更新参数
+   * @returns 平台Webhook更新参数
+   */
+  mapUpdateWebhookParams(data: UpdateWebhookDTO): any;
+
+  /**
+   * 获取单个webhook
+   */
+  getWebhook(where: Partial<Pick<UnifiedWebhookDTO, 'id'>>): Promise<UnifiedWebhookDTO>;
+
+  /**
+   * 获取webhooks列表
+   */
+  getWebhooks(params: UnifiedSearchParamsDTO): Promise<UnifiedWebhookPaginationDTO>;
+
+  /**
+   * 获取所有webhooks
+   */
+  getAllWebhooks(params?: UnifiedSearchParamsDTO): Promise<UnifiedWebhookDTO[]>;
+
+  /**
+   * 创建webhook
+   */
+  createWebhook(data: CreateWebhookDTO): Promise<UnifiedWebhookDTO>;
+
+  /**
+   * 更新webhook
+   */
+  updateWebhook(where: Partial<Pick<UnifiedWebhookDTO, 'id'>>, data: UpdateWebhookDTO): Promise<UnifiedWebhookDTO>;
+
+  /**
+   * 删除webhook
+   */
+  deleteWebhook(where: Partial<Pick<UnifiedWebhookDTO, 'id'>>): Promise<boolean>;
+
+  // ========== 站点/其他方法 ==========
+  /**
+   * 获取站点链接列表
+   */
+  getLinks(): Promise<Array<{ title: string, url: string }>>;
 }

src/job/sync_shipment.job.ts

@@ -75,10 +75,14 @@ export class SyncUniuniShipmentJob implements IJob{
     '255': 'Gateway_To_Gateway_Transit'
   };
   async onTick() {
+    try {
       const shipments:Shipment[] = await this.shipmentModel.findBy({ finished: false });
       shipments.forEach(shipment => {
         this.logisticsService.updateShipmentState(shipment);
       });
+    } catch (error) {
+      this.logger.error(`更新运单状态失败 ${error.message}`);
+    }
   }
 
   onComplete(result: any) {

src/service/order.service.ts

@@ -202,7 +202,7 @@ export class OrderService {
     try {
       // 调用 WooCommerce API 获取订单
       const adapter = await this.siteApiService.getAdapter(siteId);
-      const order = await adapter.getOrder(orderId);
+      const order = await adapter.getOrder({ id: orderId });
 
       // 检查订单是否已存在，以区分创建和更新
       const existingOrder = await this.orderModel.findOne({

src/service/product.service.ts

@@ -28,7 +28,7 @@ import { StockPoint } from '../entity/stock_point.entity';
 import { StockService } from './stock.service';
 import { TemplateService } from './template.service';
 
-import { SyncOperationResultDTO, UnifiedSearchParamsDTO } from '../dto/api.dto';
+import { BatchErrorItem, BatchOperationResult, SyncOperationResultDTO, UnifiedSearchParamsDTO } from '../dto/api.dto';
 import { UnifiedProductDTO } from '../dto/site-api.dto';
 import { ProductSiteSkuDTO, SyncProductToSiteDTO } from '../dto/site-sync.dto';
 import { Category } from '../entity/category.entity';
@@ -225,7 +225,7 @@ export class ProductService {
       where: {
         sku,
       },
-      relations: ['category', 'attributes', 'attributes.dict', 'siteSkus']
+      relations: ['category', 'attributes', 'attributes.dict']
     });
   }
 
@@ -1455,6 +1455,9 @@ export class ProductService {
       }
     }
 
+    // 处理分类字段
+    const category = val(rec.category);
+
     return {
       sku,
       name: val(rec.name),
@@ -1464,6 +1467,7 @@ export class ProductService {
       promotionPrice: num(rec.promotionPrice),
       type: val(rec.type),
       siteSkus: rec.siteSkus ? String(rec.siteSkus).split(',').map(s => s.trim()).filter(Boolean) : undefined,
+      category, // 添加分类字段
 
       attributes: attributes.length > 0 ? attributes : undefined,
     } as any;
@@ -1483,10 +1487,15 @@ export class ProductService {
     if (data.price !== undefined) dto.price = Number(data.price);
     if (data.promotionPrice !== undefined) dto.promotionPrice = Number(data.promotionPrice);
 
-    if (data.categoryId !== undefined) dto.categoryId = Number(data.categoryId);
+    // 处理分类字段
+    if (data.categoryId !== undefined) {
+      dto.categoryId = Number(data.categoryId);
+    } else if (data.category) {
+      // 如果是字符串，需要后续在createProduct中处理
+      dto.attributes = [...(dto.attributes || []), { dictName: 'category', title: data.category }];
+    }
 
     // 默认值和特殊处理
-
     dto.attributes = Array.isArray(data.attributes) ? data.attributes : [];
 
     // 如果有组件信息,透传
@@ -1508,7 +1517,13 @@ export class ProductService {
     if (data.price !== undefined) dto.price = Number(data.price);
     if (data.promotionPrice !== undefined) dto.promotionPrice = Number(data.promotionPrice);
 
-    if (data.categoryId !== undefined) dto.categoryId = Number(data.categoryId);
+    // 处理分类字段
+    if (data.categoryId !== undefined) {
+      dto.categoryId = Number(data.categoryId);
+    } else if (data.category) {
+      // 如果是字符串，需要后续在updateProduct中处理
+      dto.attributes = [...(dto.attributes || []), { dictName: 'category', title: data.category }];
+    }
 
     if (data.type !== undefined) dto.type = data.type;
     if (data.attributes !== undefined) dto.attributes = data.attributes;
@@ -1548,8 +1563,8 @@ export class ProductService {
       esc(p.price),
       esc(p.promotionPrice),
       esc(p.type),
-
       esc(p.description),
+      esc(p.category ? p.category.name || p.category.title : ''), // 添加分类字段
     ];
 
     // 属性数据
@@ -1575,9 +1590,9 @@ export class ProductService {
 
   // 导出所有产品为 CSV 文本
   async exportProductsCSV(): Promise<string> {
-    // 查询所有产品及其属性(包含字典关系)和组成
+    // 查询所有产品及其属性(包含字典关系)、组成和分类
     const products = await this.productModel.find({
-      relations: ['attributes', 'attributes.dict', 'components'],
+      relations: ['attributes', 'attributes.dict', 'components', 'category'],
       order: { id: 'ASC' },
     });
 
@@ -1612,8 +1627,8 @@ export class ProductService {
       'price',
       'promotionPrice',
       'type',
-
       'description',
+      'category',
     ];
 
     // 动态属性表头
@@ -1640,7 +1655,7 @@ export class ProductService {
   }
 
   // 从 CSV 导入产品;存在则更新,不存在则创建
-  async importProductsCSV(file: any): Promise<{ created: number; updated: number; errors: string[] }> {
+  async importProductsCSV(file: any): Promise<BatchOperationResult> {
     let buffer: Buffer;
     if (Buffer.isBuffer(file)) {
       buffer = file;
@@ -1676,19 +1691,19 @@ export class ProductService {
         console.log('First record keys:', Object.keys(records[0]));
       }
     } catch (e: any) {
-      return { created: 0, updated: 0, errors: [`CSV 解析失败:${e?.message || e}`] };
+      throw new Error(`CSV 解析失败:${e?.message || e}`)
     }
 
     let created = 0;
     let updated = 0;
-    const errors: string[] = [];
+    const errors: BatchErrorItem[] = [];
 
     // 逐条处理记录
     for (const rec of records) {
       try {
         const data = this.transformCsvRecordToData(rec);
         if (!data) {
-          errors.push('缺少 SKU 的记录已跳过');
+          errors.push({ identifier: data.sku, error: '缺少 SKU 的记录已跳过'});
           continue;
         }
         const { sku } = data;
@@ -1708,11 +1723,11 @@ export class ProductService {
           updated += 1;
         }
       } catch (e: any) {
-        errors.push(`产品${rec?.sku}导入失败:${e?.message || String(e)}`);
+        errors.push({ identifier: '' + rec.sku, error: `产品${rec?.sku}导入失败:${e?.message || String(e)}`});
       }
     }
 
-    return { created, updated, errors };
+    return { total: records.length, processed: records.length - errors.length, created, updated, errors };
   }
 
   // 将库存记录的 sku 添加到产品单品中
@@ -1831,9 +1846,7 @@ export class ProductService {
     }
 
     // 将本地产品转换为站点API所需格式
-    const unifiedProduct = await this.convertLocalProductToUnifiedProduct(localProduct, params.siteSku);
+    const unifiedProduct = await this.mapLocalToUnifiedProduct(localProduct, params.siteSku);
-
-
 
     // 调用站点API的upsertProduct方法
     try {
@@ -1842,7 +1855,7 @@ export class ProductService {
       await this.bindSiteSkus(localProduct.id, [unifiedProduct.sku]);
       return result;
     } catch (error) {
-      throw new Error(`同步产品到站点失败: ${error.message}`);
+      throw new Error(`同步产品到站点失败: ${error?.response?.data?.message??error.message}`);
     }
   }
 
@@ -1869,9 +1882,6 @@ export class ProductService {
           siteSku: item.siteSku
         });
         
-        // 然后绑定站点SKU
-        await this.bindSiteSkus(item.productId, [item.siteSku]);
-        
         results.synced++;
         results.processed++;
       } catch (error) {
@@ -1892,30 +1902,23 @@ export class ProductService {
    * @param siteProductId 站点产品ID
    * @returns 同步后的本地产品
    */
-  async syncProductFromSite(siteId: number, siteProductId: string | number): Promise<any> {
+  async syncProductFromSite(siteId: number, siteProductId: string | number, sku: string): Promise<any> {
+   const adapter = await this.siteApiService.getAdapter(siteId);
+    const siteProduct =  await adapter.getProduct({ id: siteProductId });
     // 从站点获取产品信息
-    const siteProduct = await this.siteApiService.getProductFromSite(siteId, siteProductId);
     if (!siteProduct) {
       throw new Error(`站点产品 ID ${siteProductId} 不存在`);
     }
-
-    // 检查是否已存在相同SKU的本地产品
-    let localProduct = null;
-    if (siteProduct.sku) {
-      try {
-        localProduct = await this.findProductBySku(siteProduct.sku);
-      } catch (error) {
-        // 产品不存在，继续创建
-      }
-    }
-
     // 将站点产品转换为本地产品格式
-    const productData = await this.convertSiteProductToLocalProduct(siteProduct);
+    const productData = await this.mapUnifiedToLocalProduct(siteProduct);
-
+    return await this.upsertProduct({sku}, productData);
-    if (localProduct) {
+  }
+  async upsertProduct(where: Partial<Pick<Product,'id'| 'sku'>>, productData: any) {
+    const existingProduct = await this.productModel.findOne({ where: where});
+    if (existingProduct) {
       // 更新现有产品
       const updateData: UpdateProductDTO = productData;
-      return await this.updateProduct(localProduct.id, updateData);
+      return await this.updateProduct(existingProduct.id, updateData);
     } else {
       // 创建新产品
       const createData: CreateProductDTO = productData;
@@ -1929,18 +1932,18 @@ export class ProductService {
    * @param siteProductIds 站点产品ID数组
    * @returns 批量同步结果
    */
-  async batchSyncFromSite(siteId: number, siteProductIds: (string | number)[]): Promise<{ synced: number, errors: string[] }> {
+  async batchSyncFromSite(siteId: number, data: Array<{siteProductId:string, sku: string}>): Promise<{ synced: number, errors: string[] }> {
     const results = {
       synced: 0,
       errors: []
     };
 
-    for (const siteProductId of siteProductIds) {
+    for (const item of data) {
       try {
-        await this.syncProductFromSite(siteId, siteProductId);
+        await this.syncProductFromSite(siteId, item.siteProductId, item.sku);
         results.synced++;
       } catch (error) {
-        results.errors.push(`站点产品ID ${siteProductId} 同步失败: ${error.message}`);
+        results.errors.push(`站点产品ID ${item.siteProductId} 同步失败: ${error.message}`);
       }
     }
 
@@ -1952,7 +1955,7 @@ export class ProductService {
    * @param siteProduct 站点产品对象
    * @returns 本地产品数据
    */
-  private async convertSiteProductToLocalProduct(siteProduct: any): Promise<CreateProductDTO> {
+  private async mapUnifiedToLocalProduct(siteProduct: any): Promise<CreateProductDTO> {
     const productData: any = {
       sku: siteProduct.sku,
       name: siteProduct.name,
@@ -2015,18 +2018,20 @@ export class ProductService {
    * @param localProduct 本地产品对象
    * @returns 统一产品对象
    */
-  private async  convertLocalProductToUnifiedProduct(localProduct: Product,siteSku?: string): Promise<Partial<UnifiedProductDTO>> {
+  private async  mapLocalToUnifiedProduct(localProduct: Product,siteSku?: string): Promise<Partial<UnifiedProductDTO>> {
+    const tags = localProduct.attributes?.map(a => ({name: a.name})) || [];
     // 将本地产品数据转换为UnifiedProductDTO格式
     const unifiedProduct: any = {
       id: localProduct.id ? String(localProduct.id) : undefined, // 如果产品已存在，使用现有ID
-      name: localProduct.nameCn || localProduct.name || localProduct.sku,
+      name: localProduct.name,
-      type: 'simple', // 默认类型，可以根据实际需要调整
+      type: localProduct.type === 'single'? 'simple' : 'bundle', // 默认类型，可以根据实际需要调整
       status: 'publish', // 默认状态，可以根据实际需要调整
-      sku: siteSku || await this.templateService.render('site.product.sku', { sku: localProduct.sku }),
+      sku: siteSku || await this.templateService.render('site.product.sku', { product: localProduct, sku: localProduct.sku }),
       regular_price: String(localProduct.price || 0),
       sale_price: String(localProduct.promotionPrice || localProduct.price || 0),
       price: String(localProduct.price || 0),
-      // stock_status: localProduct.stockQuantity && localProduct.stockQuantity > 0 ? 'instock' : 'outofstock',
+      // TODO 库存暂时无法同步
+      // stock_status: localProduct.components && localProduct.stockQuantity > 0 ? 'instock' : 'outofstock',
       // stock_quantity: localProduct.stockQuantity || 0,
       // images: localProduct.images ? localProduct.images.map(img => ({
       //   id: img.id,
@@ -2034,25 +2039,24 @@ export class ProductService {
       //   name: img.name || '',
       //   alt: img.alt || ''
       // })) : [],
-      tags: [],
+      tags,
       categories: localProduct.category ? [{
         id: localProduct.category.id,
         name: localProduct.category.name
       }] : [],
       attributes: localProduct.attributes ? localProduct.attributes.map(attr => ({
-        id: attr.id,
+        id: attr.dict.id,
-        name: attr.name,
+        name: attr.dict.name,
-        position: 0,
+        position: attr.dict.sort || 0,
         visible: true,
         variation: false,
-        options: [attr.value]
+        options: [attr.name]
       })) : [],
       variations: [],
       date_created: localProduct.createdAt ? new Date(localProduct.createdAt).toISOString() : new Date().toISOString(),
       date_modified: localProduct.updatedAt ? new Date(localProduct.updatedAt).toISOString() : new Date().toISOString(),
       raw: {
-        localProductId: localProduct.id,
+        ...localProduct
-        localProductSku: localProduct.sku
       }
     };
 

src/service/shopyy.service.ts

@@ -1,3 +1,6 @@
+/**
+ * https://www.apizza.net/project/e114fb8e628e0f604379f5b26f0d8330/browse
+ */
 import { ILogger, Inject, Provide } from '@midwayjs/core';
 import axios, { AxiosRequestConfig } from 'axios';
 import * as fs from 'fs';
@@ -155,7 +158,7 @@ export class ShopyyService {
    * @param params 请求参数
    * @returns 响应数据
    */
-  private async request(site: any, endpoint: string, method: string = 'GET', data: any = null, params: any = null): Promise<any> {
+  async request(site: any, endpoint: string, method: string = 'GET', data: any = null, params: any = null): Promise<any> {
     const url = this.buildURL(site.apiUrl, endpoint);
     const headers = this.buildHeaders(site);
 
@@ -180,41 +183,19 @@ export class ShopyyService {
    * 通用分页获取资源
    */
   public async fetchResourcePaged<T>(site: any, endpoint: string, params: Record<string, any> = {}) {
-    const page = Number(params.page || 1);
+    const response = await this.request(site, endpoint, 'GET', null, params);
-    const limit = Number(params.per_page ?? 20);
+    return this.mapPageResponse<T>(response,params);
-    const where = params.where && typeof params.where === 'object' ? params.where : {};
-    let orderby: string | undefined = params.orderby;
-    let order: 'asc' | 'desc' | undefined = params.orderDir as any;
-    if (!orderby && params.order && typeof params.order === 'object') {
-      const entries = Object.entries(params.order as Record<string, any>);
-      if (entries.length > 0) {
-        const [field, dir] = entries[0];
-        orderby = field;
-        order = String(dir).toLowerCase() === 'desc' ? 'desc' : 'asc';
   }
-    }
+  mapPageResponse<T>(response:any,query: Record<string, any>){
-    // 映射统一入参到平台入参
-    const requestParams = {
-      ...where,
-      ...(params.search ? { search: params.search } : {}),
-      ...(params.status ? { status: params.status } : {}),
-      ...(orderby ? { orderby } : {}),
-      ...(order ? { order } : {}),
-      page,
-      limit
-    };
-    this.logger.debug('ShopYY API请求分页参数:'+ JSON.stringify(requestParams));
-    const response = await this.request(site, endpoint, 'GET', null, requestParams);
     if (response?.code !== 0) {
       throw new Error(response?.msg)
     }
-    
     return {
       items: (response.data.list || []) as T[],
       total: response.data?.paginate?.total || 0,
       totalPages: response.data?.paginate?.pageTotal || 0,
-      page: response.data?.paginate?.current || requestParams.page,
+      page: response.data?.paginate?.current || query.page,
-      per_page: response.data?.paginate?.pagesize || requestParams.limit,
+      per_page: response.data?.paginate?.pagesize || query.limit,
     };
   }
 
@@ -225,13 +206,13 @@ export class ShopyyService {
    * @param pageSize 每页数量
    * @returns 分页产品列表
    */
-  async getProducts(site: any, page: number = 1, pageSize: number = 100): Promise<any> {
+  async getProducts(site: any, page: number = 1, pageSize: number = 100, where: Record<string, any> = {}): Promise<any> {
     // ShopYY API: GET /products
     // 通过 fields 参数指定需要返回的字段,确保 handle 等关键信息被包含
     const response = await this.request(site, 'products', 'GET', null, {
       page,
       page_size: pageSize,
-      fields: 'id,name,sku,handle,status,type,stock_status,stock_quantity,images,regular_price,sale_price,tags,variations'
+      ...where
     });
 
     return {

src/service/site-api.service.ts

@@ -1,4 +1,4 @@
-import { Inject, Provide } from '@midwayjs/core';
+import { ILogger, Inject, Provide } from '@midwayjs/core';
 import { ShopyyAdapter } from '../adapter/shopyy.adapter';
 import { WooCommerceAdapter } from '../adapter/woocommerce.adapter';
 import { ISiteAdapter } from '../interface/site-adapter.interface';
@@ -22,6 +22,9 @@ export class SiteApiService {
   @Inject()
   productService: ProductService;
 
+  @Inject()
+  logger: ILogger;
+
   async getAdapter(siteId: number): Promise<ISiteAdapter> {
     const site = await this.siteService.get(siteId, true);
     if (!site) {
@@ -110,36 +113,25 @@ export class SiteApiService {
     const adapter = await this.getAdapter(siteId);
 
     // 首先尝试查找产品
-    if (product.id) {
+    if (!product.sku) {
-      try {
+      throw new Error('产品SKU不能为空');
-        // 尝试获取产品以确认它是否存在
-        const existingProduct = await adapter.getProduct(product.id);
-        if (existingProduct) {
-          // 产品存在，执行更新
-          return await adapter.updateProduct(product.id, product);
     }
-      } catch (error) {
-        // 如果获取产品失败，可能是因为产品不存在，继续执行创建逻辑
-        console.log(`产品 ${product.id} 不存在，将创建新产品:`, error.message);
-      }
-    } else if (product.sku) {
-      // 如果没有提供ID但提供了SKU，尝试通过SKU查找产品
-      try {
     // 尝试搜索具有相同SKU的产品
-        const searchResult = await adapter.getProducts({ where: { sku: product.sku } });
+    let existingProduct
-        if (searchResult.items && searchResult.items.length > 0) {
+    try {
-          const existingProduct = searchResult.items[0];
-          // 找到现有产品，更新它
-          return await adapter.updateProduct(existingProduct.id, product);
-        }
-      } catch (error) {
-        // 搜索失败，继续执行创建逻辑
-        console.log(`通过SKU搜索产品失败:`, error.message);
-      }
-    }
       
+      existingProduct = await adapter.getProduct({ sku: product.sku });
+    } catch (error) {
+      this.logger.error(`[Site API] 查找产品失败, siteId: ${siteId}, sku: ${product.sku}, 错误信息: ${error.message}`);
+      existingProduct = null
+    }
+    if (existingProduct) {
+      // 找到现有产品，更新它
+      return await adapter.updateProduct({ id: existingProduct.id }, product);
+    }
     // 产品不存在，执行创建
     return await adapter.createProduct(product);
+
   }
 
   /**
@@ -189,17 +181,6 @@ export class SiteApiService {
     return await adapter.getProducts(params);
   }
 
-  /**
-   * 从站点获取单个产品
-   * @param siteId 站点ID
-   * @param productId 产品ID
-   * @returns 站点产品
-   */
-  async getProductFromSite(siteId: number, productId: string | number): Promise<any> {
-    const adapter = await this.getAdapter(siteId);
-    return await adapter.getProduct(productId);
-  }
-
   /**
    * 从站点获取所有产品
    * @param siteId 站点ID

src/service/wp.service.ts

@@ -44,7 +44,7 @@ export class WPService implements IPlatformService {
    * @param site 站点配置
    * @param namespace API 命名空间,默认 wc/v3;订阅推荐 wcs/v1
    */
-  private createApi(site: any, namespace: WooCommerceRestApiVersion = 'wc/v3') {
+  public createApi(site: any, namespace: WooCommerceRestApiVersion = 'wc/v3') {
     return new WooCommerceRestApi({
       url: site.apiUrl,
       consumerKey: site.consumerKey,
@@ -240,9 +240,11 @@ export class WPService implements IPlatformService {
     return allData;
   }
 
-  async getProducts(site: any, page: number = 1, pageSize: number = 100): Promise<any> {
+  async getProducts(site: any, params: Record<string, any> = {}): Promise<any> {
     const api = this.createApi(site, 'wc/v3');
-    return await this.sdkGetPage<WooProduct>(api, 'products', { page, per_page: pageSize });
+    const page = params.page ?? 1;
+    const per_page = params.per_page ?? params.pageSize ?? 100;
+    return await this.sdkGetPage<WooProduct>(api, 'products', { ...params, page, per_page });
   }
 
   async getProduct(site: any, id: number): Promise<any> {
@@ -254,7 +256,7 @@ export class WPService implements IPlatformService {
 
   // 导出 WooCommerce 产品为特殊CSV（平台特性）
   async exportProductsCsvSpecial(site: any, page: number = 1, pageSize: number = 100): Promise<string> {
-    const list = await this.getProducts(site, page, pageSize);
+    const list = await this.getProducts(site, { page, per_page: pageSize });
     const header = ['id','name','type','status','sku','regular_price','sale_price','stock_status','stock_quantity'];
     const rows = (list.items || []).map((p: any) => [p.id,p.name,p.type,p.status,p.sku,p.regular_price,p.sale_price,p.stock_status,p.stock_quantity]);
     const csv = [header.join(','), ...rows.map(r => r.map(v => String(v ?? '')).join(','))].join('\n');

src/transformer/database.transformer.ts

@@ -0,0 +1 @@
+// 从 unified 到 数据库需要有个转换流程

src/transformer/file.transformer.ts

@@ -0,0 +1 @@
+// 文件转换

src/transformer/woocommerce.adpater.ts

@@ -0,0 +1,8 @@
+import { UnifiedOrderDTO } from "../dto/site-api.dto";
+
+export class ShipmentAdapter {
+    // 用于导出物流需要的数据
+    mapFromOrder(order: UnifiedOrderDTO): any {
+        return order;
+    }
+}