From c84d5ac4ae200c12e2a332b8ecbd388bd3dcd11a Mon Sep 17 00:00:00 2001 From: liufumingren Date: Wed, 12 Aug 2026 23:35:38 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=BA=93=E5=86=85=E6=8B=A6=E6=88=AA?= =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E5=90=8C=E6=AD=A5=E6=8E=A8=E8=BF=9B=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=20step=3D4=20+=20outbound=5Fstatus=3Dfin?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit confirmIntercept + interceptScan 确认拦截后: - step = 4(配送中) - outbound_status = 'fin'(出库完成) - intercept_status = intercepted_at_warehouse --- app/service/inbox/functions.js | 11 +++++++++++ app/service/systemMethods/order/recheckOrder.js | 9 ++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/app/service/inbox/functions.js b/app/service/inbox/functions.js index 5fac707..d10c39c 100644 --- a/app/service/inbox/functions.js +++ b/app/service/inbox/functions.js @@ -901,6 +901,16 @@ class InboxFunctionsService extends Service { // 第四步:批量创建工单(初始状态 pending,后续根据通知结果升级) const creatorLabel = [ groupName, userName ].filter(Boolean).join('-') || 'AI系统'; + // 获取原消息内容,写入工单明细 + let interceptMsgContent = ''; + try { + const iid = ctx.inboxContext?.inbound_message_id; + if (iid) { + const imsg = await ctx.model.InboxMessage.findByPk(iid, { attributes: [ 'content' ], raw: true }); + if (imsg && imsg.content) interceptMsgContent = String(imsg.content); + } + } catch (e) { /* ignore */ } + const createdNos = []; const waybillToAsNo = {}; // waybill_id → after_sale_no 映射 for (const e of toCreate) { @@ -910,6 +920,7 @@ class InboxFunctionsService extends Service { `运单号: ${e.waybill_code}`, `快递公司: ${e.logistics_name || '未知'}`, reason ? `拦截原因: ${reason}` : '', + interceptMsgContent ? `原消息: ${interceptMsgContent}` : '', ].filter(Boolean).join('\n'); await ctx.service.systems.afterSale.create({ diff --git a/app/service/systemMethods/order/recheckOrder.js b/app/service/systemMethods/order/recheckOrder.js index 6f6e8af..200a48d 100644 --- a/app/service/systemMethods/order/recheckOrder.js +++ b/app/service/systemMethods/order/recheckOrder.js @@ -3600,6 +3600,8 @@ class RecheckOrderService extends OrderBaseService { const now = new Date(); const updateValues = { intercept_status: 'intercepted_at_warehouse', + step: 4, + outbound_status: 'fin', updated_at: now, }; const updateResult = await orderModel.update(updateValues, { @@ -3800,7 +3802,12 @@ class RecheckOrderService extends OrderBaseService { if (order) { await orderModel.update( - { intercept_status: 'intercepted_at_warehouse', updated_at: now }, + { + intercept_status: 'intercepted_at_warehouse', + step: 4, + outbound_status: 'fin', + updated_at: now, + }, { where: orderWhere } );