fix: 将origin_id类型从number改为string并重构客户创建逻辑

修改customer.dto.ts中的origin_id类型为string，以保持数据类型一致性
重构customer.service.ts中的客户数据映射逻辑，移除冗余的origin_id转换
在order.service.ts中使用customerService处理客户创建，替代直接操作model

src/adapter/shopyy.adapter.ts

@@ -132,7 +132,7 @@ export class ShopyyAdapter implements ISiteAdapter {
     };
   }
 
-  shopyyOrderAutoNextStatusMap = {//订单状态 100 未完成；110 待处理；180 已完成（确认收货）; 190 取消；
+  shopyyOrderStatusMap = {//订单状态 100 未完成；110 待处理；180 已完成（确认收货）; 190 取消；
     [100]: OrderStatus.PENDING, // 100 未完成 转为 pending
     [110]: OrderStatus.PROCESSING, // 110 待处理 转为 processing
     [180]: OrderStatus.COMPLETED, // 180 已完成（确认收货） 转为 completed
@@ -244,13 +244,13 @@ export class ShopyyAdapter implements ISiteAdapter {
        'SGD': 'S$'
        // 可以根据需要添加更多货币代码和符号
      };
-       const originStatus = item.status;
-       item.status =   this.shopyyOrderAutoNextStatusMap[originStatus];
+    // 映射订单状态,如果不存在则默认 pending
+    const status =  this.shopyyOrderStatusMap[item.status?? item.order_status] || OrderStatus.PENDING;
     
     return {
       id: item.id || item.order_id,
       number: item.order_number || item.order_sn,
-      status: String(item.status || item.order_status),
+      status,
       currency: item.currency_code || item.currency,
       total: String(item.total_price ?? item.total_amount ?? ''),
       customer_id: item.customer_id || item.user_id,
@@ -427,15 +427,37 @@ export class ShopyyAdapter implements ISiteAdapter {
   ): Promise<any> {
     return await this.shopyyService.batchProcessProducts(this.site, data);
   }
+  mapUnifiedOrderQueryToShopyyQuery(params:UnifiedSearchParamsDTO ){
+    const {where={} as any, ...restParams} = params|| {}
+    const statusMap = {
+      'pending': '100', // 100 未完成
+      'processing': '110', // 110 待处理
+      'completed': "180", // 180 已完成（确认收货） 
+      'cancelled': '190', // 190 取消
+    }
+    const normalizedParams:any=  {
+            ...restParams,
+    }
+    if(where){
+      normalizedParams.where = {
+        ...where,
+      }
+      if(where.status){
+        normalizedParams.where.status = statusMap[where.status];
+      }
+    }
+    return normalizedParams
+  }
 
   async getOrders(
     params: UnifiedSearchParamsDTO
   ): Promise<UnifiedPaginationDTO<UnifiedOrderDTO>> {
+    const normalizedParams = this.mapUnifiedOrderQueryToShopyyQuery(params);
     const { items, total, totalPages, page, per_page } =
       await this.shopyyService.fetchResourcePaged<any>(
         this.site,
         'orders',
-        params
+        normalizedParams
       );
     return {
       items: items.map(this.mapOrder.bind(this)),

src/adapter/woocommerce.adapter.ts

@@ -481,6 +481,7 @@ export class WooCommerceAdapter implements ISiteAdapter {
         ...li,
         productId: li.product_id,
       })),
+      customer_ip_address: item.customer_ip_address ?? '',
       date_paid: item.date_paid ?? '',
       utm_source: item?.meta_data?.find(el => el.key === '_wc_order_attribution_utm_source')?.value || '',
       device_type: item?.meta_data?.find(el => el.key === '_wc_order_attribution_device_type')?.value || '',

src/controller/site-api.controller.ts

@@ -663,8 +663,7 @@ export class SiteApiController {
     this.logger.info(`[Site API] 获取订单列表开始, siteId: ${siteId}, query: ${JSON.stringify(query)}`);
     try {
       const adapter = await this.siteApiService.getAdapter(siteId);
-      const where = { ...(query.where || {}) };
-      const data = await adapter.getOrders({ ...query, where });
+      const data = await adapter.getOrders(query);
       this.logger.info(`[Site API] 获取订单列表成功, siteId: ${siteId}, 共获取到 ${data.total} 个订单`);
       return successResponse(data);
     } catch (error) {

src/controller/webhook.controller.ts

@@ -38,12 +38,14 @@ export class WebhookController {
     return 'webhook';
   }
 
+  // TODO 这里得检查一下是否对 SHOPYY有效,否则得另外书写
   @Post('/woocommerce')
   async handleWooWebhook(
     @Body() body: any,
     @Query('siteId') siteIdStr: string,
     @Headers() header: any
   ) {
+    console.log(`webhook woocommerce`,  siteIdStr, body,header)
     const signature = header['x-wc-webhook-signature'];
     const topic = header['x-wc-webhook-topic'];
     const source = header['x-wc-webhook-source'];

src/dto/customer.dto.ts

@@ -73,7 +73,7 @@ export class CreateCustomerDTO {
   site_id: number;
 
   @ApiProperty({ description: '原始ID', required: false })
-  origin_id?: number;
+  origin_id?: string;
 
   @ApiProperty({ description: '邮箱' })
   email: string;

src/dto/site-api.dto.ts

@@ -2,7 +2,9 @@ import { ApiProperty } from '@midwayjs/swagger';
 import {
   UnifiedPaginationDTO,
 } from './api.dto';
-
+// export class UnifiedOrderWhere{
+//   []
+// }
 export class UnifiedTagDTO {
   // 标签DTO用于承载统一标签数据
   @ApiProperty({ description: '标签ID' })

src/service/customer.service.ts

@@ -39,7 +39,7 @@ export class CustomerService {
       site_id: siteId, // 使用站点ID而不是客户ID
       site_created_at: this.parseDate(siteCustomer.date_created),
       site_updated_at: this.parseDate(siteCustomer.date_modified),
-      origin_id: Number(siteCustomer.id),
+      origin_id: String(siteCustomer.id),
       email: siteCustomer.email,
       first_name: siteCustomer.first_name,
       last_name: siteCustomer.last_name,
@@ -171,10 +171,7 @@ export class CustomerService {
       // 第二步：将站点客户数据转换为客户实体数据
       const customersData = siteCustomers.map(siteCustomer => {
         return this.mapSiteCustomerToCustomer(siteCustomer, siteId);
-      }).map(customer => ({
-        ...customer,
-        origin_id: String(customer.origin_id),
-      }));
+      })
 
       // 第三步：批量upsert客户数据
       const upsertResult = await this.upsertManyCustomers(customersData);

src/service/order.service.ts

@@ -1,4 +1,4 @@
-import { Inject, Provide } from '@midwayjs/core';
+import { Inject, Logger, Provide } from '@midwayjs/core';
 import { WPService } from './wp.service';
 import { Order } from '../entity/order.entity';
 import { In, Like, Repository } from 'typeorm';
@@ -37,6 +37,7 @@ import * as fs from 'fs';
 import * as path from 'path';
 import * as os from 'os';
 import { UnifiedOrderDTO } from '../dto/site-api.dto';
+import { CustomerService } from './customer.service';
 @Provide()
 export class OrderService {
 
@@ -100,6 +101,12 @@ export class OrderService {
   @Inject()
   siteApiService: SiteApiService;
 
+  @Inject()
+  customerService: CustomerService;
+
+  @Logger()
+  logger; // 注入 Logger 实例
+  
   async syncOrders(siteId: number, params: Record<string, any> = {}): Promise<SyncOperationResult> {
     // 调用 WooCommerce API 获取订单
     const result = await (await this.siteApiService.getAdapter(siteId)).getAllOrders(params);
@@ -144,7 +151,7 @@ export class OrderService {
         syncResult.processed++;
       }
     }
-
+    this.logger.debug('syncOrders result', syncResult)
     return syncResult;
   }
 
@@ -202,7 +209,7 @@ export class OrderService {
 
   // 由于 wordpress 订单状态和 我们的订单状态 不一致,需要做转换
   async autoUpdateOrderStatus(siteId: number, order: any) {
-    console.log('更新订单状态', order.status, '=>', this.orderAutoNextStatusMap[order.status])
+    // console.log('更新订单状态', order.status, '=>', this.orderAutoNextStatusMap[order.status])
     // 其他状态保持不变
     const originStatus = order.status;
     // 如果有值就赋值
@@ -286,7 +293,7 @@ export class OrderService {
       externalOrderId,
       coupon_lines,
     });
-     console.log('同步进单个订单2')
+    //  console.log('同步进单个订单2')
     await this.saveOrderShipping({
       siteId,
       orderId,
@@ -340,16 +347,33 @@ export class OrderService {
       return entity;
     }
     entity.orderStatus = this.mapOrderStatus(entity.status);
-    const customer = await this.customerModel.findOne({
-      where: { email: order.customer_email },
-    });
-    if (!customer) {
-      await this.customerModel.save({
+    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 },
+    // });
+    // if (!customer) {
+    //   // 这里用 customer create
+    //   await this.customerModel.save({
+    //     email: order.customer_email,
+    //     site_id: siteId,
+    //     origin_id: String(order.customer_id),
+    //     billing: order.billing,
+    //     shipping: order.shipping,
+    //     phone: order?.billing?.phone || order?.shipping?.phone,
+    //   });
+    // }
     return await this.orderModel.save(entity);
   }
 
@@ -394,7 +418,7 @@ export class OrderService {
     externalOrderId: string;
     orderItems: Record<string, any>[];
   }) {
-    console.log('saveOrderItems params',params)
+    // console.log('saveOrderItems params',params)
     const { siteId, orderId, externalOrderId, orderItems } = params;
     const currentOrderItems = await this.orderItemModel.find({
       where: { siteId, externalOrderId: externalOrderId },

src/service/shopyy.service.ts

@@ -1,4 +1,4 @@
-import { Inject, Provide } from '@midwayjs/core';
+import { ILogger, Inject, Provide } from '@midwayjs/core';
 import axios, { AxiosRequestConfig } from 'axios';
 import * as fs from 'fs';
 import * as FormData from 'form-data';
@@ -13,6 +13,8 @@ import { UnifiedSearchParamsDTO } from '../dto/api.dto';
  */
 @Provide()
 export class ShopyyService {
+  @Inject()
+  logger:ILogger;
   /**
    * 获取ShopYY评论列表
    * @param site 站点配置
@@ -201,10 +203,12 @@ export class ShopyyService {
       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,

src/service/site.service.ts

@@ -47,7 +47,8 @@ export class SiteService {
     }
 
     // 使用 save 方法保存实体及其关联关系
-    await this.siteModel.save(newSite);
+    const result = await this.siteModel.save(newSite);
+    console.log('result create siteId',result)
     return true;
   }