From 29b39a7add8df1444793a559acca779ad4e19832 Mon Sep 17 00:00:00 2001 From: liufumingren Date: Fri, 9 Oct 2026 00:39:03 +0800 Subject: [PATCH] =?UTF-8?q?fix(order):=20=E4=BA=8C=E6=AC=A1=E8=BD=AC=20B2B?= =?UTF-8?q?=20=E6=81=A2=E5=A4=8D=E8=BD=AF=E5=88=A0=E9=99=A4=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E8=A1=8C=E5=B9=B6=E9=87=8D=E7=BD=AE=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 场景:转 B2B → 取消(明细软删除)→ 再转 B2B。原 findOrCreate 命中 软删除行后直接返回,明细行保持 deleted_at 非空(B2B 明细查询不到), 二次转后订单是 B2B 但无有效作业明细 - 修复:convertOrdersToB2b 明细写入改为 findOne(paranoid:false) + 显式分支—— 存在历史行(含软删)时恢复同一行并重置作业字段(deleted_at=null、 total_box_count=0、pickup_plate_number=null、prep_remark=null、 prep_duration_seconds=0、is_picked_up=N、picked_up_at=null、is_print=N、 更新仓库/货主/发货单号快照,update 带 paranoid:false);不存在才 create - 验证:临时集成测试转→取消→再转 1/1 PASS(二次转成功、恢复同一行、 deleted_at 清空、作业字段重置、订单 is_b2b=Y,测后还原);ESLint 0 error --- app/service/systems/order_b2b.js | 43 ++++++++++++++++++++++++-------- 1 file changed, 32 insertions(+), 11 deletions(-) diff --git a/app/service/systems/order_b2b.js b/app/service/systems/order_b2b.js index 4c782b2..0c30060 100644 --- a/app/service/systems/order_b2b.js +++ b/app/service/systems/order_b2b.js @@ -112,21 +112,42 @@ class OrderB2bService extends Service { } ); - // 写入 B2B 作业明细(uk_order_id 唯一,已存在时跳过不覆盖) + // 写入 B2B 作业明细(uk_order_id 唯一): + // 首次转换创建新行;二次转换(存在历史软删除行)恢复同一行并重置作业字段 const b2bModel = ctx.model.OrderB2b; for (const row of convertedRows) { - await b2bModel.findOrCreate({ - where: { order_id: Number(row.id) }, - defaults: { - order_id: Number(row.id), - warehouse_id: normalizedWarehouseId, - store_id: Number(row.store_id || 0) > 0 ? Number(row.store_id) : null, - delivery_order_code: String(row.delivery_order_code || '').trim(), - created_at: now, - updated_at: now, - }, + const orderId = Number(row.id); + const baseFields = { + warehouse_id: normalizedWarehouseId, + store_id: Number(row.store_id || 0) > 0 ? Number(row.store_id) : null, + delivery_order_code: String(row.delivery_order_code || '').trim(), + updated_at: now, + }; + const existing = await b2bModel.findOne({ + where: { order_id: orderId }, + paranoid: false, transaction, }); + if (existing) { + // 恢复历史行并重置作业字段(取消 B2B 后的旧作业数据不再有效) + await existing.update({ + deleted_at: null, + total_box_count: 0, + pickup_plate_number: null, + prep_remark: null, + prep_duration_seconds: 0, + is_picked_up: 'N', + picked_up_at: null, + is_print: 'N', + ...baseFields, + }, { transaction, paranoid: false }); + } else { + await b2bModel.create({ + order_id: orderId, + ...baseFields, + created_at: now, + }, { transaction }); + } } }