forked from yoone/API
1
0
Fork 0

refactor(product): 重构获取组件详情逻辑并支持数量参数

将获取组件详情的逻辑从order.service.ts移到product.service.ts中统一处理
新增quantity参数支持组件数量计算
返回结果中增加parentProduct信息用于追踪父产品
This commit is contained in:
tikkhun 2026-01-27 18:53:54 +08:00 committed by zhuotianyuan
parent 12ebad6570
commit fe30fabf08
2 changed files with 26 additions and 21 deletions

View File

@ -733,22 +733,13 @@ 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,

View File

@ -1792,17 +1792,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, 处理类型转换和默认值