From bfbe231ff240e0a73fdac8f12d71b7854e7bccef Mon Sep 17 00:00:00 2001 From: liufumingren Date: Wed, 19 Aug 2026 03:22:44 +0800 Subject: [PATCH] =?UTF-8?q?feat(order):=20confirmIntercept=20=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=20ids=20=E6=89=B9=E9=87=8F=E7=A1=AE=E8=AE=A4=E6=8B=A6?= =?UTF-8?q?=E6=88=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 入参由单值 order_id 改为批量 ids(数组/逗号字符串,兼容 id/order_id/orderId 单值写法) - 仅拦截发起中状态(requested/requesting/intercepting,历史值 intercepted 兼容)允许确认;none 静默跳过,已确认拦截及其它非可确认状态记录 failed - 更新 SQL where 同步限定 intercept_status 白名单,防止查询后状态被并发修改导致误更新 - 售后工单+快递群通知改为按成功订单 ID 汇总后统一调用一次 - 返回 success/failed 列表与 success_count/failed_count;同步更新接口文档与变更记录 --- .../systemMethods/order/recheckOrder.js | 296 ++++++++++++------ methods/changes/system.json | 17 + methods/system.json | 94 ++++-- 3 files changed, 272 insertions(+), 135 deletions(-) diff --git a/app/service/systemMethods/order/recheckOrder.js b/app/service/systemMethods/order/recheckOrder.js index 7ff99c0..c2a5d82 100644 --- a/app/service/systemMethods/order/recheckOrder.js +++ b/app/service/systemMethods/order/recheckOrder.js @@ -2,6 +2,14 @@ const OrderBaseService = require('./base'); +/** + * 允许确认拦截(更新为 intercepted_at_warehouse)的前置拦截状态: + * 拦截发起中(requested/requesting/intercepting)与历史遗留值 intercepted。 + * 其余状态(none/空、intercepted_at_warehouse、intercepted_in_transit、returning、returned、 + * delivered_by_mistake、timeout、cancelled、failed、exception)一律不允许确认拦截。 + */ +const CONFIRMABLE_INTERCEPT_STATUSES = [ 'requested', 'requesting', 'intercepting', 'intercepted' ]; + class RecheckOrderService extends OrderBaseService { /** * 初始化复核订单系统方法免登录、免权限、免日志与免鉴权配置。 @@ -3617,130 +3625,212 @@ class RecheckOrderService extends OrderBaseService { } /** - * 确认仓库拦截:通过订单ID直接匹配订单,将其拦截状态更新为"仓库拦截成功"。 - * 仅拦截当前指定订单(不波及波次内其他订单)。 + * 确认仓库拦截:通过订单 ID 列表直接匹配订单,批量将其拦截状态更新为"仓库拦截成功"。 + * 仅拦截当前指定订单(不波及波次内其他订单),支持部分失败:未找到的订单与处理失败的 + * 订单记录在 failed 列表并返回失败原因,其余订单继续处理。 + * + * 前置条件:订单必须处于拦截发起中状态(requested/requesting/intercepting,历史值 intercepted 兼容)。 + * 未发起拦截(none/空)的订单直接静默跳过不参与处理;已确认拦截(intercepted_at_warehouse)及其它 + * 非可确认状态(intercepted_in_transit/returning/returned/delivered_by_mistake/timeout/cancelled/failed/ + * exception)的订单一律跳过并记录失败原因;更新 SQL 的 where 同时限定拦截状态,防止并发修改导致误更新。 + * + * 每个订单的拦截处理: + * 1. 更新 wms_order_delivery:intercept_status = intercepted_at_warehouse、step=4、outbound_status=fin + * 2. 同步更新运单表:is_intercept='Y'、is_back='Y'(库内拦截确认,货物在库内需退回) + * 3. 释放储位分配(cancelAllocateStorage,归还库存) + * 4. 释放订单锁(lock_status='none') + * 5. 写入操作日志(ORDER_INTERCEPT_CONFIRM) + * 全部订单处理完后,按成功订单 ID 汇总批量创建售后工单 + 通知快递群。 + * 运单标记、储位释放、锁释放、工单创建、日志写入失败均不影响主流程。 + * * @param {Object} data 请求体。 - * @param {number} data.order_id 订单ID。 - * @return {Promise} 拦截确认结果,包含 order_id、intercept_status 与更新时间。 + * @param {number[]|string} data.ids 订单 ID 列表,支持数组或以逗号分隔的字符串(兼容 id/order_id/orderId 单值写法)。 + * @return {Promise} 批量拦截结果,包含 success/failed 列表与 success_count/failed_count 计数。 */ async confirmIntercept(data = {}) { const { ctx } = this; - const { order_id } = data; const warehouseId = this.getWarehouseId(); - const orderId = Number(order_id); + const orderIds = this.normalizeOrderIds(data); - if (!orderId || !Number.isFinite(orderId) || orderId <= 0) { - throw new Error('order_id 无效'); + if (orderIds.length === 0) { + this.ctx.throw(400, '订单ID列表不能为空'); } const orderModel = await this.getOrderModelByTableType('current', warehouseId); - const orderWhere = this.buildOrderWhere([ orderId ], warehouseId); - const order = await orderModel.findOne({ - where: orderWhere, + const orderRows = await orderModel.findAll({ + where: this.buildOrderWhere(orderIds, warehouseId), attributes: [ 'id', 'delivery_order_code', 'pre_delivery_order_code', 'intercept_status', 'wave_no' ], raw: true, }); - if (!order) { - throw new Error('未找到对应订单'); + const orderMap = new Map(); + for (const row of orderRows) { + orderMap.set(Number(row.id), row); } - 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, { - where: orderWhere, - }); - const affectedRows = Array.isArray(updateResult) ? Number(updateResult[0] || 0) : Number(updateResult || 0); + const successOrders = []; + const failedOrders = []; + const successOrderIds = []; - if (affectedRows <= 0) { - throw new Error('拦截状态更新失败,请稍后重试'); + for (const orderId of orderIds) { + const order = orderMap.get(orderId); + + if (!order) { + failedOrders.push({ order_id: orderId, reason: '未找到对应订单' }); + continue; + } + + const orderWhere = this.buildOrderWhere([ orderId ], warehouseId); + const orderNo = String(order.delivery_order_code || order.pre_delivery_order_code || '').trim(); + const interceptStatus = String(order.intercept_status || '').trim(); + + // 未发起拦截(none/空)的订单直接跳过,不参与确认拦截处理 + if (interceptStatus === '' || interceptStatus === 'none') { + continue; + } + + // 已确认拦截的订单跳过,避免重复执行副作用(释放储位/工单/日志等) + if (interceptStatus === 'intercepted_at_warehouse') { + failedOrders.push({ + order_id: orderId, + delivery_order_code: orderNo, + reason: '订单已确认拦截', + }); + continue; + } + + // 仅拦截发起中(requested/requesting/intercepting)与历史值 intercepted 允许确认, + // 其余状态(intercepted_in_transit/returning/returned/delivered_by_mistake/timeout/ + // cancelled/failed/exception)不允许确认拦截 + if (!CONFIRMABLE_INTERCEPT_STATUSES.includes(interceptStatus)) { + failedOrders.push({ + order_id: orderId, + delivery_order_code: orderNo, + reason: `订单拦截状态不允许确认拦截: ${interceptStatus}`, + }); + continue; + } + + try { + 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, { + where: { + ...orderWhere, + // 数据库层再次限定拦截状态,防止查询后状态被并发修改导致误更新 + intercept_status: { [ctx.app.Sequelize.Op.in]: CONFIRMABLE_INTERCEPT_STATUSES }, + }, + }); + const affectedRows = Array.isArray(updateResult) ? Number(updateResult[0] || 0) : Number(updateResult || 0); + + if (affectedRows <= 0) { + throw new Error('拦截状态更新失败,请稍后重试'); + } + + // 同步更新运单表:标记拦截 + 退回(库内拦截确认,货物在库内需退回) + try { + await ctx.model.OrderExpress.update( + { is_intercept: 'Y', is_back: 'Y' }, + { where: { order_id: orderId, warehouse_id: warehouseId } } + ); + } catch (expressErr) { + ctx.logger.warn( + `[recheckOrder.confirmIntercept] 更新运单拦截/退回标记失败, orderId=${orderId}, error=${expressErr.message}` + ); + } + + // 拦截成功后释放储位分配(归还库存) + try { + await this.service.systems.orderStorageAllocation.cancelAllocateStorage({ + order_ids: [ orderId ], + }); + } catch (allocErr) { + ctx.logger.warn( + `[recheckOrder.confirmIntercept] 释放储位分配失败,不影响拦截, orderId=${orderId}, error=${allocErr.message}` + ); + } + + // 拦截成功后释放订单锁 + try { + await orderModel.update( + { lock_status: 'none', updated_at: now }, + { where: orderWhere } + ); + } catch (lockErr) { + ctx.logger.warn( + `[recheckOrder.confirmIntercept] 释放锁失败,不影响拦截, orderId=${orderId}, error=${lockErr.message}` + ); + } + + // 写入操作日志(失败不影响主流程) + try { + const operator = this.getOrderLogOperator(); + const logWarehouseId = this.getOrderLogWarehouseId(warehouseId); + await ctx.service.systems.operationLog.createOperationLog({ + businessType: 'order', + businessId: orderId, + operationCode: 'ORDER_INTERCEPT_CONFIRM', + operator, + extras: { + warehouseId: logWarehouseId, + orderId, + orderNo, + previousInterceptStatus: String(order.intercept_status || '').trim(), + newInterceptStatus: 'intercepted_at_warehouse', + }, + beforeChanges: null, + }); + } catch (logErr) { + ctx.logger.warn( + `[recheckOrder.confirmIntercept] 写入操作日志失败,不影响业务, orderId=${orderId}, error=${logErr.message}` + ); + } + + successOrders.push({ + order_id: orderId, + order_no: orderNo, + intercept_status: 'intercepted_at_warehouse', + updated_at: now, + }); + successOrderIds.push(orderId); + } catch (error) { + ctx.logger.warn( + `[recheckOrder.confirmIntercept] 确认拦截失败, orderId=${orderId}, error=${error.message}` + ); + failedOrders.push({ + order_id: orderId, + delivery_order_code: orderNo, + reason: `确认拦截失败: ${error.message}`, + }); + } } - // 同步更新运单表:标记拦截 + 退回(库内拦截确认,货物在库内需退回) - try { - await ctx.model.OrderExpress.update( - { is_intercept: 'Y', is_back: 'Y' }, - { where: { order_id: orderId, warehouse_id: warehouseId } } - ); - } catch (expressErr) { - ctx.logger.warn( - `[recheckOrder.confirmIntercept] 更新运单拦截/退回标记失败, orderId=${orderId}, error=${expressErr.message}` - ); - } - - // 拦截成功后释放储位分配(归还库存) - try { - await this.service.systems.orderStorageAllocation.cancelAllocateStorage({ - order_ids: [ orderId ], - }); - } catch (allocErr) { - ctx.logger.warn( - `[recheckOrder.confirmIntercept] 释放储位分配失败,不影响拦截, orderId=${orderId}, error=${allocErr.message}` - ); - } - - // 拦截成功后释放订单锁 - try { - await orderModel.update( - { lock_status: 'none', updated_at: now }, - { where: orderWhere } - ); - } catch (lockErr) { - ctx.logger.warn( - `[recheckOrder.confirmIntercept] 释放锁失败,不影响拦截, orderId=${orderId}, error=${lockErr.message}` - ); - } - - // 创建售后工单 + 通知快递群(失败不影响主流程) - try { - const operator = this.getOrderLogOperator(); - await this.service.systems.afterSale.createInterceptWorkOrdersAndNotify({ - orderIds: [ orderId ], - warehouseId, - creatorLabel: operator.name || '系统', - }); - } catch (workOrderErr) { - ctx.logger.warn( - `[recheckOrder.confirmIntercept] 创建工单/通知失败, orderId=${orderId}, error=${workOrderErr.message}` - ); - } - - const orderNo = String(order.delivery_order_code || order.pre_delivery_order_code || '').trim(); - - // 写入操作日志(失败不影响主流程) - try { - const operator = this.getOrderLogOperator(); - const logWarehouseId = this.getOrderLogWarehouseId(warehouseId); - await ctx.service.systems.operationLog.createOperationLog({ - businessType: 'order', - businessId: orderId, - operationCode: 'ORDER_INTERCEPT_CONFIRM', - operator, - extras: { - warehouseId: logWarehouseId, - orderId, - orderNo, - previousInterceptStatus: String(order.intercept_status || '').trim(), - newInterceptStatus: 'intercepted_at_warehouse', - }, - beforeChanges: null, - }); - } catch (logErr) { - ctx.logger.warn( - `[recheckOrder.confirmIntercept] 写入操作日志失败,不影响业务, orderId=${orderId}, error=${logErr.message}` - ); + // 创建售后工单 + 通知快递群(成功订单 ID 汇总统一调用,失败不影响主流程) + if (successOrderIds.length > 0) { + try { + const operator = this.getOrderLogOperator(); + await this.service.systems.afterSale.createInterceptWorkOrdersAndNotify({ + orderIds: successOrderIds, + warehouseId, + creatorLabel: operator.name || '系统', + }); + } catch (workOrderErr) { + ctx.logger.warn( + `[recheckOrder.confirmIntercept] 创建工单/通知失败, orderIds=${successOrderIds.join(',')}, error=${workOrderErr.message}` + ); + } } return { - order_id: orderId, - order_no: orderNo, - intercept_status: 'intercepted_at_warehouse', - updated_at: now, + success: successOrders, + failed: failedOrders, + success_count: successOrders.length, + failed_count: failedOrders.length, }; } diff --git a/methods/changes/system.json b/methods/changes/system.json index 2d534ce..5c0f34b 100644 --- a/methods/changes/system.json +++ b/methods/changes/system.json @@ -1,4 +1,21 @@ [ + { + "version": "2026.08.19-recheckOrder.confirmIntercept-ids", + "date": "2026-08-19", + "type": "enhanced", + "summary": "order.recheckOrder.confirmIntercept 入参由单值 order_id 改为批量 ids:支持数组或以逗号分隔的字符串(兼容 id/order_id/orderId 单值写法),批量确认拦截,返回 success/failed 列表与 success_count/failed_count 计数;单个订单失败不再阻断整体,未找到订单与更新失败订单记录在 failed 列表", + "methods": [ + "order.recheckOrder.confirmIntercept" + ], + "notes": [ + "app/service/systemMethods/order/recheckOrder.js confirmIntercept:用 base.normalizeOrderIds 解析 ids(兼容 ids/id/order_id/orderId),findAll 批量查询后逐订单执行拦截主流程(intercept_status=intercepted_at_warehouse、step=4、outbound_status=fin,运单标记 is_back/is_intercept='Y',释放储位分配与订单锁,写入 ORDER_INTERCEPT_CONFIRM 操作日志),未找到订单与处理异常订单记录 failed 不抛错,仅 ids 全部无效时 400「订单ID列表不能为空」", + "确认拦截前置校验:仅拦截发起中状态(requested/requesting/intercepting,历史值 intercepted 兼容)允许确认;未发起拦截(none/空)的订单直接静默跳过不参与处理,已确认拦截(intercepted_at_warehouse)订单跳过避免重复副作用并记录 failed「订单已确认拦截」,其余非可确认状态(intercepted_in_transit/returning/returned/delivered_by_mistake/timeout/cancelled/failed/exception)记录 failed「订单拦截状态不允许确认拦截: {状态}」;更新 SQL where 同时限定 intercept_status 白名单(CONFIRMABLE_INTERCEPT_STATUSES),防止查询后状态被并发修改导致误更新", + "售后工单+快递群通知由原每订单调用改为按成功订单 ID 汇总后统一调用一次 afterSale.createInterceptWorkOrdersAndNotify,失败仅告警", + "返回结构由单对象改为 { success, failed, success_count, failed_count },success 每项保持 order_id/order_no/intercept_status/updated_at,failed 每项含 order_id/delivery_order_code/reason", + "同步更新 methods/system.json 中该接口 params(ids)、response 与 errors 文档" + ], + "module": "order.recheckOrder" + }, { "version": "2026.08.18-order-list-lock-status-filter-doc", "date": "2026-08-18", diff --git a/methods/system.json b/methods/system.json index bba1056..f47531e 100644 --- a/methods/system.json +++ b/methods/system.json @@ -6039,7 +6039,7 @@ }, { "method": "order.recheckOrder.confirmIntercept", - "description": "确认拦截:通过订单ID直接匹配订单,将其拦截状态更新为 intercepted_at_warehouse(仓库已拦截),同时释放储位分配(cancelAllocateStorage)与订单锁(lock_status=none)。仅拦截当前指定订单,不波及波次内其他订单。操作成功后写入操作日志(ORDER_INTERCEPT_CONFIRM)。储位释放、锁释放、日志写入失败均不影响主流程。", + "description": "确认拦截:通过订单 ID 列表批量匹配订单,将拦截状态更新为 intercepted_at_warehouse(仓库已拦截,step=4、outbound_status=fin),同步标记运单退回与拦截(is_back='Y', is_intercept='Y'),并释放储位分配(cancelAllocateStorage)与订单锁(lock_status=none)。仅拦截当前指定订单,不波及波次内其他订单。前置条件:订单必须处于拦截发起中状态(requested/requesting/intercepting,历史值 intercepted 兼容),未发起拦截(none/空)的订单直接静默跳过不参与处理,已确认拦截(intercepted_at_warehouse)及其它非可确认状态(intercepted_in_transit/returning/returned/delivered_by_mistake/timeout/cancelled/failed/exception)一律跳过并记录失败原因;更新 SQL 的 where 同时限定拦截状态白名单,防止并发修改导致误更新。支持部分失败:未找到的订单与处理失败的订单记录在 failed 列表并返回失败原因,其余订单继续处理。全部订单处理完后按成功订单 ID 汇总批量创建售后工单 + 通知快递群。每个订单操作成功后写入操作日志(ORDER_INTERCEPT_CONFIRM)。运单标记、储位释放、锁释放、工单创建、日志写入失败均不影响主流程。", "isNeedAuth": false, "isNeedLogin": true, "headers": [ @@ -6052,53 +6052,83 @@ ], "params": [ { - "name": "order_id", - "type": "number", + "name": "ids", + "type": "array|string", "required": true, "source": "body", - "description": "订单 ID" + "description": "订单 ID 列表,支持数组或以逗号分隔的字符串。兼容 id / order_id / orderId 单值写法" } ], "response": [ { - "name": "order_id", + "name": "success", + "type": "array", + "required": true, + "description": "拦截成功的订单列表", + "children": [ + { + "name": "order_id", + "type": "number", + "description": "订单 ID" + }, + { + "name": "order_no", + "type": "string", + "description": "订单号(优先 delivery_order_code,其次 pre_delivery_order_code)" + }, + { + "name": "intercept_status", + "type": "string", + "description": "拦截状态(固定为 'intercepted_at_warehouse')" + }, + { + "name": "updated_at", + "type": "string", + "description": "更新时间(ISO 字符串)" + } + ] + }, + { + "name": "failed", + "type": "array", + "required": true, + "description": "拦截失败的订单列表", + "children": [ + { + "name": "order_id", + "type": "number", + "description": "订单 ID" + }, + { + "name": "delivery_order_code", + "type": "string", + "description": "发货单号(订单存在时返回)" + }, + { + "name": "reason", + "type": "string", + "description": "失败原因(未找到对应订单 / 订单已确认拦截 / 订单拦截状态不允许确认拦截: xxx / 确认拦截失败: xxx);拦截状态为 none 的订单静默跳过,不进入 failed" + } + ] + }, + { + "name": "success_count", "type": "number", "required": true, - "description": "订单 ID" + "description": "成功数量" }, { - "name": "order_no", - "type": "string", + "name": "failed_count", + "type": "number", "required": true, - "description": "订单号(优先 delivery_order_code,其次 pre_delivery_order_code)" - }, - { - "name": "intercept_status", - "type": "string", - "required": true, - "description": "拦截状态(固定为 'intercepted_at_warehouse')" - }, - { - "name": "updated_at", - "type": "string", - "required": true, - "description": "更新时间(ISO 字符串)" + "description": "失败数量" } ], "errors": [ { "code": 400, - "message": "order_id 无效", - "description": "order_id 无效(为空或非正整数)" - }, - { - "code": 404, - "message": "未找到对应订单" - }, - { - "code": 500, - "message": "拦截状态更新失败,请稍后重试", - "description": "数据库更新影响行数为 0 时返回" + "message": "订单ID列表不能为空", + "description": "ids 为空或全部无效(非正整数)时返回" } ] },