diff --git a/src/service/order.service.ts b/src/service/order.service.ts index 7553dfc..1a2d8a3 100644 --- a/src/service/order.service.ts +++ b/src/service/order.service.ts @@ -733,33 +733,24 @@ export class OrderService { if (!orderItem.sku) return; // 从数据库查询产品,关联查询组件 - const productDetail = await this.productService.getComponentDetailFromSiteSku({ sku: orderItem.sku, name: orderItem.name },site); + const componentDetails = await this.productService.getComponentDetailFromSiteSku({ sku: orderItem.sku, name: orderItem.name },orderItem.quantity,site); + if(!componentDetails?.length){ + return + } - if (!productDetail || !productDetail.product || !productDetail.quantity) return; - const { product, quantity } = productDetail - - const componentDetails: { product: Product, quantity: number }[] = product.components?.length > 0 ? await Promise.all(product.components.map(async comp => { - return { - product: await this.productModel.findOne({ - where: { id: comp.productId }, - }), - quantity: comp.quantity * orderItem.quantity, - } - })) : [{ product, quantity }] - - const orderSales: OrderSale[] = componentDetails.map(componentDetail => { - if (!componentDetail.product) return null + const orderSales: OrderSale[] = componentDetails.map(({product, parentProduct, quantity}) => { + if (!product) return null const attrsObj = this.productService.getAttributesObject(product.attributes) const orderSale = plainToClass(OrderSale, { orderId: orderItem.orderId, siteId: orderItem.siteId, externalOrderItemId: orderItem.externalOrderItemId,// 原始 itemId - parentProductId: product.id, // 父产品 ID 用于统计套餐 如果是单品则不记录 - productId: componentDetail.product.id, + parentProductId: parentProduct.id, // 父产品 ID 用于统计套餐 如果是单品则不记录 + productId: product.id, isPackage: product.type === 'bundle',// 这里是否是套餐取决于父产品 - name: componentDetail.product.name, - quantity: componentDetail.quantity * orderItem.quantity, - sku: componentDetail.product.sku, + name: product.name, + quantity: quantity * orderItem.quantity, + sku: product.sku, // 理论上直接存 product 的全部数据才是对的,因为这样我的数据才全面。 brand: attrsObj?.['brand']?.name, version: attrsObj?.['version']?.name, @@ -767,7 +758,7 @@ export class OrderService { flavor: attrsObj?.['flavor']?.name, humidity: attrsObj?.['humidity']?.name, size: attrsObj?.['size']?.name, - category: componentDetail.product.category.name, + category: product.category.name, }); return orderSale }).filter(v => v !== null) diff --git a/src/service/product.service.ts b/src/service/product.service.ts index fef1c8f..362b6ca 100644 --- a/src/service/product.service.ts +++ b/src/service/product.service.ts @@ -1785,17 +1785,31 @@ export class ProductService { // 这里判断 second 是否是数字 return sku.includes('-MX-') || sku.includes('-Mixed-') || /^\d+$/.test(second) && /^\d+$/.test(last) } - async getComponentDetailFromSiteSku(siteProduct: { sku: string, name: string }, site: Site) { + 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 不能为空') } - let product = await this.getProductBySiteSku(siteProduct.sku, site) - - return { - product, - quantity: 1, + const product = await this.getProductBySiteSku(siteProduct.sku, site) + + if (!product) return + + if(!product?.components?.length){ + return [{ + product, + quantity + }] } + + return await Promise.all(product.components.map(async comp => { + return { + product: await this.productModel.findOne({ + where: { id: comp.productId }, + }), + parentProduct: product, // 这里得记录一下他的爸爸用来记录 + quantity: comp.quantity * quantity, + } + })) } // 准备创建产品的 DTO, 处理类型转换和默认值