fix(order.recheckOrder): 团购复核输出拦截订单序号,修正 intercept_status 识别(B2026080700003)

This commit is contained in:
liufumingren 2026-08-15 18:25:43 +08:00
parent a5945cd678
commit 75ac14a4ab
3 changed files with 78 additions and 5 deletions

View File

@ -671,6 +671,28 @@ class RecheckOrderService extends OrderBaseService {
};
}
/**
* 判断订单拦截状态是否属于"已进入拦截流程"的状态。
* 拦截状态枚举(wms_order_delivery.intercept_status)实际取值为:
* none / requesting / requested / intercepting / intercepted_in_transit / intercepted_at_warehouse /
* returning / returned / delivered_by_mistake / timeout / cancelled / failed / exception。
* 其中 requested/requesting/intercepting 为拦截发起中,intercepted_in_transit 为途中拦截成功,
* intercepted_at_warehouse 为仓库拦截成功;intercepted 为历史遗留值,一并兼容。
* @param {string} status 拦截状态。
* @return {boolean} 是否为拦截流程状态。
*/
isInterceptedOrderStatus(status = '') {
const normalizedStatus = String(status || '').trim();
return [
'intercepted',
'requested',
'requesting',
'intercepting',
'intercepted_in_transit',
'intercepted_at_warehouse',
].includes(normalizedStatus);
}
/**
* 构建团购波次列表视图(团单模式)。
* 根据拣货任务ID查找关联的所有波次,每个波次展开为一项。
@ -682,8 +704,8 @@ class RecheckOrderService extends OrderBaseService {
* pick_mode、total_orders、processed_orders、creator、create_time、update_time、
* order_count、box_no、reviewed_count、unreviewed_count、printed_count、unprinted_count、
* stocks(非拦截订单合并后的商品明细)、
* intercepted(拦截订单列表,仅当波次中存在拦截订单时出现,每项含 wave_index、order_id、
* delivery_order_code、intercept_status 等字段)、
* intercepted(拦截订单列表,仅当波次中存在拦截订单时出现,每项含 wave_index(波次内序号)、order_id、
* delivery_order_code、waybill_no、intercept_status 等字段)、
* items_weight(订单商品总重量,取自波次内首个正常订单)、
* suggested_package_material(推荐包材信息,无推荐时为 null)、
* first_waybill_no(波次内首个正常订单的运单号,用于包材绑定等后续操作,无正常订单时为第一个订单的运单号,均无则为空字符串)。
@ -757,7 +779,7 @@ class RecheckOrderService extends OrderBaseService {
const normalOrders = [];
for (const order of orders) {
const interceptStatus = String(order.intercept_status || '').trim();
if (interceptStatus === 'intercepted') {
if (this.isInterceptedOrderStatus(interceptStatus)) {
interceptedOrders.push(order);
} else {
normalOrders.push(order);
@ -787,11 +809,12 @@ class RecheckOrderService extends OrderBaseService {
store_remark: String(item.store_remark || '').trim(),
}));
// 构建拦截订单列表
// 构建拦截订单列表(wave_index 即波次内序号,供前端展示拦截订单的序号)
const intercepted = interceptedOrders.map(order => ({
wave_index: Number(order.wave_index || 0),
order_id: Number(order.order_id || 0),
delivery_order_code: String(order.delivery_order_code || '').trim(),
waybill_no: String(order.waybill_no || '').trim(),
intercept_status: String(order.intercept_status || '').trim(),
}));
@ -1754,7 +1777,7 @@ class RecheckOrderService extends OrderBaseService {
const interceptedOrders = [];
for (const order of orderList) {
if (String(order.intercept_status || '').trim() === 'intercepted') {
if (this.isInterceptedOrderStatus(String(order.intercept_status || '').trim())) {
interceptedOrders.push(order);
} else {
normalOrders.push(order);

View File

@ -1,4 +1,22 @@
[
{
"version": "2026.08.15-recheckOrder.scanOrder.groupInterceptSeq",
"date": "2026-08-15",
"type": "fixed",
"summary": "修复 order.recheckOrder.scanOrder 团购模式拦截订单识别:原逻辑仅匹配不存在的 'intercepted' 状态,导致已进入拦截流程的订单(requested/requesting/intercepting/intercepted_in_transit/intercepted_at_warehouse)被当作正常订单,团购复核数据不输出拦截订单及其序号。现统一按真实拦截状态枚举归类到波次项 intercepted 列表,并输出 wave_index 波次内序号",
"methods": [
"order.recheckOrder.scanOrder",
"order.recheckOrder.scanTask"
],
"notes": [
"新增 isInterceptedOrderStatus 辅助方法:intercepted / requested / requesting / intercepting / intercepted_in_transit / intercepted_at_warehouse 均视为拦截流程状态",
"buildGroupWaveList 拦截订单分离改用 isInterceptedOrderStatus,拦截订单不再进入正常订单校验与统计,仓库已拦截订单不再阻断整个团购扫描视图加载",
"团购波次项 intercepted 列表每项新增 waybill_no 字段,wave_index 为波次内序号(优先读取 wms_order_wave_index 真实序号,无记录时降级数组临时序号)",
"confirmRecheckByWaveId 团购波次批量复核同步修正拦截识别,拦截订单不再被批量标记复核",
"同步更新 methods/system.json 中 scanOrder 团购波次项 intercepted 字段说明"
],
"module": "order"
},
{
"version": "2026.08.14-afterSale.detail-desc-first-step",
"date": "2026-08-14",

View File

@ -5774,6 +5774,38 @@
}
]
},
{
"name": "intercepted",
"type": "array",
"description": "[团购波次项] 拦截订单列表,仅当波次内存在已进入拦截流程的订单时返回(intercept_status 为 requested / requesting / intercepting / intercepted_in_transit / intercepted_at_warehouse,以及历史遗留值 intercepted)。每项含 wave_index(波次内序号)、order_id、delivery_order_code、waybill_no、intercept_status",
"children": [
{
"name": "wave_index",
"type": "number",
"description": "波次内序号(优先从 wms_order_wave_index 读取真实 wave_index,若无则降级为数组临时序号)"
},
{
"name": "order_id",
"type": "number",
"description": "订单ID"
},
{
"name": "delivery_order_code",
"type": "string",
"description": "发货单号"
},
{
"name": "waybill_no",
"type": "string",
"description": "运单号"
},
{
"name": "intercept_status",
"type": "string",
"description": "拦截状态(requested / requesting / intercepting / intercepted_in_transit / intercepted_at_warehouse / intercepted)"
}
]
},
{
"name": "items_weight",
"type": "number|null",