From 59019e07a67fe280d19767241d0cbf3a51585d82 Mon Sep 17 00:00:00 2001 From: liufumingren Date: Fri, 21 Aug 2026 02:20:36 +0800 Subject: [PATCH] =?UTF-8?q?feat(deliveryOrder):=20=E5=BF=AB=E9=80=92?= =?UTF-8?q?=E8=A7=A3=E6=9E=90=E5=BF=AB=E7=85=A7=E4=B8=8E=E7=AD=96=E7=95=A5?= =?UTF-8?q?=E6=BC=8F=E6=96=97=E8=B0=83=E6=95=B4=E3=80=81=E6=89=8B=E5=8A=A8?= =?UTF-8?q?=E5=8D=95=E5=BA=93=E5=AD=98=E5=BD=92=E5=B1=9E=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - resolveExpressSnapshot 全路径补日志与回退快递名称, 未匹配也写快递回退操作日志 - enable_external_express_code 开启时跳过快递策略漏斗, 保留外部匹配/兜底结果 - 手动单直接传 stock_id 时校验库存归属货主, 跨货主库存拒绝下单 --- app/service/systems/delivery_order.js | 80 +++++++++++++++++++++++++-- 1 file changed, 76 insertions(+), 4 deletions(-) diff --git a/app/service/systems/delivery_order.js b/app/service/systems/delivery_order.js index eef7854..a893e93 100644 --- a/app/service/systems/delivery_order.js +++ b/app/service/systems/delivery_order.js @@ -533,7 +533,24 @@ class DeliveryOrderService extends Service { explicitEnableExternalExpressCode ); + this.ctx.logger.info('[DeliveryOrderService.resolveExpressSnapshot] 快递解析开始', { + deliveryOrderCode: info.deliveryOrderCode, + warehouseId: info.warehouseId, + storeId: info.storeId, + logisticsCode: externalCode, + enableExternalExpressCode: isEnableExternalExpressCode, + defaultExpressCode: defaultCode, + }); + if (!isEnableExternalExpressCode) { + this.ctx.logger.info('[DeliveryOrderService.resolveExpressSnapshot] 未启用外部快递编码,直接使用默认快递', { + deliveryOrderCode: info.deliveryOrderCode, + logisticsCode: externalCode, + matched: false, + fallbackLogisticsCode, + fallbackLogisticsName, + }); + return { logisticsCode: fallbackLogisticsCode, logisticsName: fallbackLogisticsName, @@ -553,6 +570,17 @@ class DeliveryOrderService extends Service { ).trim(); const matchedSysLogisticsName = this.getOptionName(matchedSysExpress); + this.ctx.logger.info('[DeliveryOrderService.resolveExpressSnapshot] 外部快递编码命中 wms_express_setting 映射', { + deliveryOrderCode: info.deliveryOrderCode, + logisticsCode: externalCode, + matched: true, + source: 'wms_express_setting', + mappedLogisticsCode: String(expressSetting.code || externalCode).trim(), + mappedLogisticsName: String(expressSetting.name || '').trim(), + sysLogisticsCode: matchedSysLogisticsCode, + sysLogisticsName: matchedSysLogisticsName, + }); + return { logisticsCode: String(expressSetting.code || externalCode).trim(), logisticsName: String(expressSetting.name || '').trim(), @@ -570,6 +598,15 @@ class DeliveryOrderService extends Service { ).trim(); const matchedLogisticsName = this.getOptionName(matchedExpress); + this.ctx.logger.info('[DeliveryOrderService.resolveExpressSnapshot] 外部快递编码命中系统快递列表', { + deliveryOrderCode: info.deliveryOrderCode, + logisticsCode: externalCode, + matched: true, + source: 'wms_express', + matchedLogisticsCode, + matchedLogisticsName, + }); + return { logisticsCode: matchedLogisticsCode, logisticsName: matchedLogisticsName, @@ -579,18 +616,21 @@ class DeliveryOrderService extends Service { }; } if (fallbackExpress) { - this.ctx.logger.warn('[DeliveryOrderService.prepareOrderData] invalid logistics code fallback to store default', { + this.ctx.logger.warn('[DeliveryOrderService.resolveExpressSnapshot] 快递编码未匹配到任何快递,兜底为默认快递', { deliveryOrderCode: info.deliveryOrderCode, warehouseId: info.warehouseId, storeId: info.storeId, logisticsCode: externalCode, + matched: false, + fallbackLogisticsCode, + fallbackLogisticsName, defaultExpressCode: defaultCode, }); this.appendOrderOperationLog( operationLogs, ORDER_OPERATION_CODES.EXPRESS_FALLBACK, - `快递编码${externalCode}匹配不到快递,已转为默认快递:${this.getOptionName(fallbackExpress) || defaultCode}` + `快递编码${externalCode}匹配不到快递,已转为默认快递:${fallbackLogisticsName || fallbackLogisticsCode}` ); return { @@ -602,14 +642,23 @@ class DeliveryOrderService extends Service { }; } - this.ctx.logger.warn('[DeliveryOrderService.prepareOrderData] express default not found in express service list', { + this.ctx.logger.warn('[DeliveryOrderService.resolveExpressSnapshot] 默认快递不在快递列表中,使用全局兜底快递', { deliveryOrderCode: info.deliveryOrderCode, warehouseId: info.warehouseId, storeId: info.storeId, logisticsCode: externalCode, + matched: false, + fallbackLogisticsCode, + fallbackLogisticsName, defaultExpressCode: defaultCode, }); + this.appendOrderOperationLog( + operationLogs, + ORDER_OPERATION_CODES.EXPRESS_FALLBACK, + `快递编码${externalCode}匹配不到快递,兜底快递:${fallbackLogisticsName || fallbackLogisticsCode}` + ); + return { logisticsCode: fallbackLogisticsCode, logisticsName: fallbackLogisticsName, @@ -748,10 +797,22 @@ class DeliveryOrderService extends Service { }; // ===== 快递绑定策略漏斗匹配(items 处理后 weight 可用) ===== + // enable_external_express_code 开启时以外部快递匹配结果为准(匹配不到已在 resolveExpressSnapshot 兜底默认快递),跳过策略漏斗覆盖 try { + const funnelPolicyConfig = await this.getStoreWarehousePolicyConfig(info.storeId, info.warehouseId); + const enableExternalExpressCode = this.resolveEnableExternalExpressCode(funnelPolicyConfig, funnelPolicyConfig); + if (enableExternalExpressCode) { + ctx.logger.info('[ExpressPolicyMatch] enable_external_express_code 开启,跳过快递策略漏斗,保留外部快递匹配或兜底结果', { + orderId, + orderCode: deliveryOrder.deliveryOrderCode, + logisticsCode: orderData.logistics_code, + sysLogisticsCode: orderData.sys_logistics_code, + }); + } const receiverInfo = deliveryOrder.receiverInfo; const shopNick = deliveryOrder.shopNick; - const hasEnoughData = shopNick || (receiverInfo && (receiverInfo.province || receiverInfo.city)); + const hasEnoughData = !enableExternalExpressCode + && (shopNick || (receiverInfo && (receiverInfo.province || receiverInfo.city))); if (hasEnoughData) { const address = [ @@ -1422,6 +1483,17 @@ class DeliveryOrderService extends Service { gross_weight: 0, }; } + + // 手工单直接传仓库 stock_id:校验库存记录归属当前货主,禁止跨货主下单 + const stockWarehouseRecord = await app.model.StockWarehouse.findByPk(line.stockId, { + attributes: [ 'id', 'store_id' ], + transaction, + raw: true, + }); + if (stockWarehouseRecord && Number(stockWarehouseRecord.store_id) !== Number(storeId)) { + errors.push(`商品《${line.itemName}》编码《${line.itemCode}》\n库存归属货主(store_id=${stockWarehouseRecord.store_id})与当前货主(store_id=${storeId})不一致,无法创建订单`); + continue; + } } else if (!line.itemId) { // 查找唯一键(appKey 为空时不作为条件,兼容内部手动建单场景) const stockWhere = {