fix: 修复订单服务中产品属性和组件处理的问题

处理产品属性为空的情况，避免空指针异常
为产品组件查询添加关联关系
在订单销售记录创建时增加对空产品的过滤
添加新的品牌判断逻辑

src/adapter/shopyy.adapter.ts

@@ -367,6 +367,7 @@ export class ShopyyAdapter implements ISiteAdapter {
       date_paid: typeof item.pay_at === 'number'
         ? item.pay_at === 0 ? null : new Date(item.pay_at * 1000).toISOString()
         : null,
+
       refunds: [],
       currency_symbol: (currencySymbols[item.currency] || '$') || '',
       date_created:
@@ -386,7 +387,6 @@ export class ShopyyAdapter implements ISiteAdapter {
         tracking_number: f.tracking_number || '',
         shipping_provider: f.tracking_company || '',
         shipping_method: f.tracking_company || '',
-       
         date_created: typeof f.created_at === 'number'
           ? new Date(f.created_at * 1000).toISOString()
           : f.created_at || '',

src/controller/statistics.controller.ts

@@ -79,7 +79,7 @@ export class StatisticsController {
 
   @ApiOkResponse()
   @Get('/orderSource')
-  async getOrderSource(@Query() params) {
+  async getOrderSorce(@Query() params) {
     try {
       return successResponse(await this.statisticsService.getOrderSorce(params));
     } catch (error) {

src/controller/webhook.controller.ts

@@ -14,8 +14,6 @@ import { SiteService } from '../service/site.service';
 import { OrderService } from '../service/order.service';
 import { SiteApiService } from '../service/site-api.service';
 
-
-
 @Controller('/webhook')
 export class WebhookController {
   private secret = 'YOONE24kd$kjcdjflddd';
@@ -179,15 +177,20 @@ export class WebhookController {
             console.log('Unhandled event:', topic);
         }
 
-          return {
-            code: 200,
-            success: true,
-            message: 'Webhook processed successfully',
-          };
+        return {
+          code: 200,
+          success: true,
+          message: 'Webhook processed successfully',
+        };
+      } else {
+        return {
+          code: 403,
+          success: false,
+          message: 'Webhook verification failed',
+        };
       }
     } catch (error) {
       console.log(error);
     }
   }
-
 }

src/dto/shopyy.dto.ts

@@ -346,7 +346,6 @@ export interface ShopyyOrder {
   financial_status?: number;
   fulfillment_status?: number;
   // 创建与更新时间可能为时间戳
-  date_paid?: number | string;
   created_at?: number | string;
   date_added?: string;
   updated_at?: number | string;

src/dto/site.dto.ts

@@ -121,7 +121,7 @@ export class UpdateSiteDTO {
   skuPrefix?: string;
 
   // 区域
-  @ApiProperty({ description: '区域', required: false })
+  @ApiProperty({ description: '区域' })
   @Rule(RuleType.array().items(RuleType.string()).optional())
   areas?: string[];
 
@@ -133,10 +133,6 @@ export class UpdateSiteDTO {
   @ApiProperty({ description: '站点网站URL', required: false })
   @Rule(RuleType.string().optional())
   websiteUrl?: string;
-
-  @ApiProperty({ description: 'Webhook URL', required: false })
-  @Rule(RuleType.string().optional())
-  webhookUrl?: string;
 }
 
 export class QuerySiteDTO {

src/dto/statistics.dto.ts

@@ -19,10 +19,6 @@ export class OrderStatisticsParams {
   @Rule(RuleType.number().allow(null))
   siteId?: number;
 
-  @ApiProperty()
-  @Rule(RuleType.array().allow(null))
-  country?: any[];
-
   @ApiProperty({
     enum: ['all', 'first_purchase', 'repeat_purchase'],
     default: 'all',

src/service/order.service.ts

@@ -722,14 +722,14 @@ export class OrderService {
       return {
         product: await this.productModel.findOne({
           where: { sku: comp.sku },
-          relations: ['components', 'attributes'],
+          relations: ['components','attributes'],
         }),
         quantity: comp.quantity * orderItem.quantity,
       }
     })) : [{ product, quantity: orderItem.quantity }]
 
     const orderSales: OrderSale[] = componentDetails.map(componentDetail => {
-      if (!componentDetail.product) return null
+      if(!componentDetail.product) return null
       const attrsObj = this.productService.getAttributesObject(product.attributes)
       const orderSale = plainToClass(OrderSale, {
         orderId: orderItem.orderId,
@@ -2639,4 +2639,7 @@ export class OrderService {
       throw new Error(`导出CSV文件失败: ${error.message}`);
     }
   }
+
+
+
 }

src/service/statistics.service.ts

@@ -15,19 +15,8 @@ export class StatisticsService {
   orderItemRepository: Repository<OrderItem>;
 
   async getOrderStatistics(params: OrderStatisticsParams) {
-    const { startDate, endDate, grouping, siteId, country } = params;
+    const { startDate, endDate, grouping, siteId } = params;
     // const keywords = keyword ? keyword.split(' ').filter(Boolean) : [];
-
-    let siteIds = []
-    if (country) {
-      siteIds = await this.getSiteIds(country)
-    }
-
-    if (siteId) {
-      siteIds.push(siteId)
-    }
-
-    
     const start = dayjs(startDate).format('YYYY-MM-DD');
     const end = dayjs(endDate).add(1, 'd').format('YYYY-MM-DD');
     let sql
@@ -65,8 +54,6 @@ export class StatisticsService {
         AND o.status IN('processing','completed')
     `;
       if (siteId) sql += ` AND o.siteId=${siteId}`;
-      if (siteIds.length) sql += ` AND o.siteId IN (${siteIds.join(',')})`;
-      
       sql += `
         GROUP BY o.id, o.date_paid, o.customer_email, o.total, o.source_type, o.siteId, o.utm_source
     ),
@@ -260,10 +247,7 @@ export class StatisticsService {
       LEFT JOIN order_item oi ON o.id = oi.orderId
       WHERE o.date_paid IS NOT NULL
         AND o.date_paid >= '${start}' AND o.date_paid < '${end}'
-        AND o.status IN ('processing','completed')`;
-      if (siteId) sql += ` AND o.siteId=${siteId}`;
-      if (siteIds.length) sql += ` AND o.siteId IN (${siteIds.join(',')})`;
-      sql +=`
+        AND o.status IN ('processing','completed')
       GROUP BY o.id, o.date_paid, o.customer_email, o.total, o.source_type, o.siteId, o.utm_source
     ),
     order_sales_summary AS (
@@ -455,11 +439,7 @@ export class StatisticsService {
       LEFT JOIN first_order f ON o.customer_email = f.customer_email
       LEFT JOIN order_item oi ON o.id = oi.orderId
       WHERE o.date_paid IS NOT NULL
-        AND o.date_paid >= '${start}' AND o.date_paid < '${end}' 
-        `;
-      if (siteId) sql += ` AND o.siteId=${siteId}`;
-      if (siteIds.length) sql += ` AND o.siteId IN (${siteIds.join(',')})`;
-      sql +=`
+        AND o.date_paid >= '${start}' AND o.date_paid < '${end}'
         AND o.status IN ('processing','completed')
       GROUP BY o.id, o.date_paid, o.customer_email, o.total, o.source_type, o.siteId, o.utm_source
     ),
@@ -1334,14 +1314,7 @@ export class StatisticsService {
   }
 
   async getOrderSorce(params) {
-    const { country } = params;
-
-    let siteIds = []
-    if (country) {
-      siteIds = await this.getSiteIds(country)
-    }
-
-      let sql = `
+    const sql = `
       WITH cutoff_months AS (
         SELECT 
           DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 7 MONTH), '%Y-%m') AS start_month,
@@ -1353,10 +1326,7 @@ export class StatisticsService {
           DATE_FORMAT(MIN(date_paid), '%Y-%m') AS first_order_month,
           SUM(total) AS first_order_total
         FROM \`order\`
-        WHERE status IN ('processing', 'completed')`;
-      if (siteIds.length!=0) sql += ` AND siteId IN ('${siteIds.join("','")}')`;
-        else sql += ` AND siteId IS NULL `;
-        sql += `
+        WHERE status IN ('processing', 'completed')
         GROUP BY customer_email
       ),
       order_months AS (
@@ -1364,10 +1334,7 @@ export class StatisticsService {
           customer_email,
           DATE_FORMAT(date_paid, '%Y-%m') AS order_month
         FROM \`order\`
-        WHERE status IN ('processing', 'completed')`;
-      if (siteIds.length!=0) sql += ` AND siteId IN ('${siteIds.join("','")}')`;
-        else sql += ` AND siteId IS NULL `;
-        sql += `
+        WHERE status IN ('processing', 'completed')
       ),
       filtered_orders AS (
         SELECT o.customer_email, o.order_month, u.first_order_month,u.first_order_total, c.start_month
@@ -1399,7 +1366,7 @@ export class StatisticsService {
       ORDER BY order_month DESC, first_order_month_group
     `
 
-    let inactiveSql = `
+    const inactiveSql = `
       WITH
       cutoff_months AS (
         SELECT 
@@ -1414,10 +1381,7 @@ export class StatisticsService {
          date_paid,
            total
         FROM \`order\`
-        WHERE status IN ('processing', 'completed')`;
-      if (siteIds.length!=0) inactiveSql += ` AND siteId IN ('${siteIds.join("','")}')`;
-        else inactiveSql += ` AND siteId IS NULL `;
-        inactiveSql += `
+        WHERE status IN ('processing', 'completed')
       ),
 
       filtered_users AS (
@@ -1560,13 +1524,4 @@ export class StatisticsService {
 
   }
 
-  async getSiteIds(country: any[]) {
-    const sql = `
-      SELECT DISTINCT sa.siteId as site_id FROM area a left join site_areas_area sa on a.id = sa.areaId WHERE a.code IN ('${country.join("','")}')
-    `
-    const res = await this.orderRepository.query(sql)
-    return res.map(item => item.site_id)
-  }
-
-
 }