From 176e0c0f978e35f48f10fe12ce799aacb6e52fb9 Mon Sep 17 00:00:00 2001 From: liufumingren Date: Sat, 7 Nov 2026 21:38:03 +0800 Subject: [PATCH] =?UTF-8?q?fix(order):=20=E6=98=8E=E7=BB=86=E8=A7=A3?= =?UTF-8?q?=E6=9E=90=E5=8F=AA=E8=AE=A4=E6=9C=AC=E5=8D=95=E5=BA=97=E9=93=BA?= =?UTF-8?q?=EF=BC=8C=E9=98=B2=E8=B7=A8=E5=BA=97=E9=93=BA=E4=B8=B2=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 线上出现「订单明细绑到了别家店铺的商品」:旧解析接口(`POST /api/order-items/{id}/parse` 与 `POST /api/orders/{id}/parse-items`)匹配店铺商品时只按 `principal_id + 平台商品ID + 规格ID` 查,同一个平台商品被多个店铺采集时(同款分销、多店铺同源)会命中别家店铺的行, 把别家的规格与绑定关系套到本单上,出库会发错货。 - 新增 lib/shopProductMatch.shopProductScope:匹配条件的唯一口径 —— 有店铺信息时只认本店铺, 只有无店铺信息的手工明细才退回主体范围;拉单(externalPrintOrder)与重解析共用它 - 解析逻辑下沉到 service/orderItemParse(`findShopProduct` / `isStaleShopProduct` / `resolveItem` / `parseOrderItems`)。原来 order.js 里用的 `ctx.controller.orderItem` 在 Egg 里并不存在(controller 只挂到 app.controller),该接口一直是 500 - 失效关联自愈:明细指向别家店铺或已被删除的店铺商品时,重解析会连带清空 product_id/combo_product_id/item_type,不再沿用错误的系统商品;批量解析不再跳过这类脏数据 - 单测补 shopProductScope 4 例(本店铺 / 手工退回主体 / 空规格 / 缺商品ID) 实测(真实库,插入即回滚):shop 18 有、shop 19 没有时解析结果 shop_product_id=null、 product_id 同时被清空;补上 shop 19 的商品后命中 shop_product_id=1077、parse_status=1。 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- backend/app/controller/order.js | 19 +-- backend/app/controller/orderItem.js | 59 +------- backend/app/lib/shopProductMatch.js | 26 +++- backend/app/service/externalPrintOrder.js | 10 +- backend/app/service/orderItemParse.js | 126 ++++++++++++++++++ backend/test/app/lib/shopProductMatch.test.js | 30 ++++- 6 files changed, 188 insertions(+), 82 deletions(-) create mode 100644 backend/app/service/orderItemParse.js diff --git a/backend/app/controller/order.js b/backend/app/controller/order.js index 3440272..83bb982 100644 --- a/backend/app/controller/order.js +++ b/backend/app/controller/order.js @@ -174,23 +174,8 @@ class OrderController extends Controller { return; } - const items = await ctx.model.OrderItem.findAll({ where: { order_id: order.id } }); - let resolved = 0; - let failed = 0; - - for (const item of items) { - if (Number(item.parse_status) === 1) continue; - const data = await ctx.controller.orderItem.resolveItem(item, order.principal_id); - await item.update(data); - if (data.parse_status === 1) resolved++; - else failed++; - } - - ctx.body = { - code: 0, - message: 'success', - data: { total: items.length, resolved, failed }, - }; + const result = await ctx.service.orderItemParse.parseOrderItems(order); + ctx.body = { code: 0, message: 'success', data: result }; } /** diff --git a/backend/app/controller/orderItem.js b/backend/app/controller/orderItem.js index 1a8c0ee..a733bb7 100644 --- a/backend/app/controller/orderItem.js +++ b/backend/app/controller/orderItem.js @@ -144,8 +144,8 @@ class OrderItemController extends Controller { /** * @summary 解析明细商品 - * @description 按商家编码(sku_code)匹配系统商品/组合商品,再按平台商品ID匹配店铺商品已绑定的商品; - * 命中则回填 product_id/combo_product_id 并置为已解析,未命中置为解析失败 + * @description 按商家编码(sku_code)匹配系统商品/组合商品,再按平台商品ID + 规格ID匹配**本单店铺**已绑定的商品; + * 命中则回填 product_id/combo_product_id 并置为已解析,未命中置为解析失败(并清掉失效的店铺商品关联) * @router post /api/order-items/{id}/parse * @apikey * @request path integer *id 明细主键ID @@ -161,7 +161,7 @@ class OrderItemController extends Controller { return; } - const resolved = await this.resolveItem(item, ctx.state.principalId || item.principal_id); + const resolved = await ctx.service.orderItemParse.resolveItem(item, ctx.state.principalId || item.principal_id); await item.update(resolved); ctx.body = { @@ -192,59 +192,6 @@ class OrderItemController extends Controller { await item.destroy(); ctx.body = { code: 0, message: 'success', data: { id: Number(ctx.params.id) } }; } - - /** - * 解析单条明细,返回需要更新的字段 - * 匹配顺序:商家编码 → 系统商品 → 组合商品 → 平台商品ID → 店铺商品已绑定商品 - * @param {Object} item 明显示例 - * @param {Number} principalId 主体ID - * @return {Promise} 待更新字段 - */ - async resolveItem(item, principalId) { - const { ctx } = this; - const code = item.sku_code; - - if (code) { - const product = await ctx.model.Product.findOne({ where: { principal_id: principalId, item_code: code } }); - if (product) { - return { item_type: 1, product_id: product.id, combo_product_id: null, parse_status: 1, parse_msg: null }; - } - - const combo = await ctx.model.ComboProduct.findOne({ where: { principal_id: principalId, code } }); - if (combo) { - return { item_type: 2, product_id: null, combo_product_id: combo.id, parse_status: 1, parse_msg: null }; - } - } - - if (item.outer_item_id) { - const where = { principal_id: principalId, outer_item_id: item.outer_item_id }; - if (item.outer_sku_id) where.outer_sku_id = item.outer_sku_id; - - const shopProduct = await ctx.model.ShopProduct.findOne({ where }); - if (shopProduct && Number(shopProduct.bind_type) === 1 && shopProduct.product_id) { - return { - item_type: 1, - product_id: shopProduct.product_id, - combo_product_id: null, - shop_product_id: shopProduct.id, - parse_status: 1, - parse_msg: null, - }; - } - if (shopProduct && Number(shopProduct.bind_type) === 2 && shopProduct.combo_product_id) { - return { - item_type: 2, - product_id: null, - combo_product_id: shopProduct.combo_product_id, - shop_product_id: shopProduct.id, - parse_status: 1, - parse_msg: null, - }; - } - } - - return { parse_status: 2, parse_msg: '未匹配到系统商品或组合商品' }; - } } module.exports = OrderItemController; diff --git a/backend/app/lib/shopProductMatch.js b/backend/app/lib/shopProductMatch.js index c1a28bd..4e896c3 100644 --- a/backend/app/lib/shopProductMatch.js +++ b/backend/app/lib/shopProductMatch.js @@ -40,4 +40,28 @@ function createShopProductMatcher(rows) { }; } -module.exports = { createShopProductMatcher }; +/** + * 明细匹配店铺商品时的查询条件 + * + * 有店铺信息时**只认本店铺**:同一个平台商品可能被多个店铺采集(同款分销、多店铺同源), + * 按主体范围查会命中别家店铺的规格行,把别家的规格/绑定关系套到本单上(发错货)。 + * 只有没有店铺信息的明细(手工录入)才退回主体范围。 + * @param {{outer_item_id?:string, outer_sku_id?:string}} line 订单明细 + * @param {{shopId?:number|string, principalId?:number|string}} scope 归属范围 + * @return {Object|null} Sequelize where 条件,缺少平台商品ID时返回 null + */ +function shopProductScope(line, scope = {}) { + const itemId = String((line && line.outer_item_id) || '').trim(); + if (!itemId) return null; + + const where = { outer_item_id: itemId }; + const skuId = String((line && line.outer_sku_id) || '').trim(); + if (skuId) where.outer_sku_id = skuId; + + const shopId = scope.shopId; + if (shopId != null && shopId !== '') where.shop_id = Number(shopId); + else if (scope.principalId != null && scope.principalId !== '') where.principal_id = Number(scope.principalId); + return where; +} + +module.exports = { createShopProductMatcher, shopProductScope }; diff --git a/backend/app/service/externalPrintOrder.js b/backend/app/service/externalPrintOrder.js index 9d188e6..84c8e97 100644 --- a/backend/app/service/externalPrintOrder.js +++ b/backend/app/service/externalPrintOrder.js @@ -2,6 +2,7 @@ const Service = require('egg').Service; const { createPrintPlatformService, hasPrintPlatformService } = require('../lib/printPlatform'); +const { shopProductScope } = require('../lib/shopProductMatch'); const { ORDER_STATUS } = require('../lib/orderStatus'); const { buildSnapshot } = require('../lib/orderItemExpand'); @@ -876,13 +877,8 @@ class ExternalPrintOrderService extends Service { */ async matchShopProduct(shop, line) { const { ctx } = this; - const outerItemId = String(line.outer_item_id || '').trim(); - if (!outerItemId) return null; - - const where = { shop_id: shop.id, outer_item_id: outerItemId }; - const outerSkuId = String(line.outer_sku_id || '').trim(); - if (outerSkuId) where.outer_sku_id = outerSkuId; - + const where = shopProductScope(line, { shopId: shop.id, principalId: shop.principal_id }); + if (!where) return null; return ctx.model.ShopProduct.findOne({ where }); } diff --git a/backend/app/service/orderItemParse.js b/backend/app/service/orderItemParse.js new file mode 100644 index 0000000..11a6587 --- /dev/null +++ b/backend/app/service/orderItemParse.js @@ -0,0 +1,126 @@ +'use strict'; + +const { Service } = require('egg'); +const { shopProductScope } = require('../lib/shopProductMatch'); + +/** + * 订单明细解析服务(商家编码 / 店铺商品 → 系统商品 / 组合商品) + * + * 与拉单时的匹配口径保持一致:平台商品ID + 平台规格ID 只认**本单店铺**的店铺商品, + * 同一平台商品被多个店铺采集时不会串到别家的规格/绑定关系上。 + * + * 放在 service 里而不是 controller:订单(`POST /api/orders/{id}/parse-items`)与 + * 明细(`POST /api/order-items/{id}/parse`)两条入口共用同一套逻辑。 + */ +class OrderItemParseService extends Service { + /** + * 按平台商品ID/规格ID命中本单店铺的店铺商品 + * 历史上这里只按 principal_id 查,同一个平台商品被多个店铺采集时会命中别家店铺的行, + * 把别家的规格/绑定关系套到本单上;现在只认本单店铺(无店铺信息的手工明细才退到主体范围)。 + * @param {Object} item 明细 + * @param {Number} principalId 主体ID + * @return {Promise} 店铺商品 + */ + async findShopProduct(item, principalId) { + const { ctx } = this; + const where = shopProductScope(item, { shopId: item.shop_id, principalId }); + if (!where) return null; + return ctx.model.ShopProduct.findOne({ where }); + } + + /** + * 明细当前关联的店铺商品是否已失效:属于别的店铺(历史跨店铺匹配留下的脏数据)或已被删除 + * @param {Object} item 明细 + * @return {Promise} 是否失效 + */ + async isStaleShopProduct(item) { + const { ctx } = this; + if (item.shop_product_id == null) return false; + const row = await ctx.model.ShopProduct.findByPk(item.shop_product_id, { + attributes: [ 'id', 'shop_id' ], + raw: true, + }); + if (!row) return true; + return item.shop_id != null && Number(row.shop_id) !== Number(item.shop_id); + } + + /** + * 解析单条明细,返回需要更新的字段 + * 匹配顺序:商家编码 → 系统商品 → 组合商品 → 平台商品ID + 规格ID → 本店铺店铺商品已绑定的商品 + * @param {Object} item 明细 + * @param {Number} principalId 主体ID + * @return {Promise} 待更新字段 + */ + async resolveItem(item, principalId) { + const { ctx } = this; + const code = item.sku_code; + + if (code) { + const product = await ctx.model.Product.findOne({ where: { principal_id: principalId, item_code: code } }); + if (product) { + return { item_type: 1, product_id: product.id, combo_product_id: null, parse_status: 1, parse_msg: null }; + } + + const combo = await ctx.model.ComboProduct.findOne({ where: { principal_id: principalId, code } }); + if (combo) { + return { item_type: 2, product_id: null, combo_product_id: combo.id, parse_status: 1, parse_msg: null }; + } + } + + const shopProduct = await this.findShopProduct(item, principalId); + if (shopProduct && Number(shopProduct.bind_type) === 1 && shopProduct.product_id) { + return { + item_type: 1, + product_id: shopProduct.product_id, + combo_product_id: null, + shop_product_id: shopProduct.id, + parse_status: 1, + parse_msg: null, + }; + } + if (shopProduct && Number(shopProduct.bind_type) === 2 && shopProduct.combo_product_id) { + return { + item_type: 2, + product_id: null, + combo_product_id: shopProduct.combo_product_id, + shop_product_id: shopProduct.id, + parse_status: 1, + parse_msg: null, + }; + } + + // 没命中:清掉失效的店铺商品关联;若原本就是靠别的店铺的商品解析出来的, + // 连同商品关联一起清空,避免继续沿用错误的系统商品 + const reset = { shop_product_id: null }; + if (await this.isStaleShopProduct(item)) { + Object.assign(reset, { product_id: null, combo_product_id: null, item_type: 0 }); + } + return { ...reset, parse_status: 2, parse_msg: '未匹配到系统商品或组合商品' }; + } + + /** + * 批量解析某订单下未解析 / 解析失败的明细 + * 已解析的跳过,但关联到别家店铺或已删除店铺商品的脏数据会重新解析(历史跨店铺匹配遗留) + * @param {Object} order 订单实例 + * @return {Promise<{total: number, resolved: number, failed: number}>} 解析统计 + */ + async parseOrderItems(order) { + const { ctx } = this; + const items = await ctx.model.OrderItem.findAll({ where: { order_id: order.id } }); + let resolved = 0; + let failed = 0; + + for (const item of items) { + const stale = await this.isStaleShopProduct(item); + if (Number(item.parse_status) === 1 && !stale) continue; + const data = await this.resolveItem(item, order.principal_id); + await item.update(data); + if (data.parse_status === 1) resolved++; + else failed++; + } + + return { total: items.length, resolved, failed }; + } +} + +module.exports = OrderItemParseService; diff --git a/backend/test/app/lib/shopProductMatch.test.js b/backend/test/app/lib/shopProductMatch.test.js index f30d4aa..782b2ca 100644 --- a/backend/test/app/lib/shopProductMatch.test.js +++ b/backend/test/app/lib/shopProductMatch.test.js @@ -1,7 +1,7 @@ 'use strict'; const { assert } = require('egg-mock/bootstrap'); -const { createShopProductMatcher } = require('../../../app/lib/shopProductMatch'); +const { createShopProductMatcher, shopProductScope } = require('../../../app/lib/shopProductMatch'); describe('app/lib/shopProductMatch 店铺商品匹配口径', () => { const rows = [ @@ -35,4 +35,32 @@ describe('app/lib/shopProductMatch 店铺商品匹配口径', () => { assert.strictEqual(pick(null), null); assert.strictEqual(createShopProductMatcher([])({ outer_item_id: '1' }), null); }); + + describe('shopProductScope 查询口径', () => { + it('有店铺信息时只认本店铺,不带主体条件', () => { + assert.deepStrictEqual( + shopProductScope({ outer_item_id: '3773823319627923739', outer_sku_id: '3548726733104642' }, { shopId: 19, principalId: 5 }), + { outer_item_id: '3773823319627923739', outer_sku_id: '3548726733104642', shop_id: 19 } + ); + }); + + it('没有店铺信息(手工明细)才退回主体范围', () => { + assert.deepStrictEqual( + shopProductScope({ outer_item_id: '881526926136' }, { principalId: 5 }), + { outer_item_id: '881526926136', principal_id: 5 } + ); + }); + + it('明细没有规格ID时按商品ID匹配,空规格不写入条件', () => { + assert.deepStrictEqual( + shopProductScope({ outer_item_id: '881526926136', outer_sku_id: ' ' }, { shopId: '19' }), + { outer_item_id: '881526926136', shop_id: 19 } + ); + }); + + it('没有平台商品ID时返回 null(不能按空条件乱查)', () => { + assert.strictEqual(shopProductScope({ outer_sku_id: '1' }, { shopId: 19 }), null); + assert.strictEqual(shopProductScope(null, { shopId: 19 }), null); + }); + }); });