feat(deliveryOrder): 快递解析快照与策略漏斗调整、手动单库存归属校验
- resolveExpressSnapshot 全路径补日志与回退快递名称, 未匹配也写快递回退操作日志 - enable_external_express_code 开启时跳过快递策略漏斗, 保留外部匹配/兜底结果 - 手动单直接传 stock_id 时校验库存归属货主, 跨货主库存拒绝下单
This commit is contained in:
parent
e0b2cf3030
commit
59019e07a6
@ -533,7 +533,24 @@ class DeliveryOrderService extends Service {
|
|||||||
explicitEnableExternalExpressCode
|
explicitEnableExternalExpressCode
|
||||||
);
|
);
|
||||||
|
|
||||||
|
this.ctx.logger.info('[DeliveryOrderService.resolveExpressSnapshot] 快递解析开始', {
|
||||||
|
deliveryOrderCode: info.deliveryOrderCode,
|
||||||
|
warehouseId: info.warehouseId,
|
||||||
|
storeId: info.storeId,
|
||||||
|
logisticsCode: externalCode,
|
||||||
|
enableExternalExpressCode: isEnableExternalExpressCode,
|
||||||
|
defaultExpressCode: defaultCode,
|
||||||
|
});
|
||||||
|
|
||||||
if (!isEnableExternalExpressCode) {
|
if (!isEnableExternalExpressCode) {
|
||||||
|
this.ctx.logger.info('[DeliveryOrderService.resolveExpressSnapshot] 未启用外部快递编码,直接使用默认快递', {
|
||||||
|
deliveryOrderCode: info.deliveryOrderCode,
|
||||||
|
logisticsCode: externalCode,
|
||||||
|
matched: false,
|
||||||
|
fallbackLogisticsCode,
|
||||||
|
fallbackLogisticsName,
|
||||||
|
});
|
||||||
|
|
||||||
return {
|
return {
|
||||||
logisticsCode: fallbackLogisticsCode,
|
logisticsCode: fallbackLogisticsCode,
|
||||||
logisticsName: fallbackLogisticsName,
|
logisticsName: fallbackLogisticsName,
|
||||||
@ -553,6 +570,17 @@ class DeliveryOrderService extends Service {
|
|||||||
).trim();
|
).trim();
|
||||||
const matchedSysLogisticsName = this.getOptionName(matchedSysExpress);
|
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 {
|
return {
|
||||||
logisticsCode: String(expressSetting.code || externalCode).trim(),
|
logisticsCode: String(expressSetting.code || externalCode).trim(),
|
||||||
logisticsName: String(expressSetting.name || '').trim(),
|
logisticsName: String(expressSetting.name || '').trim(),
|
||||||
@ -570,6 +598,15 @@ class DeliveryOrderService extends Service {
|
|||||||
).trim();
|
).trim();
|
||||||
const matchedLogisticsName = this.getOptionName(matchedExpress);
|
const matchedLogisticsName = this.getOptionName(matchedExpress);
|
||||||
|
|
||||||
|
this.ctx.logger.info('[DeliveryOrderService.resolveExpressSnapshot] 外部快递编码命中系统快递列表', {
|
||||||
|
deliveryOrderCode: info.deliveryOrderCode,
|
||||||
|
logisticsCode: externalCode,
|
||||||
|
matched: true,
|
||||||
|
source: 'wms_express',
|
||||||
|
matchedLogisticsCode,
|
||||||
|
matchedLogisticsName,
|
||||||
|
});
|
||||||
|
|
||||||
return {
|
return {
|
||||||
logisticsCode: matchedLogisticsCode,
|
logisticsCode: matchedLogisticsCode,
|
||||||
logisticsName: matchedLogisticsName,
|
logisticsName: matchedLogisticsName,
|
||||||
@ -579,18 +616,21 @@ class DeliveryOrderService extends Service {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
if (fallbackExpress) {
|
if (fallbackExpress) {
|
||||||
this.ctx.logger.warn('[DeliveryOrderService.prepareOrderData] invalid logistics code fallback to store default', {
|
this.ctx.logger.warn('[DeliveryOrderService.resolveExpressSnapshot] 快递编码未匹配到任何快递,兜底为默认快递', {
|
||||||
deliveryOrderCode: info.deliveryOrderCode,
|
deliveryOrderCode: info.deliveryOrderCode,
|
||||||
warehouseId: info.warehouseId,
|
warehouseId: info.warehouseId,
|
||||||
storeId: info.storeId,
|
storeId: info.storeId,
|
||||||
logisticsCode: externalCode,
|
logisticsCode: externalCode,
|
||||||
|
matched: false,
|
||||||
|
fallbackLogisticsCode,
|
||||||
|
fallbackLogisticsName,
|
||||||
defaultExpressCode: defaultCode,
|
defaultExpressCode: defaultCode,
|
||||||
});
|
});
|
||||||
|
|
||||||
this.appendOrderOperationLog(
|
this.appendOrderOperationLog(
|
||||||
operationLogs,
|
operationLogs,
|
||||||
ORDER_OPERATION_CODES.EXPRESS_FALLBACK,
|
ORDER_OPERATION_CODES.EXPRESS_FALLBACK,
|
||||||
`快递编码${externalCode}匹配不到快递,已转为默认快递:${this.getOptionName(fallbackExpress) || defaultCode}`
|
`快递编码${externalCode}匹配不到快递,已转为默认快递:${fallbackLogisticsName || fallbackLogisticsCode}`
|
||||||
);
|
);
|
||||||
|
|
||||||
return {
|
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,
|
deliveryOrderCode: info.deliveryOrderCode,
|
||||||
warehouseId: info.warehouseId,
|
warehouseId: info.warehouseId,
|
||||||
storeId: info.storeId,
|
storeId: info.storeId,
|
||||||
logisticsCode: externalCode,
|
logisticsCode: externalCode,
|
||||||
|
matched: false,
|
||||||
|
fallbackLogisticsCode,
|
||||||
|
fallbackLogisticsName,
|
||||||
defaultExpressCode: defaultCode,
|
defaultExpressCode: defaultCode,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
this.appendOrderOperationLog(
|
||||||
|
operationLogs,
|
||||||
|
ORDER_OPERATION_CODES.EXPRESS_FALLBACK,
|
||||||
|
`快递编码${externalCode}匹配不到快递,兜底快递:${fallbackLogisticsName || fallbackLogisticsCode}`
|
||||||
|
);
|
||||||
|
|
||||||
return {
|
return {
|
||||||
logisticsCode: fallbackLogisticsCode,
|
logisticsCode: fallbackLogisticsCode,
|
||||||
logisticsName: fallbackLogisticsName,
|
logisticsName: fallbackLogisticsName,
|
||||||
@ -748,10 +797,22 @@ class DeliveryOrderService extends Service {
|
|||||||
};
|
};
|
||||||
|
|
||||||
// ===== 快递绑定策略漏斗匹配(items 处理后 weight 可用) =====
|
// ===== 快递绑定策略漏斗匹配(items 处理后 weight 可用) =====
|
||||||
|
// enable_external_express_code 开启时以外部快递匹配结果为准(匹配不到已在 resolveExpressSnapshot 兜底默认快递),跳过策略漏斗覆盖
|
||||||
try {
|
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 receiverInfo = deliveryOrder.receiverInfo;
|
||||||
const shopNick = deliveryOrder.shopNick;
|
const shopNick = deliveryOrder.shopNick;
|
||||||
const hasEnoughData = shopNick || (receiverInfo && (receiverInfo.province || receiverInfo.city));
|
const hasEnoughData = !enableExternalExpressCode
|
||||||
|
&& (shopNick || (receiverInfo && (receiverInfo.province || receiverInfo.city)));
|
||||||
|
|
||||||
if (hasEnoughData) {
|
if (hasEnoughData) {
|
||||||
const address = [
|
const address = [
|
||||||
@ -1422,6 +1483,17 @@ class DeliveryOrderService extends Service {
|
|||||||
gross_weight: 0,
|
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) {
|
} else if (!line.itemId) {
|
||||||
// 查找唯一键(appKey 为空时不作为条件,兼容内部手动建单场景)
|
// 查找唯一键(appKey 为空时不作为条件,兼容内部手动建单场景)
|
||||||
const stockWhere = {
|
const stockWhere = {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user