fix(deliveryOrder): 货主默认配置统一读取合约 policy_config,移除对 wms_store.subject_config 的错误依赖
- prepareOrderData 不再调用 getStoreSubjectConfig(storeId) 读取死数据 - resolveExpressSnapshot: 默认快递编码统一从合约 policy_config 读取 - resolvePlatformSnapshot: 兜底平台编码只走合约 policy_config - resolveEnableExternalExpressCode: 移除 storeSubjectConfig 死数据兜底 - 仓库级 getStoreSubjectConfig(warehouseId) 保留(有 warehouse setting 更新入口)
This commit is contained in:
parent
5759c1fb19
commit
f747e73aea
@ -318,11 +318,11 @@ class DeliveryOrderService extends Service {
|
||||
* 优先级:
|
||||
* 1. 先匹配平台列表里的基础平台项;
|
||||
* 2. 再匹配平台列表里的系统设置项;
|
||||
* 3. 兜底:签约策略 default_platform_code(货主-仓库级)→ 货主 subject_config.default_platform_code。
|
||||
* 3. 兜底:合约 policy_config.default_platform_code。
|
||||
*
|
||||
* @param {string} sourcePlatformCode 外部平台编码。
|
||||
* @param {Object} storeSubjectConfig 货主签约配置。
|
||||
* @param {Object} [policyConfig={}] 货主-仓库签约策略配置。
|
||||
* @param {Object} storeSubjectConfig 合约 policy_config。
|
||||
* @param {Object} [policyConfig={}] 合约策略配置。
|
||||
* @param {Object} [info={}] 上下文信息。
|
||||
* @param {Array<Object>} [operationLogs=[]] 待写入的操作日志数组。
|
||||
* @return {Promise<Object>} 平台快照。
|
||||
@ -350,7 +350,7 @@ class DeliveryOrderService extends Service {
|
||||
sourcePlatformCode: externalCode,
|
||||
});
|
||||
|
||||
// 兜底优先级:签约策略(货主-仓库级)→ 货主 subject_config
|
||||
// 兜底优先级:合约 policy_config
|
||||
const policyDefaultCode = String(policyConfig && policyConfig.default_platform_code || '').trim();
|
||||
const ownerDefaultCode = String(storeSubjectConfig && storeSubjectConfig.default_platform_code || '').trim();
|
||||
const defaultCode = policyDefaultCode || ownerDefaultCode;
|
||||
@ -458,10 +458,10 @@ class DeliveryOrderService extends Service {
|
||||
/**
|
||||
* 解析是否启用外部快递编码。
|
||||
*
|
||||
* 优先级:显式值 -> policy_config -> storeSubjectConfig,均未提供时默认关闭。
|
||||
* 优先级:显式值 -> policy_config,均未提供时默认关闭。
|
||||
*
|
||||
* @param {Object} storeSubjectConfig 货主签约配置。
|
||||
* @param {Object} policyConfig 仓库策略配置。
|
||||
* @param {Object} storeSubjectConfig 合约 policy_config(与 policyConfig 同源)。
|
||||
* @param {Object} policyConfig 合约策略配置。
|
||||
* @param {any} explicitValue 显式指定值。
|
||||
* @return {boolean} 是否启用外部快递编码。
|
||||
*/
|
||||
@ -484,17 +484,15 @@ class DeliveryOrderService extends Service {
|
||||
/**
|
||||
* 解析订单快递快照。
|
||||
*
|
||||
* 默认快递编码优先级:
|
||||
* 1. storeSubjectConfig.default_express_code(货主级,个性化配置)
|
||||
* 2. policyConfig.default_express_code(仓库级,通用配置)
|
||||
* 默认快递编码统一从合约 policy_config 读取。
|
||||
*
|
||||
* 分支路由:
|
||||
* 1. 先读取是否启用外部快递编码开关;
|
||||
* 2. 开关关闭时,直接使用上述优先级的默认快递回填四个快递字段;
|
||||
* 2. 开关关闭时,直接使用合约默认快递回填四个快递字段;
|
||||
* 3. 开关开启时,先匹配 wms_express_setting,再匹配 wms_express,最后回退默认快递。
|
||||
*
|
||||
* @param {string} logisticsCode 外部快递编码。
|
||||
* @param {Object} storeSubjectConfig 货主签约配置。
|
||||
* @param {Object} storeSubjectConfig 合约 policy_config。
|
||||
* @param {Object} [info={}] 上下文信息,可含 policyConfig / enableExternalExpressCode / warehouseId。
|
||||
* @param {Array<Object>} [operationLogs=[]] 待写入的操作日志数组。
|
||||
* @return {Promise<Object>} 快递快照。
|
||||
@ -503,12 +501,15 @@ class DeliveryOrderService extends Service {
|
||||
const expressList = await this.ctx.service.systems.express.getExpressList();
|
||||
const externalCode = String(logisticsCode || '').trim();
|
||||
|
||||
// 货主 subject_config 优先于仓库 policy_config(货主个性配置高于仓库通用配置)
|
||||
// 默认快递编码统一从合约 policy_config 读取
|
||||
const policyConfig = info && info.policyConfig && typeof info.policyConfig === 'object'
|
||||
? info.policyConfig
|
||||
: {};
|
||||
const contractConfig = storeSubjectConfig && typeof storeSubjectConfig === 'object'
|
||||
? storeSubjectConfig
|
||||
: {};
|
||||
const defaultCode = String(
|
||||
(storeSubjectConfig && storeSubjectConfig.default_express_code)
|
||||
contractConfig.default_express_code
|
||||
|| policyConfig.default_express_code
|
||||
|| ''
|
||||
).trim();
|
||||
@ -1051,15 +1052,14 @@ class DeliveryOrderService extends Service {
|
||||
receiverInfo,
|
||||
} = deliveryOrder;
|
||||
|
||||
const storeSubjectConfig = await this.getStoreSubjectConfig(info.storeId);
|
||||
const policyConfig = await this.getStoreWarehousePolicyConfig(info.storeId, info.warehouseId);
|
||||
const enableExternalExpressCode = this.resolveEnableExternalExpressCode(storeSubjectConfig, policyConfig);
|
||||
const platformSnapshot = await this.resolvePlatformSnapshot(sourcePlatformCode, storeSubjectConfig, policyConfig, {
|
||||
const enableExternalExpressCode = this.resolveEnableExternalExpressCode(policyConfig, policyConfig);
|
||||
const platformSnapshot = await this.resolvePlatformSnapshot(sourcePlatformCode, policyConfig, policyConfig, {
|
||||
deliveryOrderCode,
|
||||
warehouseId: info.warehouseId,
|
||||
storeId: info.storeId,
|
||||
}, operationLogs);
|
||||
const expressSnapshot = await this.resolveExpressSnapshot(logisticsCode, storeSubjectConfig, {
|
||||
const expressSnapshot = await this.resolveExpressSnapshot(logisticsCode, policyConfig, {
|
||||
deliveryOrderCode,
|
||||
warehouseId: info.warehouseId,
|
||||
storeId: info.storeId,
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user