1
This commit is contained in:
parent
608d7741c1
commit
9fca81e7b5
@ -391,14 +391,26 @@ class DeliveryOrderService extends Service {
|
||||
* @return {Promise<string>} 系统快递编码,未命中时返回空字符串。
|
||||
*/
|
||||
async resolveExpressCodeFromSetting(logisticsCode, warehouseId) {
|
||||
const expressSetting = await this.resolveExpressSettingSnapshot(logisticsCode, warehouseId);
|
||||
return String(expressSetting && expressSetting.expressCode || '').trim();
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过快递设置表读取快递映射快照。
|
||||
*
|
||||
* @param {string} logisticsCode 外部快递编码。
|
||||
* @param {number|string} warehouseId 仓库ID。
|
||||
* @return {Promise<Object|null>} 命中的快递设置快照,未命中返回 null。
|
||||
*/
|
||||
async resolveExpressSettingSnapshot(logisticsCode, warehouseId) {
|
||||
const normalizedLogisticsCode = String(logisticsCode || '').trim();
|
||||
if (!normalizedLogisticsCode) {
|
||||
return '';
|
||||
return null;
|
||||
}
|
||||
|
||||
const expressSettingModel = this.ctx.model && this.ctx.model.ExpressSetting;
|
||||
if (!expressSettingModel || typeof expressSettingModel.findOne !== 'function') {
|
||||
return '';
|
||||
return null;
|
||||
}
|
||||
|
||||
const where = {
|
||||
@ -410,21 +422,55 @@ class DeliveryOrderService extends Service {
|
||||
}
|
||||
|
||||
const expressSetting = await expressSettingModel.findOne({
|
||||
attributes: [ 'express_code' ],
|
||||
attributes: [ 'code', 'name', 'express_code' ],
|
||||
where,
|
||||
raw: true,
|
||||
});
|
||||
|
||||
return String(expressSetting && expressSetting.express_code || '').trim();
|
||||
if (!expressSetting) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return {
|
||||
code: String(expressSetting.code || normalizedLogisticsCode).trim(),
|
||||
name: String(expressSetting.name || '').trim(),
|
||||
expressCode: String(expressSetting.express_code || '').trim(),
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* 解析是否启用外部快递编码。
|
||||
*
|
||||
* 优先级:显式值 -> policy_config -> storeSubjectConfig,均未提供时默认关闭。
|
||||
*
|
||||
* @param {Object} storeSubjectConfig 货主签约配置。
|
||||
* @param {Object} policyConfig 仓库策略配置。
|
||||
* @param {any} explicitValue 显式指定值。
|
||||
* @return {boolean} 是否启用外部快递编码。
|
||||
*/
|
||||
resolveEnableExternalExpressCode(storeSubjectConfig, policyConfig = {}, explicitValue = undefined) {
|
||||
if (explicitValue !== undefined) {
|
||||
return this.normalizePolicyFlag(explicitValue);
|
||||
}
|
||||
|
||||
if (policyConfig && Object.prototype.hasOwnProperty.call(policyConfig, 'enable_external_express_code')) {
|
||||
return this.normalizePolicyFlag(policyConfig.enable_external_express_code);
|
||||
}
|
||||
|
||||
if (storeSubjectConfig && Object.prototype.hasOwnProperty.call(storeSubjectConfig, 'enable_external_express_code')) {
|
||||
return this.normalizePolicyFlag(storeSubjectConfig.enable_external_express_code);
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* 解析订单快递快照。
|
||||
*
|
||||
* 优先级:
|
||||
* 1. 直接匹配 wms_express.code;
|
||||
* 2. 再按 wms_express_setting.code + warehouse_id 读取 express_code 映射为系统快递编码;
|
||||
* 3. 最后才回退货主默认 express code。
|
||||
* 1. 先读取是否启用外部快递编码开关;
|
||||
* 2. 开关关闭时,直接使用货主默认快递回填四个快递字段;
|
||||
* 3. 开关开启时,先匹配 wms_express_setting,再匹配 wms_express,最后回退货主默认快递。
|
||||
*
|
||||
* @param {string} logisticsCode 外部快递编码。
|
||||
* @param {Object} storeSubjectConfig 货主签约配置。
|
||||
@ -436,40 +482,67 @@ class DeliveryOrderService extends Service {
|
||||
const expressList = await this.ctx.service.systems.express.getExpressList();
|
||||
const externalCode = String(logisticsCode || '').trim();
|
||||
const defaultCode = String(storeSubjectConfig && storeSubjectConfig.default_express_code || '').trim();
|
||||
const fallbackExpress = this.findCodeOption(expressList, defaultCode);
|
||||
const fallbackLogisticsCode = String(
|
||||
fallbackExpress && (fallbackExpress.code || fallbackExpress.value || fallbackExpress.express_code || defaultCode)
|
||||
|| defaultCode
|
||||
|| ''
|
||||
).trim();
|
||||
const fallbackLogisticsName = this.getOptionName(fallbackExpress);
|
||||
const explicitEnableExternalExpressCode = info && Object.prototype.hasOwnProperty.call(info, 'enableExternalExpressCode')
|
||||
? info.enableExternalExpressCode
|
||||
: undefined;
|
||||
const policyConfig = info && info.policyConfig && typeof info.policyConfig === 'object'
|
||||
? info.policyConfig
|
||||
: {};
|
||||
const isEnableExternalExpressCode = this.resolveEnableExternalExpressCode(
|
||||
storeSubjectConfig,
|
||||
policyConfig,
|
||||
explicitEnableExternalExpressCode
|
||||
);
|
||||
|
||||
if (!isEnableExternalExpressCode) {
|
||||
return {
|
||||
logisticsCode: fallbackLogisticsCode,
|
||||
logisticsName: fallbackLogisticsName,
|
||||
sysLogisticsCode: fallbackLogisticsCode,
|
||||
sysLogisticsName: fallbackLogisticsName,
|
||||
};
|
||||
}
|
||||
|
||||
const expressSetting = await this.resolveExpressSettingSnapshot(externalCode, info.warehouseId);
|
||||
if (expressSetting) {
|
||||
const matchedSysExpress = this.findCodeOption(expressList, expressSetting.expressCode);
|
||||
const matchedSysLogisticsCode = String(
|
||||
matchedSysExpress && (matchedSysExpress.code || matchedSysExpress.value || matchedSysExpress.express_code || expressSetting.expressCode)
|
||||
|| expressSetting.expressCode
|
||||
|| ''
|
||||
).trim();
|
||||
const matchedSysLogisticsName = this.getOptionName(matchedSysExpress);
|
||||
|
||||
return {
|
||||
logisticsCode: String(expressSetting.code || externalCode).trim(),
|
||||
logisticsName: String(expressSetting.name || '').trim(),
|
||||
sysLogisticsCode: matchedSysLogisticsCode,
|
||||
sysLogisticsName: matchedSysLogisticsName,
|
||||
};
|
||||
}
|
||||
|
||||
const matchedExpress = this.findCodeOption(expressList, externalCode);
|
||||
|
||||
if (matchedExpress) {
|
||||
return {
|
||||
sysLogisticsCode: String(matchedExpress.express_code || matchedExpress.code || matchedExpress.value || externalCode).trim(),
|
||||
sysLogisticsName: this.getOptionName(matchedExpress),
|
||||
};
|
||||
}
|
||||
|
||||
const expressSettingCode = await this.resolveExpressCodeFromSetting(externalCode, info.warehouseId);
|
||||
if (expressSettingCode) {
|
||||
const fallbackExpress = this.findCodeOption(expressList, expressSettingCode);
|
||||
if (fallbackExpress) {
|
||||
this.ctx.logger.warn('[DeliveryOrderService.prepareOrderData] invalid logistics code fallback to express setting mapping', {
|
||||
deliveryOrderCode: info.deliveryOrderCode,
|
||||
warehouseId: info.warehouseId,
|
||||
storeId: info.storeId,
|
||||
logisticsCode: externalCode,
|
||||
expressSettingCode,
|
||||
});
|
||||
|
||||
return {
|
||||
sysLogisticsCode: String(fallbackExpress.express_code || fallbackExpress.code || fallbackExpress.value || expressSettingCode).trim(),
|
||||
sysLogisticsName: this.getOptionName(fallbackExpress),
|
||||
};
|
||||
}
|
||||
const matchedLogisticsCode = String(
|
||||
matchedExpress.code || matchedExpress.value || matchedExpress.express_code || externalCode
|
||||
).trim();
|
||||
const matchedLogisticsName = this.getOptionName(matchedExpress);
|
||||
|
||||
return {
|
||||
sysLogisticsCode: expressSettingCode,
|
||||
sysLogisticsName: '',
|
||||
logisticsCode: matchedLogisticsCode,
|
||||
logisticsName: matchedLogisticsName,
|
||||
sysLogisticsCode: matchedLogisticsCode,
|
||||
sysLogisticsName: matchedLogisticsName,
|
||||
};
|
||||
}
|
||||
|
||||
const fallbackExpress = this.findCodeOption(expressList, defaultCode);
|
||||
if (fallbackExpress) {
|
||||
this.ctx.logger.warn('[DeliveryOrderService.prepareOrderData] invalid logistics code fallback to store default', {
|
||||
deliveryOrderCode: info.deliveryOrderCode,
|
||||
@ -486,8 +559,10 @@ class DeliveryOrderService extends Service {
|
||||
);
|
||||
|
||||
return {
|
||||
sysLogisticsCode: String(fallbackExpress.express_code || fallbackExpress.code || fallbackExpress.value || defaultCode).trim(),
|
||||
sysLogisticsName: this.getOptionName(fallbackExpress),
|
||||
logisticsCode: fallbackLogisticsCode,
|
||||
logisticsName: fallbackLogisticsName,
|
||||
sysLogisticsCode: fallbackLogisticsCode,
|
||||
sysLogisticsName: fallbackLogisticsName,
|
||||
};
|
||||
}
|
||||
|
||||
@ -500,8 +575,10 @@ class DeliveryOrderService extends Service {
|
||||
});
|
||||
|
||||
return {
|
||||
sysLogisticsCode: defaultCode || externalCode,
|
||||
sysLogisticsName: '',
|
||||
logisticsCode: fallbackLogisticsCode,
|
||||
logisticsName: fallbackLogisticsName,
|
||||
sysLogisticsCode: fallbackLogisticsCode,
|
||||
sysLogisticsName: fallbackLogisticsName,
|
||||
};
|
||||
}
|
||||
|
||||
@ -903,7 +980,6 @@ class DeliveryOrderService extends Service {
|
||||
arAmount,
|
||||
gotAmount,
|
||||
logisticsCode,
|
||||
logisticsName,
|
||||
expressCode,
|
||||
logisticsAreaCode,
|
||||
isUrgency,
|
||||
@ -912,6 +988,8 @@ class DeliveryOrderService extends Service {
|
||||
} = 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, {
|
||||
deliveryOrderCode,
|
||||
warehouseId: info.warehouseId,
|
||||
@ -921,6 +999,8 @@ class DeliveryOrderService extends Service {
|
||||
deliveryOrderCode,
|
||||
warehouseId: info.warehouseId,
|
||||
storeId: info.storeId,
|
||||
policyConfig,
|
||||
enableExternalExpressCode,
|
||||
}, operationLogs);
|
||||
const resolvedOperatorName = await this.resolveOperatorName(operatorName, createChannel, info);
|
||||
|
||||
@ -951,8 +1031,8 @@ class DeliveryOrderService extends Service {
|
||||
freight: freight ? parseFloat(freight) : 0,
|
||||
ar_amount: arAmount ? parseFloat(arAmount) : 0,
|
||||
got_amount: gotAmount ? parseFloat(gotAmount) : 0,
|
||||
logistics_code: logisticsCode || '',
|
||||
logistics_name: logisticsName || '',
|
||||
logistics_code: expressSnapshot.logisticsCode,
|
||||
logistics_name: expressSnapshot.logisticsName,
|
||||
sys_logistics_code: expressSnapshot.sysLogisticsCode,
|
||||
sys_logistics_name: expressSnapshot.sysLogisticsName,
|
||||
express_code: expressCode || '',
|
||||
|
||||
@ -24,6 +24,23 @@ describe('test/app/service/systems/delivery_order.auditStatus.test.js', () => {
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Mock ExpressSetting.findOne,兼容固定返回值或函数实现。
|
||||
*
|
||||
* @param {Function|any} implOrValue mock 实现或返回值。
|
||||
*/
|
||||
function mockExpressSettingFindOne(implOrValue) {
|
||||
const findOneImpl = typeof implOrValue === 'function'
|
||||
? implOrValue
|
||||
: async () => implOrValue;
|
||||
mm(ctx, 'model', {
|
||||
...(ctx.model || {}),
|
||||
ExpressSetting: {
|
||||
findOne: findOneImpl,
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
beforeEach(() => {
|
||||
ctx = app.mockContext();
|
||||
deliveryOrderService = ctx.service.systems.deliveryOrder;
|
||||
@ -108,12 +125,12 @@ describe('test/app/service/systems/delivery_order.auditStatus.test.js', () => {
|
||||
});
|
||||
|
||||
// 1. Test with step = 0
|
||||
const preparedDataPending = await deliveryOrderService.prepareOrderData(deliveryOrder, info, 0);
|
||||
const preparedDataPending = await deliveryOrderService.prepareOrderData(deliveryOrder, info, 'MANUAL', 0);
|
||||
assert.ok(preparedDataPending, 'preparedDataPending should not be null');
|
||||
assert.equal(preparedDataPending.step, 0, 'step should be 0');
|
||||
|
||||
// 2. Test with step = 1
|
||||
const preparedDataApproved = await deliveryOrderService.prepareOrderData(deliveryOrder, info, 1);
|
||||
const preparedDataApproved = await deliveryOrderService.prepareOrderData(deliveryOrder, info, 'MANUAL', 1);
|
||||
assert.ok(preparedDataApproved, 'preparedDataApproved should not be null');
|
||||
assert.equal(preparedDataApproved.step, 1, 'step should be 1');
|
||||
assert.equal(preparedDataApproved.source_platform_code, 'TAOBAO');
|
||||
@ -161,15 +178,15 @@ describe('test/app/service/systems/delivery_order.auditStatus.test.js', () => {
|
||||
{ code: 'YTO', name: '圆通' },
|
||||
]));
|
||||
|
||||
const firstPrepared = await deliveryOrderService.prepareOrderData(deliveryOrder, info, 1);
|
||||
const secondPrepared = await deliveryOrderService.prepareOrderData(deliveryOrder, info, 1);
|
||||
const firstPrepared = await deliveryOrderService.prepareOrderData(deliveryOrder, info, 'MANUAL', 1);
|
||||
const secondPrepared = await deliveryOrderService.prepareOrderData(deliveryOrder, info, 'MANUAL', 1);
|
||||
|
||||
assert.equal(firstPrepared.source_platform_code, 'TAOBAO');
|
||||
assert.equal(firstPrepared.source_platform_name, '外部平台');
|
||||
assert.equal(firstPrepared.sys_platform_code, 'TAOBAO');
|
||||
assert.equal(firstPrepared.sys_platform_name, '淘宝');
|
||||
assert.equal(firstPrepared.logistics_code, 'INVALID_EXPRESS');
|
||||
assert.equal(firstPrepared.logistics_name, '外部快递');
|
||||
assert.equal(firstPrepared.logistics_code, 'STO');
|
||||
assert.equal(firstPrepared.logistics_name, '申通');
|
||||
assert.equal(firstPrepared.sys_logistics_code, 'STO');
|
||||
assert.equal(firstPrepared.sys_logistics_name, '申通');
|
||||
assert.equal(firstPrepared.express_code, 'YT');
|
||||
@ -286,12 +303,18 @@ describe('test/app/service/systems/delivery_order.auditStatus.test.js', () => {
|
||||
};
|
||||
|
||||
mm(ctx.service.systems.express, 'getExpressList', async () => ([
|
||||
{ code: 'STO', name: '顺丰', value: 'STO', label: '顺丰' },
|
||||
{ code: 'SF-SETTING', name: 'SF-SETTING (顺丰)', value: 'SF-SETTING', label: 'SF-SETTING (顺丰)', express_code: 'STO', warehouse_id: 100000 },
|
||||
{ code: 'SF', name: '顺丰', value: 'SF', label: '顺丰' },
|
||||
{ code: 'STO', name: '申通', value: 'STO', label: '申通' },
|
||||
]));
|
||||
mockExpressSettingFindOne(async () => ({
|
||||
code: 'SF-SETTING',
|
||||
name: 'SF-SETTING (顺丰)',
|
||||
express_code: 'SF',
|
||||
}));
|
||||
|
||||
const snapshot = await deliveryOrderService.resolveExpressSnapshot('SF-SETTING', {
|
||||
default_express_code: 'TB',
|
||||
enable_external_express_code: 1,
|
||||
}, {
|
||||
warehouseId: info.warehouseId,
|
||||
deliveryOrderCode: deliveryOrder.deliveryOrderCode,
|
||||
@ -299,8 +322,133 @@ describe('test/app/service/systems/delivery_order.auditStatus.test.js', () => {
|
||||
});
|
||||
|
||||
assert.deepEqual(snapshot, {
|
||||
sysLogisticsCode: 'STO',
|
||||
sysLogisticsName: 'SF-SETTING (顺丰)',
|
||||
logisticsCode: 'SF-SETTING',
|
||||
logisticsName: 'SF-SETTING (顺丰)',
|
||||
sysLogisticsCode: 'SF',
|
||||
sysLogisticsName: '顺丰',
|
||||
});
|
||||
});
|
||||
|
||||
it('should use store default express for all fields when external express switch is disabled', async () => {
|
||||
mm(ctx.service.systems.express, 'getExpressList', async () => ([
|
||||
{ code: 'STO', name: '申通' },
|
||||
{ code: 'YTO', name: '圆通' },
|
||||
]));
|
||||
mockExpressSettingFindOne(async () => ({
|
||||
code: 'OUT-YTO',
|
||||
name: '外部圆通',
|
||||
express_code: 'YTO',
|
||||
}));
|
||||
|
||||
const snapshot = await deliveryOrderService.resolveExpressSnapshot('OUT-YTO', {
|
||||
default_express_code: 'STO',
|
||||
enable_external_express_code: 0,
|
||||
}, {
|
||||
warehouseId: 100000,
|
||||
storeId: 1000000,
|
||||
});
|
||||
|
||||
assert.deepEqual(snapshot, {
|
||||
logisticsCode: 'STO',
|
||||
logisticsName: '申通',
|
||||
sysLogisticsCode: 'STO',
|
||||
sysLogisticsName: '申通',
|
||||
});
|
||||
});
|
||||
|
||||
it('should use external express fields when switch is enabled and setting is missed but express exists', async () => {
|
||||
mm(ctx.service.systems.express, 'getExpressList', async () => ([
|
||||
{ code: 'STO', name: '申通' },
|
||||
{ code: 'JD', name: '京东快递' },
|
||||
]));
|
||||
mockExpressSettingFindOne(async () => null);
|
||||
|
||||
const snapshot = await deliveryOrderService.resolveExpressSnapshot('JD', {
|
||||
default_express_code: 'STO',
|
||||
enable_external_express_code: true,
|
||||
}, {
|
||||
warehouseId: 100000,
|
||||
storeId: 1000000,
|
||||
});
|
||||
|
||||
assert.deepEqual(snapshot, {
|
||||
logisticsCode: 'JD',
|
||||
logisticsName: '京东快递',
|
||||
sysLogisticsCode: 'JD',
|
||||
sysLogisticsName: '京东快递',
|
||||
});
|
||||
});
|
||||
|
||||
it('should fallback to default express when switch is enabled and no setting and no express match', async () => {
|
||||
mm(ctx.service.systems.express, 'getExpressList', async () => ([
|
||||
{ code: 'STO', name: '申通' },
|
||||
]));
|
||||
mockExpressSettingFindOne(async () => null);
|
||||
|
||||
const snapshot = await deliveryOrderService.resolveExpressSnapshot('UNKNOWN', {
|
||||
default_express_code: 'STO',
|
||||
enable_external_express_code: '1',
|
||||
}, {
|
||||
warehouseId: 100000,
|
||||
storeId: 1000000,
|
||||
});
|
||||
|
||||
assert.deepEqual(snapshot, {
|
||||
logisticsCode: 'STO',
|
||||
logisticsName: '申通',
|
||||
sysLogisticsCode: 'STO',
|
||||
sysLogisticsName: '申通',
|
||||
});
|
||||
});
|
||||
|
||||
it('should assign all logistics fields from express snapshot in prepareOrderData', async () => {
|
||||
const deliveryOrder = {
|
||||
deliveryOrderCode: 'TEST_ORDER_006',
|
||||
sourcePlatformCode: 'TAOBAO',
|
||||
logisticsCode: 'OUT-X',
|
||||
logisticsName: '外部X',
|
||||
receiverInfo: { name: 'test' },
|
||||
};
|
||||
const info = {
|
||||
storeId: 1000000,
|
||||
warehouseId: 100000,
|
||||
};
|
||||
|
||||
mm(ctx, 'model', {
|
||||
...(ctx.model || {}),
|
||||
Store: {
|
||||
async findByPk() {
|
||||
return {
|
||||
id: 1000000,
|
||||
subject_config: {
|
||||
default_platform_code: 'TB',
|
||||
default_express_code: 'STO',
|
||||
},
|
||||
};
|
||||
},
|
||||
},
|
||||
});
|
||||
mm(ctx.service.systems.platform, 'getPlatformList', async () => ([
|
||||
{ code: 'TAOBAO', name: '淘宝' },
|
||||
{ code: 'TB', name: '淘宝默认' },
|
||||
]));
|
||||
mm(ctx.service.systems.storeWarehouse, 'getContractConfig', async () => ({
|
||||
policy_config: {
|
||||
enable_external_express_code: 1,
|
||||
},
|
||||
}));
|
||||
mm(deliveryOrderService, 'resolveExpressSnapshot', async () => ({
|
||||
logisticsCode: 'SETTING-CODE',
|
||||
logisticsName: '设置快递',
|
||||
sysLogisticsCode: 'SYS-CODE',
|
||||
sysLogisticsName: '系统快递',
|
||||
}));
|
||||
|
||||
const prepared = await deliveryOrderService.prepareOrderData(deliveryOrder, info, 'MANUAL', 1);
|
||||
|
||||
assert.equal(prepared.logistics_code, 'SETTING-CODE');
|
||||
assert.equal(prepared.logistics_name, '设置快递');
|
||||
assert.equal(prepared.sys_logistics_code, 'SYS-CODE');
|
||||
assert.equal(prepared.sys_logistics_name, '系统快递');
|
||||
});
|
||||
});
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user