From d8a34220155fe3b0e4371245bb7c5defc4c90417 Mon Sep 17 00:00:00 2001
From: tikkhun <tikkhun@163.com>
Date: Wed, 28 Jan 2026 18:58:52 +0800
Subject: [PATCH] =?UTF-8?q?fix(product):=20=E4=BF=AE=E5=A4=8D=E4=BA=A7?=
 =?UTF-8?q?=E5=93=81=E5=B1=9E=E6=80=A7=E9=87=8D=E5=A4=8D=E6=A3=80=E6=9F=A5?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E5=B9=B6=E6=B7=BB=E5=8A=A0=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复产品属性重复检查时未考虑属性数量的问题，确保只有当属性数量完全匹配时才认为重复
添加导入结果的调试日志记录
---
 src/service/product.service.ts | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/service/product.service.ts b/src/service/product.service.ts
index 362b6ca..47b9aa2 100644
--- a/src/service/product.service.ts
+++ b/src/service/product.service.ts
@@ -1,4 +1,4 @@
-import { Inject, Provide } from '@midwayjs/core';
+import { ILogger, Inject, Logger, Provide } from '@midwayjs/core';
 import { Context } from '@midwayjs/koa';
 import { InjectEntityModel } from '@midwayjs/typeorm';
 import * as fs from 'fs';
@@ -38,6 +38,9 @@ import { Site } from '../entity/site.entity';
 
 @Provide()
 export class ProductService {
+  @Logger()
+  logger: ILogger; // 注入 Logger 实例
+
   @Inject()
   ctx: Context;
 
@@ -856,7 +859,7 @@ export class ProductService {
     // 检查完全相同属性组合是否已存在(避免重复)
     // 仅当产品类型为 'single' 且有属性时才检查重复
     if (type === 'single' && resolvedAttributes.length > 0) {
-      const qb = this.productModel.createQueryBuilder('product');
+      const qb = this.productModel.createQueryBuilder('product')
       resolvedAttributes.forEach((attr, index) => {
         qb.innerJoin(
           'product.attributes',
@@ -865,8 +868,12 @@ export class ProductService {
           { [`attrId${index}`]: attr.id }
         );
       });
+      // 添加属性数量的判断，确保产品的属性数量与指定的属性数量相同
+      qb.andWhere('(SELECT COUNT(*) FROM product_attributes_dict_item pad WHERE pad.productId = product.id) = :attrCount', {
+        attrCount: resolvedAttributes.length
+      });
       const isExist = await qb.getOne();
-      if (isExist) throw new Error('相同产品属性的产品已存在');
+      if (isExist) throw new Error(`相同产品属性的产品已存在,sku 为${isExist?.sku}`);
     }
 
     // 创建新产品实例(绑定属性与基础字段)
@@ -1778,19 +1785,13 @@ export class ProductService {
       attributes: attributes.length > 0 ? attributes : undefined,
     }
   }
-  isMixedSku(sku: string) {
-    const splitSKu = sku.split('-')
-    const last = splitSKu[splitSKu.length - 1]
-    const second = splitSKu[splitSKu.length - 2]
-    // 这里判断 second 是否是数字
-    return sku.includes('-MX-') || sku.includes('-Mixed-') || /^\d+$/.test(second) && /^\d+$/.test(last)
-  }
+  // 获取库存单品列表
   async getComponentDetailFromSiteSku(siteProduct: { sku: string, name: string }, quantity: number = 1, site: Site): Promise<{ product: Product,parentProduct?: Product, quantity: number }[]>  {
     if (!siteProduct.sku) {
       throw new Error('siteSku 不能为空')
     }
 
-    const  product = await this.getProductBySiteSku(siteProduct.sku, site)
+    const product = await this.getProductBySiteSku(siteProduct.sku, site)
 
     if (!product) return
 
@@ -2074,7 +2075,7 @@ export class ProductService {
         errors.push({ identifier: '' + rec.sku, error: `产品${rec?.sku}导入失败:${e?.message || String(e)}` });
       }
     }
-
+    this.logger.debug(`导入 ${records.length} 条记录,成功创建 ${created} 条,更新 ${updated} 条,失败 ${errors.length} 条,错误详情:${JSON.stringify(errors)}`);
     return { total: records.length, processed: records.length - errors.length, created, updated, errors };
   }