From 3736d306bd8164b29600dba80d416452393e5663 Mon Sep 17 00:00:00 2001 From: liufumingren Date: Sat, 1 Aug 2026 03:44:14 +0800 Subject: [PATCH] =?UTF-8?q?feat(express):=20=E5=BF=AB=E9=80=92=E8=BF=90?= =?UTF-8?q?=E5=8D=95=E5=88=9B=E5=BB=BA=E9=93=BE=E8=B7=AF=E6=94=B9=E9=80=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - order_express model 新增 logistics_code/name/delivery_order_code/source_order_codes/store_id 字段 - express.js 业务层改造:创建运单号时写入快照字段 - express_platform.js 适配新字段 - pendingOrder.js 运单分配+拆子单号改造:支持 dispatch 表查询、已取消订单校验、主单号前置检查、step 4 配送中拆单 --- app/model/order_express.js | 17 +- .../systemMethods/order/pendingOrder.js | 233 ++++++++++++++- app/service/systems/express.js | 267 ++++++++++++++++-- app/service/systems/express_platform.js | 98 +++++-- 4 files changed, 557 insertions(+), 58 deletions(-) diff --git a/app/model/order_express.js b/app/model/order_express.js index 383fed1..6a440d8 100644 --- a/app/model/order_express.js +++ b/app/model/order_express.js @@ -39,7 +39,7 @@ module.exports = app => { is_galaxy_receive: { type: ENUM('Y', 'N'), allowNull: true, - comment: '是否星河签收', + comment: '是否揽收', }, is_back: { type: ENUM('Y', 'N'), @@ -122,6 +122,21 @@ module.exports = app => { allowNull: true, comment: '仓库ID', }, + store_id: { + type: BIGINT(20).UNSIGNED, + allowNull: true, + comment: '货主ID', + }, + delivery_order_code: { + type: STRING(50), + allowNull: true, + comment: '发货单号', + }, + source_order_codes: { + type: TEXT, + allowNull: true, + comment: '来源订单号集合', + }, package_material_id: { type: BIGINT(20).UNSIGNED, allowNull: true, diff --git a/app/service/systemMethods/order/pendingOrder.js b/app/service/systemMethods/order/pendingOrder.js index c8cb73a..3e02550 100644 --- a/app/service/systemMethods/order/pendingOrder.js +++ b/app/service/systemMethods/order/pendingOrder.js @@ -2015,6 +2015,12 @@ class PendingOrderService extends OrderBaseService { }; await this.setAllocateExpressTaskProgress(taskId, taskPayload); + // 捕获 warehouseId 供 setImmediate 异步回调使用, + // 避免 Qimen 等链路中 withPatchedCtxUser 补丁已撤销导致 getCurrentWarehouseId() 返回 0。 + const capturedWarehouseId = Number( + this.ctx && this.ctx.user && this.ctx.user.store_id || 0 + ); + // 后台异步执行 setImmediate(async () => { try { @@ -2026,6 +2032,7 @@ class PendingOrderService extends OrderBaseService { const result = await service.systems.express.createWaybillCodePipeline(orders, { awaitTasks: true, + warehouseId: capturedWarehouseId, }); await this.setAllocateExpressTaskProgress(taskId, { @@ -5703,7 +5710,7 @@ class PendingOrderService extends OrderBaseService { const where = this.buildOrderWhere([ orderId ], warehouseId); const order = await model.findOne({ where, - attributes: [ 'id', 'step', 'outbound_status', 'warehouse_id', 'store_id' ], + attributes: [ 'id', 'step', 'outbound_status', 'warehouse_id', 'store_id', 'sys_logistics_code', 'sys_logistics_name', 'delivery_order_code', 'source_order_codes' ], raw: true, }); @@ -5758,7 +5765,12 @@ class PendingOrderService extends OrderBaseService { order_id: orderId, waybill_code: waybillCode, logistics_interface_name: logisticsInterfaceName, + logistics_code: String(order.sys_logistics_code || '').trim() || null, + logistics_name: String(order.sys_logistics_name || '').trim() || null, + delivery_order_code: String(order.delivery_order_code || '').trim() || null, + source_order_codes: String(order.source_order_codes || '').trim() || null, warehouse_id: Number(order.warehouse_id) || warehouseId, + store_id: order.store_id != null ? Number(order.store_id) : null, business_key: nextBusinessKey, status: 1, create_at: new Date(), @@ -5959,25 +5971,40 @@ class PendingOrderService extends OrderBaseService { throw new Error('sub_order_count 必须为正整数且 >= 1'); } - // 2. 查询订单并校验状态(待处理:step in [1,2,3] 且 outbound_status != 'padding') - const model = await this.getOrderModel('order', warehouseId); + // 2. 查询订单并校验状态 + // 先查 current 表;若不存在再查 dispatch 表(配送中订单可能已被定时任务迁移到 dispatch) + let model = await this.getOrderModel('order', warehouseId); const where = this.buildOrderWhere([ orderId ], warehouseId); - const order = await model.findOne({ + let order = await model.findOne({ where, - attributes: [ 'id', 'step', 'outbound_status', 'warehouse_id', 'store_id', 'sys_platform_code', 'logistics_code', 'sys_platform_name', 'logistics_name' ], + attributes: [ 'id', 'step', 'outbound_status', 'warehouse_id', 'store_id', 'sys_platform_code', 'logistics_code', 'sys_platform_name', 'logistics_name', 'status' ], raw: true, }); + if (!order) { + model = await this.getOrderModelByTableType('dispatch', warehouseId); + order = await model.findOne({ + where, + attributes: [ 'id', 'step', 'outbound_status', 'warehouse_id', 'store_id', 'sys_platform_code', 'logistics_code', 'sys_platform_name', 'logistics_name', 'status' ], + raw: true, + }); + } + if (!order) { throw new Error(`订单 ${orderId} 不存在或不属于当前仓库`); } - const allowedSteps = new Set([ 1, 2, 3 ]); - if (!allowedSteps.has(order.step)) { - throw new Error(`订单 ${orderId} 当前步骤为 ${order.step},仅允许待处理状态(step 1/2/3)的订单分配子单号`); + if (order.status === PENDING_CANCEL_STATUS) { + throw new Error(`订单 ${orderId} 已取消,不允许分配子单号`); } - if (order.outbound_status === PENDING_OUTBOUND_STATUS) { + const allowedSteps = new Set([ 1, 2, 3, 4 ]); + if (!allowedSteps.has(order.step)) { + throw new Error(`订单 ${orderId} 当前步骤为 ${order.step},仅允许待处理(step 1/2/3)或配送中(step 4)的订单分配子单号`); + } + + // 仅待处理阶段(step 1/2/3)校验 outbound_status;配送中(step 4)不校验 + if (order.step !== 4 && order.outbound_status === PENDING_OUTBOUND_STATUS) { throw new Error(`订单 ${orderId} 已标记待出库,不允许分配子单号`); } @@ -5987,13 +6014,28 @@ class PendingOrderService extends OrderBaseService { throw new Error('OrderExpress 模型未加载'); } + // 3.1 校验主单号:必须已有 business_key=1 且 status=1 的主单号,才能拆子单号 + const { Op } = this.app.Sequelize; + const mainWaybill = await orderExpressModel.findOne({ + where: { + order_id: orderId, + warehouse_id: Number(order.warehouse_id) || warehouseId, + business_key: 1, + status: 1, + }, + attributes: [ 'id' ], + raw: true, + }); + if (!mainWaybill) { + throw new Error(`订单 ${orderId} 尚未分配主单号,请先分配主单号后再拆子单号`); + } + const businessKeys = []; for (let i = 0; i < subOrderCount; i++) { businessKeys.push(2 + i); } // 4. 预查已有的已分配运单号(status=1),仅用于初始 details 展示与全部跳过优化 - const { Op } = this.app.Sequelize; const existingCompleted = await orderExpressModel.findAll({ where: { order_id: orderId, @@ -6074,6 +6116,7 @@ class PendingOrderService extends OrderBaseService { sys_platform_name: order.sys_platform_name, logistics_name: order.logistics_name, store_id: order.store_id, + warehouse_id: Number(order.warehouse_id) || warehouseId, })); const pipelineResult = await this.service.systems.express.createWaybillCodePipeline( @@ -6100,6 +6143,19 @@ class PendingOrderService extends OrderBaseService { details: updatedDetails, }, }); + + // 写入操作日志(成功) + try { + await this.writeAllocateSubOrderLog(orderId, orderWarehouseId, { + action: isPartial ? 'SUCCESS_PARTIAL' : 'SUCCESS', + subOrderCount: businessKeys.length, + successCount, + details: updatedDetails, + }); + } catch (logErr) { + this.ctx.logger.warn('[pendingOrder.allocateSubOrderNumber] 写入成功操作日志失败: %s', + logErr && logErr.message ? logErr.message : logErr); + } } catch (error) { const errorMessage = error && error.message ? error.message : String(error); @@ -6110,6 +6166,25 @@ class PendingOrderService extends OrderBaseService { message: '子单号分配失败', error: errorMessage, }); + + // 写错误信息到 order_flag(尝试 current 和 dispatch 两张表) + try { + await this.writeAllocateSubOrderErrorFlag(orderId, orderWarehouseId, errorMessage); + } catch (flagErr) { + this.ctx.logger.warn('[pendingOrder.allocateSubOrderNumber] 写入 order_flag 失败: %s', + flagErr && flagErr.message ? flagErr.message : flagErr); + } + + // 写入操作日志(失败) + try { + await this.writeAllocateSubOrderLog(orderId, orderWarehouseId, { + action: 'FAILED', + errorMessage, + }); + } catch (logErr) { + this.ctx.logger.warn('[pendingOrder.allocateSubOrderNumber] 写入失败操作日志失败: %s', + logErr && logErr.message ? logErr.message : logErr); + } } }); @@ -6119,6 +6194,106 @@ class PendingOrderService extends OrderBaseService { }); } + /** + * 写入子单号分配的 order_flag 错误信息。 + * 尝试更新 current 和 dispatch 两张表,任一成功即返回。 + * + * @param {number} orderId 订单ID。 + * @param {number} warehouseId 仓库ID。 + * @param {string} errorMessage 错误信息。 + * @return {Promise} 无返回值。 + */ + async writeAllocateSubOrderErrorFlag(orderId, warehouseId, errorMessage) { + const flag = `[子单号分配失败] ${errorMessage}`.substring(0, 500); + const where = this.buildOrderWhere([ orderId ], warehouseId); + const updatePayload = { order_flag: flag, updated_at: new Date() }; + + // 尝试 current 表 + try { + const currentModel = await this.getOrderModel('order', warehouseId); + if (currentModel && typeof currentModel.update === 'function') { + const [ affected ] = await currentModel.update(updatePayload, { where }); + if (Number(affected) > 0) return; + } + } catch (err) { + this.ctx.logger.warn('[pendingOrder.allocateSubOrderNumber] current 表写入 order_flag 失败: %s', + err && err.message ? err.message : err); + } + + // 尝试 dispatch 表 + try { + const dispatchModel = await this.getOrderModelByTableType('dispatch', warehouseId); + if (dispatchModel && typeof dispatchModel.update === 'function') { + await dispatchModel.update(updatePayload, { where }); + } + } catch (err) { + this.ctx.logger.warn('[pendingOrder.allocateSubOrderNumber] dispatch 表写入 order_flag 失败: %s', + err && err.message ? err.message : err); + } + } + + /** + * 写入子单号分配的操作日志。 + * + * @param {number} orderId 订单ID。 + * @param {number} warehouseId 仓库ID。 + * @param {Object} opts 日志详情。 + * @param {string} opts.action 操作动作(SUCCESS/SUCCESS_PARTIAL/FAILED)。 + * @param {number} [opts.subOrderCount] 子单总数。 + * @param {number} [opts.successCount] 成功数。 + * @param {string} [opts.errorMessage] 错误信息。 + * @param {Array} [opts.details] 分配详情。 + * @return {Promise} 无返回值。 + */ + async writeAllocateSubOrderLog(orderId, warehouseId, opts = {}) { + const operator = this.getOrderLogOperator(); + const logWarehouseId = this.getOrderLogWarehouseId(warehouseId); + const now = new Date(); + + // 状态中文映射 + const STATUS_CN = { allocated: '成功', failed: '失败', skipped: '跳过', pending: '处理中' }; + const detailSummary = Array.isArray(opts.details) + ? opts.details.slice(0, 10).map(d => { + const cn = STATUS_CN[d.status] || d.status; + let seg = `子单${d.business_key}:${cn}`; + if (d.status === 'failed' && d.note) { + seg += `(${d.note})`; + } + return seg; + }).join(', ') + : ''; + + let message = `子单号分配${opts.action === 'FAILED' ? '失败' : '完成'}`; + if (opts.action === 'SUCCESS_PARTIAL') { + message = `子单号分配部分完成(${opts.successCount}/${opts.subOrderCount})`; + } + if (opts.errorMessage) { + message += ` - ${opts.errorMessage}`; + } + if (detailSummary) { + message += ` | ${detailSummary}`; + } + + const logRow = { + business_type: 'order', + business_id: String(orderId), + operation_code: '子单号分配', + operator_id: operator.id, + operator_name: operator.name, + external_log_type: 'NONE', + warehouse_id: logWarehouseId || null, + platform_code: 'SYSTEM', + message: message.substring(0, 1000), + created_at: now, + }; + + if (this.ctx.model && this.ctx.model.OperationLog) { + await this.ctx.model.OperationLog.create(logRow); + } else if (this.ctx.service && this.ctx.service.systems && this.ctx.service.systems.operationLog) { + await this.ctx.service.systems.operationLog.createOperationLog(logRow); + } + } + /** * 查询子单号分配任务进度。 * @@ -6299,6 +6474,37 @@ class PendingOrderService extends OrderBaseService { } } + // 兜底:如果 order_express 中一条记录都没有,尝试从订单表的 order_flag 获取异常信息 + let orderFlagNote = ''; + if (recordMap.size === 0) { + try { + const orderWhere = this.buildOrderWhere([ orderId ], warehouseId); + // 查 current 表 + let orderModel = await this.getOrderModel('order', warehouseId); + let orderRow = await orderModel.findOne({ + where: orderWhere, + attributes: [ 'order_flag' ], + raw: true, + }); + // 查 dispatch 表兜底 + if (!orderRow) { + orderModel = await this.getOrderModelByTableType('dispatch', warehouseId); + orderRow = await orderModel.findOne({ + where: orderWhere, + attributes: [ 'order_flag' ], + raw: true, + }); + } + if (orderRow && orderRow.order_flag) { + orderFlagNote = `(订单异常: ${String(orderRow.order_flag).trim()})`; + } + } catch (err) { + // 查 order_flag 失败不影响主流程 + this.ctx.logger.warn('[pendingOrder.buildSubOrderDetails] 查询 order_flag 失败: %s', + err && err.message ? err.message : err); + } + } + return businessKeys.map(bk => { const record = recordMap.get(bk); if (record && Number(record.status) === 1 && String(record.waybill_code || '').trim()) { @@ -6319,11 +6525,12 @@ class PendingOrderService extends OrderBaseService { }; } + const baseNote = '未找到分配的运单记录'; return { business_key: bk, status: 'failed', waybill_code: null, - note: '未找到分配的运单记录', + note: orderFlagNote ? `${baseNote}${orderFlagNote}` : baseNote, }; }); } @@ -6364,7 +6571,7 @@ class PendingOrderService extends OrderBaseService { const now = new Date(); const buildWhere = () => ({ - step: { [Op.in]: [1, 2, 3] }, + step: { [Op.in]: [ 1, 2, 3 ] }, status: { [Op.ne]: 'cancel' }, print_status: { [Op.ne]: 'fin' }, }); @@ -6384,7 +6591,7 @@ class PendingOrderService extends OrderBaseService { // 2. 查询 current 表中已存在的订单 ID,计算出未命中的 ID const currentFoundRows = await currentModel.findAll({ - attributes: ['id'], + attributes: [ 'id' ], where: this.buildOrderWhere(orderIds, warehouseId), raw: true, }); diff --git a/app/service/systems/express.js b/app/service/systems/express.js index 02d2439..63d6f81 100644 --- a/app/service/systems/express.js +++ b/app/service/systems/express.js @@ -635,6 +635,10 @@ class ExpressService extends Service { status: { [Op.ne]: 'cancel', }, + // 保护配送中(step=4)订单不被回退为异常状态 + step: { + [Op.ne]: 4, + }, }, transaction, }); @@ -658,6 +662,76 @@ class ExpressService extends Service { } } + /** + * 补写 dispatch 表订单的 order_flag 异常信息。 + * dispatch 表中的配送中订单(step=4)不应回退 step,仅记录异常标记。 + * + * @param {Array} dispatchOrderDeliveryRows dispatch 表中的订单行。 + * @param {Map>} failedOrdersByReason 失败原因与订单 ID 映射。 + * @param {Object} transaction 数据库事务。 + * @return {Promise} 无返回值。 + */ + async writeDispatchOrderFlags(dispatchOrderDeliveryRows = [], failedOrdersByReason = new Map(), transaction) { + if (!failedOrdersByReason || typeof failedOrdersByReason.forEach !== 'function') { + return; + } + + const { Op } = this.app.Sequelize; + const dispatchOrderIdSet = new Set( + (Array.isArray(dispatchOrderDeliveryRows) ? dispatchOrderDeliveryRows : []) + .map(row => Number(row && row.id)) + .filter(id => Number.isFinite(id) && id > 0) + ); + + if (dispatchOrderIdSet.size === 0) { + return; + } + + this.ctx.logger.info('[ExpressService.writeDispatchOrderFlags] 入口 dispatchOrderIds=%s failedReasons=%d', + Array.from(dispatchOrderIdSet).join(','), failedOrdersByReason.size); + + // 找到同时属于 dispatch 表且失败的订单 + const dispatchFactory = this.ctx.model && this.ctx.model.OrderDeliveryFactory; + if (!dispatchFactory || typeof dispatchFactory.getDispatchModel !== 'function') { + this.ctx.logger.warn('[ExpressService.writeDispatchOrderFlags] dispatchFactory 不可用'); + return; + } + + const currentWarehouseId = this.getCurrentWarehouseId(); + if (!currentWarehouseId) return; + + for (const [ exceptionText, orderIds ] of failedOrdersByReason.entries()) { + const failedDispatchIds = (Array.isArray(orderIds) ? orderIds : []) + .map(id => Number(id)) + .filter(id => dispatchOrderIdSet.has(id)); + + if (failedDispatchIds.length === 0) continue; + + this.ctx.logger.info('[ExpressService.writeDispatchOrderFlags] 准备写入 order_flag: ids=%s reason=%s', + failedDispatchIds.join(','), exceptionText); + + try { + const dispatchModel = await dispatchFactory.getDispatchModel(currentWarehouseId); + if (dispatchModel && typeof dispatchModel.update === 'function') { + await dispatchModel.update({ + order_flag: exceptionText, + updated_at: new Date(), + }, { + where: { + id: { [Op.in]: failedDispatchIds }, + status: { [Op.ne]: 'cancel' }, + }, + transaction, + }); + this.ctx.logger.info('[ExpressService.writeDispatchOrderFlags] 写入成功 ids=%s', failedDispatchIds.join(',')); + } + } catch (err) { + this.ctx.logger.warn('[ExpressService.writeDispatchOrderFlags] 写入 dispatch order_flag 失败: %s', + err && err.message ? err.message : err); + } + } + } + /** * 将运单异步后处理失败订单批量回写为错误状态。 * @@ -703,6 +777,10 @@ class ExpressService extends Service { status: { [Op.ne]: 'cancel', }, + // 保护配送中(step=4)订单不被回退为异常状态 + step: { + [Op.ne]: 4, + }, }, }); } @@ -2342,6 +2420,7 @@ class ExpressService extends Service { * @param {Object} [options] 可选配置。 * @param {boolean} [options.awaitTasks=false] 是否等待所有异步任务完成后再返回。 * @param {Function} [options.onBatchComplete] 单批完成回调 ({ processed, total })。 + * @param {number} [options.warehouseId] 仓库ID覆盖值,用于 setImmediate 等异步上下文中 ctx.user 不可用的场景。 * @return {Promise} 处理结果,包含 orders、waybill_codes 和 skippedOrders。 */ async createWaybillCodePipeline(orders = [], options = {}) { @@ -2358,7 +2437,7 @@ class ExpressService extends Service { waveIds: orderList.slice(0, 50).map(order => Number(order && order.wave_id)).filter(waveId => Number.isFinite(waveId) && waveId > 0), }); - const warehouseId = this.getCurrentWarehouseId(); + const warehouseId = Number(options.warehouseId) > 0 ? Number(options.warehouseId) : this.getCurrentWarehouseId(); const orderDeliveryModel = await this.getWaybillAsyncOrderDeliveryModel(warehouseId); @@ -2370,23 +2449,52 @@ class ExpressService extends Service { throw new Error('订单主表模型未初始化'); } - // 【step1】先按订单ID和业务键筛选 wms_order_express,找出已存在的快递记录,避免重复创建。 - const orders_arr = await orderDeliveryModel.findAll({ + // 【step1】先按订单ID和业务键筛选,找出已存在的快递记录,避免重复创建。 + // 先从 current 表查;若存在未覆盖的 order_id,再从 dispatch 表补查(配送中订单可能已迁移) + const inputOrderIds = orderList.map(order => Number(order && order.order_id)).filter(orderId => Number.isFinite(orderId) && orderId > 0); + const currentOrders = await orderDeliveryModel.findAll({ where: { - id: orderList.map(order => Number(order && order.order_id)).filter(orderId => Number.isFinite(orderId) && orderId > 0), + id: inputOrderIds, warehouse_id: warehouseId, step: { - [Op.in]: [ 1, 2, 3 ], + [Op.in]: [ 1, 2, 3, 4 ], }, }, attributes: [ 'id', 'sys_platform_code', 'logistics_code', 'sys_platform_name', 'logistics_name', 'store_id' ], raw: true, }); + + // 补查 dispatch 表:获取 current 表未覆盖的 order_id + const currentCoveredIds = new Set((Array.isArray(currentOrders) ? currentOrders : []).map(o => Number(o.id))); + const uncoveredIds = inputOrderIds.filter(id => !currentCoveredIds.has(id)); + let dispatchOrders = []; + if (uncoveredIds.length > 0) { + const dispatchModel = this.ctx.model && this.ctx.model.OrderDeliveryFactory + ? await this.ctx.model.OrderDeliveryFactory.getDispatchModel(warehouseId) + : null; + if (dispatchModel && typeof dispatchModel.findAll === 'function') { + dispatchOrders = await dispatchModel.findAll({ + where: { + id: uncoveredIds, + warehouse_id: warehouseId, + step: { + [Op.in]: [ 4 ], + }, + }, + attributes: [ 'id', 'sys_platform_code', 'logistics_code', 'sys_platform_name', 'logistics_name', 'store_id' ], + raw: true, + }); + } + } + + const orders_arr = [ ...(Array.isArray(currentOrders) ? currentOrders : []), ...dispatchOrders ]; this.ctx.logger.info('[ExpressService.createWaybillCodePipeline] 订单筛选结果', { traceId, warehouseId, inputOrderCount: orderList.length, - matchedOrderCount: Array.isArray(orders_arr) ? orders_arr.length : 0, + currentCount: (Array.isArray(currentOrders) ? currentOrders : []).length, + dispatchCount: dispatchOrders.length, + matchedOrderCount: orders_arr.length, }); // 【step1.5】过滤已分配运单号(status=1)且传入 business_key=1 的订单,避免重复分配。 @@ -2438,14 +2546,26 @@ class ExpressService extends Service { return { message: '所有订单均已分配运单号,无需处理' }; } - // orders_arr和orderList合并 - const ordersWithExpress = filteredOrdersArr.map(order => { - const matchedExpress = orderList.find(express => Number(order.id) === Number(express.order_id)); - return { - ...order, - business_key: matchedExpress ? matchedExpress.business_key : 1, - }; - }); + // orders_arr和orderList合并:同一 order_id 在 orderList 中可能有多条(不同 business_key), + // 需要展开为多条 ordersWithExpress,不能用 find() 只取第一条 + const ordersWithExpress = []; + for (const order of filteredOrdersArr) { + const matchingExpresses = orderList.filter(express => Number(order.id) === Number(express.order_id)); + if (matchingExpresses.length > 0) { + for (const express of matchingExpresses) { + ordersWithExpress.push({ + ...order, + business_key: express.business_key || 1, + }); + } + } else { + // 兜底:orderList 中无对应记录,business_key 默认为 1 + ordersWithExpress.push({ + ...order, + business_key: 1, + }); + } + } const platformList = await this.service.systems.platform.getPlatformList(true, true); const printPlatformCodeMap = await this.loadWaybillPrintPlatformCodeMap(platformList); const requestPlatformCodeMap = await this.loadWaybillAsyncRequestPlatformCodeMap(platformList); @@ -2750,7 +2870,69 @@ class ExpressService extends Service { include: orderDeliveryInclude, transaction, }); - const orderDeliveryMap = this.buildWaybillOrderDeliveryMap(orderDeliveryRows); + + // 补查 dispatch 表:配送中订单可能已迁移,current 表未覆盖的从 dispatch 补齐 + const currentCoveredOrderIds = new Set( + (Array.isArray(orderDeliveryRows) ? orderDeliveryRows : []).map(row => Number(row && row.id)) + ); + const uncoveredOrderIds = normalizedOrders + .map(o => o.order_id) + .filter(id => !currentCoveredOrderIds.has(id)); + let dispatchOrderDeliveryRows = []; + if (uncoveredOrderIds.length > 0) { + ctx.logger.info('[ExpressService.createWaybillCode] dispatch 补查 uncoveredOrderIds=%s', + [ ...new Set(uncoveredOrderIds) ].join(',')); + const dispatchModel = orderDeliveryFactory && typeof orderDeliveryFactory.getDispatchModel === 'function' + ? await orderDeliveryFactory.getDispatchModel(currentWarehouseId) + : null; + if (dispatchModel && typeof dispatchModel.findAll === 'function') { + // dispatch 表 items 关联可能不同,去掉 include 避免关联查询报错 + dispatchOrderDeliveryRows = await dispatchModel.findAll({ + attributes: WAYBILL_ORDER_DELIVERY_MIN_ATTRIBUTES, + where: { + id: { [Op.in]: uncoveredOrderIds }, + }, + transaction, + }); + ctx.logger.info('[ExpressService.createWaybillCode] dispatch 补查结果 count=%d', + dispatchOrderDeliveryRows.length); + + // 补查 dispatch 表的商品明细(物流 API 需要 items 信息) + if (dispatchOrderDeliveryRows.length > 0) { + const dispatchItemsFactory = ctx.model && ctx.model.OrderItemsFactory; + const dispatchItemsModel = dispatchItemsFactory && typeof dispatchItemsFactory.getDispatchModel === 'function' + ? await dispatchItemsFactory.getDispatchModel(currentWarehouseId) + : null; + if (dispatchItemsModel && typeof dispatchItemsModel.findAll === 'function') { + const dispatchOrderIds = dispatchOrderDeliveryRows.map(row => Number(row.id)).filter(id => id > 0); + const dispatchItems = await dispatchItemsModel.findAll({ + where: { order_id: { [Op.in]: dispatchOrderIds } }, + attributes: [ 'id', 'order_id', 'item_code', 'item_name', 'plan_qty', 'source_order_code' ], + raw: true, + transaction, + }); + // 将 items 以 Sequelize include 格式附加到 dispatch 行上 + if (Array.isArray(dispatchItems) && dispatchItems.length > 0) { + const itemsByOrderId = new Map(); + for (const item of dispatchItems) { + const oid = Number(item.order_id); + if (!itemsByOrderId.has(oid)) itemsByOrderId.set(oid, []); + itemsByOrderId.get(oid).push(item); + } + for (const row of dispatchOrderDeliveryRows) { + const oid = Number(row.id); + row.orderItems = itemsByOrderId.get(oid) || []; + } + } + } + } + } else { + ctx.logger.warn('[ExpressService.createWaybillCode] dispatch 模型不可用'); + } + } + + const allOrderDeliveryRows = [ ...(Array.isArray(orderDeliveryRows) ? orderDeliveryRows : []), ...dispatchOrderDeliveryRows ]; + const orderDeliveryMap = this.buildWaybillOrderDeliveryMap(allOrderDeliveryRows); const existingCompletedRows = await orderExpressModel.findAll({ where: { @@ -2787,7 +2969,7 @@ class ExpressService extends Service { const { relationGroupMap, missingOrderIds, - } = this.buildWaybillCreateRelationGroups(pendingOrders, orderDeliveryRows, currentWarehouseId); + } = this.buildWaybillCreateRelationGroups(pendingOrders, allOrderDeliveryRows, currentWarehouseId); const relationWhereList = Array.from(relationGroupMap.values()).map(group => ({ store_id: group.store_id, @@ -2828,6 +3010,16 @@ class ExpressService extends Service { // 【step5】事务内统一回写失败订单异常,避免成功与失败状态分离。 await this.writeWaybillOrderExceptions(orderDeliveryModel, failedOrdersByReason, transaction); + // 补写 dispatch 表 order_flag:dispatch 订单的异常信息需单独写(current 表写不到) + if (dispatchOrderDeliveryRows.length > 0 && failedOrdersByReason.size > 0) { + try { + await this.writeDispatchOrderFlags(dispatchOrderDeliveryRows, failedOrdersByReason, transaction); + } catch (dispatchFlagErr) { + ctx.logger.warn('[ExpressService.createWaybillCode] 补写 dispatch order_flag 失败: %s', + dispatchFlagErr && dispatchFlagErr.message ? dispatchFlagErr.message : dispatchFlagErr); + } + } + if (balanceWarnings.length > 0) { ctx.logger.warn('[ExpressService.createWaybillCode] 余额不足但允许超额分配: %s', balanceWarnings.join(';')); } @@ -2896,17 +3088,28 @@ class ExpressService extends Service { .filter(orderId => Number.isFinite(orderId) && orderId > 0))); if (successOrderIds.length > 0) { - await orderDeliveryModel.update({ - step: 2, - updated_at: new Date(), - }, { - where: { - id: { - [Op.in]: successOrderIds, + // 仅对非配送中(step != 4)的订单更新 step 为 2;配送中订单保持 step 不变 + const step4OrderIdSet = new Set(); + for (const orderId of successOrderIds) { + const orderRow = orderDeliveryMap.get(orderId); + if (orderRow && Number(orderRow.step) === 4) { + step4OrderIdSet.add(orderId); + } + } + const stepUpdatableIds = successOrderIds.filter(id => !step4OrderIdSet.has(id)); + if (stepUpdatableIds.length > 0) { + await orderDeliveryModel.update({ + step: 2, + updated_at: new Date(), + }, { + where: { + id: { + [Op.in]: stepUpdatableIds, + }, }, - }, - transaction, - }); + transaction, + }); + } } } @@ -2931,12 +3134,24 @@ class ExpressService extends Service { continue; } + ctx.logger.info('[DEBUG] rowsToCreate order', JSON.stringify({ + order_id: order.order_id, + store_id: order.store_id, + has_delivery: !!order.order_delivery, + delivery_store_id: order.order_delivery && order.order_delivery.store_id, + delivery_doc: order.order_delivery && order.order_delivery.delivery_order_code, + })); + rowsToCreate.push({ order_id: order.order_id, business_key: order.business_key, status: 0, retry_count: 0, warehouse_id: this.getCurrentWarehouseId(), + store_id: order.store_id || null, + logistics_code: (listByWarehousePlatformCode && listByWarehousePlatformCode.sys_express_code) || '', + delivery_order_code: (orderDeliveryMap.get(order.order_id) && orderDeliveryMap.get(order.order_id).delivery_order_code) || null, + source_order_codes: (orderDeliveryMap.get(order.order_id) && orderDeliveryMap.get(order.order_id).source_order_codes) || null, }); } diff --git a/app/service/systems/express_platform.js b/app/service/systems/express_platform.js index 72c3eea..bc5871f 100644 --- a/app/service/systems/express_platform.js +++ b/app/service/systems/express_platform.js @@ -614,6 +614,17 @@ class ExpressPlatformService extends MainService { }, }); const ExpressList = await this.service.systems.express.loadExpressList(); + const sysExpressName = (ExpressList.find(item => item.code === listByWarehousePlatformCode.sys_express_code) || {}).name || ''; + const orderDataMap = new Map(); + for (const order_tmp of normalizedOrders) { + const od = order_tmp && order_tmp.order_delivery; + if (!od) continue; + orderDataMap.set(`${od.id}_${order_tmp.business_key}`, { + delivery_order_code: od.delivery_order_code || '', + source_order_codes: od.source_order_codes || '', + store_id: od.store_id || 0, + }); + } const orderExpressModel = this.ctx.model && this.ctx.model.OrderExpress; const allocatedWaybillMap = new Map(); if (orderExpressModel && typeof orderExpressModel.findAll === 'function') { @@ -943,9 +954,12 @@ class ExpressPlatformService extends MainService { encryptprintinfo: item.encryptprintinfo, ...this.buildOrderExpressVerPatch([ item.ver ]), create_at: new Date(), - logistics_code: listByWarehousePlatformCode.logistics_code || '', + delivery_order_code: orderDataMap.get(`${order_id}_${business_key}`)?.delivery_order_code || null, + source_order_codes: orderDataMap.get(`${order_id}_${business_key}`)?.source_order_codes || null, + store_id: orderDataMap.get(`${order_id}_${business_key}`)?.store_id || null, + logistics_code: listByWarehousePlatformCode.sys_express_code || '', logistics_interface_id: listByWarehousePlatformCode.id || null, - logistics_name: listByWarehousePlatformCode.logistics_name || '', + logistics_name: sysExpressName || '', logistics_interface_name: listByWarehousePlatformCode.name || '', platform_code: listByWarehousePlatformCode.platform_code || '', status: 1, @@ -975,9 +989,12 @@ class ExpressPlatformService extends MainService { encryptprintinfo: item.encryptprintinfo, ...this.buildOrderExpressVerPatch([ item.ver ]), create_at: new Date(), - logistics_code: listByWarehousePlatformCode.logistics_code || '', + delivery_order_code: orderDataMap.get(`${order_id}_${business_key}`)?.delivery_order_code || null, + source_order_codes: orderDataMap.get(`${order_id}_${business_key}`)?.source_order_codes || null, + store_id: orderDataMap.get(`${order_id}_${business_key}`)?.store_id || null, + logistics_code: listByWarehousePlatformCode.sys_express_code || '', logistics_interface_id: listByWarehousePlatformCode.id || null, - logistics_name: listByWarehousePlatformCode.logistics_name || '', + logistics_name: sysExpressName || '', logistics_interface_name: listByWarehousePlatformCode.name || '', platform_code: listByWarehousePlatformCode.platform_code || '', status: 1, @@ -1088,9 +1105,12 @@ class ExpressPlatformService extends MainService { encryptedtoken, ...this.buildOrderExpressVerPatch([ item && item.ver ]), create_at: new Date(), - logistics_code: listByWarehousePlatformCode.logistics_code || '', + delivery_order_code: orderDataMap.get(`${order_id}_${business_key}`)?.delivery_order_code || null, + source_order_codes: orderDataMap.get(`${order_id}_${business_key}`)?.source_order_codes || null, + store_id: orderDataMap.get(`${order_id}_${business_key}`)?.store_id || null, + logistics_code: listByWarehousePlatformCode.sys_express_code || '', logistics_interface_id: listByWarehousePlatformCode.id || null, - logistics_name: listByWarehousePlatformCode.logistics_name || '', + logistics_name: sysExpressName || '', logistics_interface_name: listByWarehousePlatformCode.name || '', platform_code: listByWarehousePlatformCode.platform_code || '', status: 1, @@ -1122,9 +1142,12 @@ class ExpressPlatformService extends MainService { encryptprintinfo: item.encryptprintinfo, ...this.buildOrderExpressVerPatch([ item.ver ]), create_at: new Date(), - logistics_code: listByWarehousePlatformCode.logistics_code || '', + delivery_order_code: orderDataMap.get(`${order_id}_${business_key}`)?.delivery_order_code || null, + source_order_codes: orderDataMap.get(`${order_id}_${business_key}`)?.source_order_codes || null, + store_id: orderDataMap.get(`${order_id}_${business_key}`)?.store_id || null, + logistics_code: listByWarehousePlatformCode.sys_express_code || '', logistics_interface_id: listByWarehousePlatformCode.id || null, - logistics_name: listByWarehousePlatformCode.logistics_name || '', + logistics_name: sysExpressName || '', logistics_interface_name: listByWarehousePlatformCode.name || '', platform_code: listByWarehousePlatformCode.platform_code || '', status: 1, @@ -1186,9 +1209,12 @@ class ExpressPlatformService extends MainService { encryptedtoken, ...this.buildOrderExpressVerPatch([ ver ]), create_at: new Date(), - logistics_code: listByWarehousePlatformCode.logistics_code || '', + delivery_order_code: orderDataMap.get(`${order_id}_${business_key}`)?.delivery_order_code || null, + source_order_codes: orderDataMap.get(`${order_id}_${business_key}`)?.source_order_codes || null, + store_id: orderDataMap.get(`${order_id}_${business_key}`)?.store_id || null, + logistics_code: listByWarehousePlatformCode.sys_express_code || '', logistics_interface_id: listByWarehousePlatformCode.id || null, - logistics_name: listByWarehousePlatformCode.logistics_name || '', + logistics_name: sysExpressName || '', logistics_interface_name: listByWarehousePlatformCode.name || '', platform_code: listByWarehousePlatformCode.platform_code || '', status: 1, @@ -1218,9 +1244,12 @@ class ExpressPlatformService extends MainService { encryptprintinfo: item.encryptprintinfo, ...this.buildOrderExpressVerPatch([ item.ver ]), create_at: new Date(), - logistics_code: listByWarehousePlatformCode.logistics_code || '', + delivery_order_code: orderDataMap.get(`${order_id}_${business_key}`)?.delivery_order_code || null, + source_order_codes: orderDataMap.get(`${order_id}_${business_key}`)?.source_order_codes || null, + store_id: orderDataMap.get(`${order_id}_${business_key}`)?.store_id || null, + logistics_code: listByWarehousePlatformCode.sys_express_code || '', logistics_interface_id: listByWarehousePlatformCode.id || null, - logistics_name: listByWarehousePlatformCode.logistics_name || '', + logistics_name: sysExpressName || '', logistics_interface_name: listByWarehousePlatformCode.name || '', platform_code: listByWarehousePlatformCode.platform_code || '', status: 1, @@ -1251,9 +1280,12 @@ class ExpressPlatformService extends MainService { encryptedtoken: item.encryptedtoken, ...this.buildOrderExpressVerPatch([ item.ver ]), create_at: new Date(), - logistics_code: listByWarehousePlatformCode.logistics_code || '', + delivery_order_code: orderDataMap.get(`${order_id}_${business_key}`)?.delivery_order_code || null, + source_order_codes: orderDataMap.get(`${order_id}_${business_key}`)?.source_order_codes || null, + store_id: orderDataMap.get(`${order_id}_${business_key}`)?.store_id || null, + logistics_code: listByWarehousePlatformCode.sys_express_code || '', logistics_interface_id: listByWarehousePlatformCode.id || null, - logistics_name: listByWarehousePlatformCode.logistics_name || '', + logistics_name: sysExpressName || '', logistics_interface_name: listByWarehousePlatformCode.name || '', platform_code: listByWarehousePlatformCode.platform_code || '', status: 1, @@ -1626,6 +1658,18 @@ class ExpressPlatformService extends MainService { const normalizedTemplateUrl = isValidCainiaoTemplateUrl(listByWarehousePlatformCode.template_url) ? String(listByWarehousePlatformCode.template_url).trim() : DEFAULT_CAINIAO_TEMPLATE_URL; + const ExpressList = await this.service.systems.express.loadExpressList(); + const sysExpressName = (ExpressList.find(item => item.code === listByWarehousePlatformCode.sys_express_code) || {}).name || ''; + const orderDataMap = new Map(); + for (const order_tmp of normalizedOrders) { + const od = order_tmp && order_tmp.order_delivery; + if (!od) continue; + orderDataMap.set(`${od.id}_${order_tmp.business_key}`, { + delivery_order_code: od.delivery_order_code || '', + source_order_codes: od.source_order_codes || '', + store_id: od.store_id || 0, + }); + } if (!appKey || !appSecret) { throw new Error('淘宝接口配置缺失'); } @@ -1851,9 +1895,12 @@ class ExpressPlatformService extends MainService { encryptprintinfo: encryptPrintInfo, ...orderExpressVerPatch, create_at: new Date(), - logistics_code: listByWarehousePlatformCode.logistics_code || '', + delivery_order_code: orderDataMap.get(`${orderId}_${businessKey}`)?.delivery_order_code || null, + source_order_codes: orderDataMap.get(`${orderId}_${businessKey}`)?.source_order_codes || null, + store_id: orderDataMap.get(`${orderId}_${businessKey}`)?.store_id || null, + logistics_code: listByWarehousePlatformCode.sys_express_code || '', logistics_interface_id: listByWarehousePlatformCode.id || null, - logistics_name: listByWarehousePlatformCode.logistics_name || '', + logistics_name: sysExpressName || '', logistics_interface_name: listByWarehousePlatformCode.name || '', platform_code: listByWarehousePlatformCode.platform_code || '', status: 1, @@ -2213,6 +2260,18 @@ class ExpressPlatformService extends MainService { } = data && typeof data === 'object' ? data : {}; const normalizedOrders = Array.isArray(orders) ? orders : []; const normalizedExtData = this.normalizePddExtData(listByWarehousePlatformCode.ext_data); + const ExpressList = await this.service.systems.express.loadExpressList(); + const sysExpressName = (ExpressList.find(item => item.code === listByWarehousePlatformCode.sys_express_code) || {}).name || ''; + const orderDataMap = new Map(); + for (const order_tmp of normalizedOrders) { + const od = order_tmp && order_tmp.order_delivery; + if (!od) continue; + orderDataMap.set(`${od.id}_${order_tmp.business_key}`, { + delivery_order_code: od.delivery_order_code || '', + source_order_codes: od.source_order_codes || '', + store_id: od.store_id || 0, + }); + } console.log('拼多多平台接口入参', data); @@ -2386,9 +2445,12 @@ class ExpressPlatformService extends MainService { parsedPrintData && parsedPrintData.data && parsedPrintData.data.ver, ]), create_at: new Date(), - logistics_code: listByWarehousePlatformCode.logistics_code || '', + delivery_order_code: orderDataMap.get(`${orderId}_${businessKey}`)?.delivery_order_code || null, + source_order_codes: orderDataMap.get(`${orderId}_${businessKey}`)?.source_order_codes || null, + store_id: orderDataMap.get(`${orderId}_${businessKey}`)?.store_id || null, + logistics_code: listByWarehousePlatformCode.sys_express_code || '', logistics_interface_id: listByWarehousePlatformCode.id || null, - logistics_name: listByWarehousePlatformCode.logistics_name || '', + logistics_name: sysExpressName || '', logistics_interface_name: listByWarehousePlatformCode.name || '', platform_code: listByWarehousePlatformCode.platform_code || '', status: 1,