1) 修正 F47D8CC 的漏提:那次只提交了「补查其它域名」的调用侧
(`for (const host of hosts) await scanHost(host);`),把 `const scanHost = async host => {`
的定义留在了工作区,HEAD 上 `listOrders` 会 ReferenceError。本次一并补齐,HEAD 与工作区一致。
2) 面单打印字段按平台口径区分(WMS 侧联调结论):
- 快手(KS):printinfo = encryptedData,encryptprintinfo / key = 逐单密钥(原口径不变)
- 菜鸟系(TB / TM / TGC / 1688):平台 printInfo 为空,菜鸟打印只认整包 JSON
`{ encryptedData, signature, ver, templateURL }`,按该形态回拼 printinfo;
templateURL 取 `contents[0].templateURL`
- 其它平台:printinfo 原样用平台下发数据
- `extractDocumentContents` 增加 template_url 字段(缺失时为空串)
3) 单测:printPlatformDgj.test.js 覆盖 template_url 解析与淘宝/快手/其它平台三种口径,
test/app/lib 73 passing;eslint 干净
4) 文档:WMS-OMS-取号对接.md 追加 WMS 侧核实记录(快手 printinfo 未落库的报文缺字段结论、
打印数据形态兼容、菜鸟 templateURL 模板要求与对账表)
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
177 lines
6.7 KiB
JavaScript
177 lines
6.7 KiB
JavaScript
'use strict';
|
||
|
||
const { assert } = require('egg-mock/bootstrap');
|
||
const DgjService = require('../../../app/lib/printPlatform/dgj');
|
||
|
||
describe('printPlatform/dgj isOrderFinished', () => {
|
||
const base = { ErpState: 'waitsellersend', PrintState: 0, LogisticStatus: 0, WaybillCodes: [] };
|
||
|
||
it('ErpState 为 sended / success / close 时判定为已处理', () => {
|
||
for (const state of [ 'sended', 'success', 'close', 'SENDED', 'Closed' ]) {
|
||
assert.strictEqual(DgjService.isOrderFinished({ ...base, ErpState: state }), true, state);
|
||
}
|
||
});
|
||
|
||
it('待发货且没有任何发货证据时保留(需要处理)', () => {
|
||
assert.strictEqual(DgjService.isOrderFinished(base), false);
|
||
});
|
||
|
||
it('有 OnlineSendTime 时判定为已发货', () => {
|
||
assert.strictEqual(DgjService.isOrderFinished({ ...base, OnlineSendTime: '2026-11-02 10:00:00' }), true);
|
||
});
|
||
|
||
it('面单包裹 IsSended=true 时判定为已发货', () => {
|
||
assert.strictEqual(
|
||
DgjService.isOrderFinished({ ...base, WaybillCodes: [{ WaybillCode: '770', IsSended: false }, { WaybillCode: '771', IsSended: true }] }),
|
||
true
|
||
);
|
||
});
|
||
|
||
it('LogisticStatus > 0 时判定为已发货', () => {
|
||
assert.strictEqual(DgjService.isOrderFinished({ ...base, LogisticStatus: 2 }), true);
|
||
});
|
||
|
||
it('只打印了面单、未发货(PrintState=1 且有 ExpressPrintTime)时仍需要处理', () => {
|
||
assert.strictEqual(
|
||
DgjService.isOrderFinished({ ...base, PrintState: 1, ExpressPrintTime: '2026-11-02 10:00:00' }),
|
||
false
|
||
);
|
||
});
|
||
|
||
it('状态字段缺失时不误判', () => {
|
||
assert.strictEqual(DgjService.isOrderFinished({}), false);
|
||
assert.strictEqual(DgjService.isOrderFinished(null), false);
|
||
});
|
||
});
|
||
|
||
describe('printPlatform/dgj extractPrintHistoryIds', () => {
|
||
it('解析真实 ExpressPrint 响应的 PrintHistoryIds(打印记录ID)', () => {
|
||
const printed = {
|
||
Data: {
|
||
PrintHistoryIds: [
|
||
{ Id: 10000078656002, Pid: '3316997317085033076', WaybillCode: '9823617121121', WaybillCodeChild: null, BatchIndex: 1 },
|
||
],
|
||
WaybillCode: [{ WaybillCode: '9823617121121', WaybillCodeId: 10000298258339 }],
|
||
},
|
||
};
|
||
const list = DgjService.extractPrintHistoryIds(printed);
|
||
console.log('打印记录:', JSON.stringify(list));
|
||
assert.deepStrictEqual(list, [
|
||
{ id: '10000078656002', pid: '3316997317085033076', waybill_code: '9823617121121', batch_index: 1 },
|
||
]);
|
||
});
|
||
|
||
it('多包裹按顺序返回,缺失数据不炸', () => {
|
||
const printed = { Data: { PrintHistoryIds: [{ Id: 1, Pid: 'a', WaybillCode: 'W1', BatchIndex: 1 }, { Id: 2, WaybillCode: 'W2' }, null, {}] } };
|
||
const list = DgjService.extractPrintHistoryIds(printed);
|
||
assert.deepStrictEqual(list, [
|
||
{ id: '1', pid: 'a', waybill_code: 'W1', batch_index: 1 },
|
||
{ id: '2', pid: '', waybill_code: 'W2', batch_index: null },
|
||
]);
|
||
});
|
||
|
||
it('没有该字段时返回空数组', () => {
|
||
assert.deepStrictEqual(DgjService.extractPrintHistoryIds({ Data: {} }), []);
|
||
assert.deepStrictEqual(DgjService.extractPrintHistoryIds(null), []);
|
||
});
|
||
});
|
||
|
||
describe('printPlatform/dgj extractDocumentContents', () => {
|
||
it('快手单据要取出逐单密钥 key 与密文 encryptedData', () => {
|
||
const document = {
|
||
contents: [{
|
||
encryptedData: 'A1B2C3D4'.repeat(400),
|
||
key: 'MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQ==',
|
||
signature: 'MEQCIB',
|
||
ver: '1',
|
||
templateURL: 'https://example.com/t.json',
|
||
}],
|
||
};
|
||
const contents = DgjService.extractDocumentContents(document);
|
||
assert.strictEqual(contents.encryptprintinfo, 'A1B2C3D4'.repeat(400));
|
||
assert.strictEqual(contents.key, 'MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQ==');
|
||
assert.strictEqual(contents.signature, 'MEQCIB');
|
||
assert.strictEqual(contents.ver, '1');
|
||
assert.strictEqual(contents.template_url, 'https://example.com/t.json');
|
||
});
|
||
|
||
it('没有 contents 时各字段为空串', () => {
|
||
assert.deepStrictEqual(DgjService.extractDocumentContents(null), {
|
||
signature: '', encryptprintinfo: '', key: '', template_url: '', ver: '',
|
||
});
|
||
assert.deepStrictEqual(DgjService.extractDocumentContents({ printInfo: 'x' }), {
|
||
signature: '', encryptprintinfo: '', key: '', template_url: '', ver: '',
|
||
});
|
||
});
|
||
});
|
||
|
||
describe('printPlatform/dgj buildWaybillPrintFields', () => {
|
||
const contents = {
|
||
signature: 'MD:xNFhrlrQ7keXD+RciHKOWA==',
|
||
encryptprintinfo: 'AES:rU904rj6UH2oqfSUb43+Z199',
|
||
key: 'PER_ORDER_KEY',
|
||
template_url: 'http://cloudprint.cainiao.com/template/standard/304351',
|
||
ver: 'waybill_print_secret_version_1',
|
||
};
|
||
|
||
it('快手:printinfo 用 encryptedData,encryptprintinfo/key 都用逐单密钥', () => {
|
||
const fields = DgjService.buildWaybillPrintFields({
|
||
platformCode: 'KS',
|
||
contents,
|
||
documentPrintInfo: '',
|
||
});
|
||
assert.deepStrictEqual(fields, {
|
||
printinfo: 'AES:rU904rj6UH2oqfSUb43+Z199',
|
||
encryptprintinfo: 'PER_ORDER_KEY',
|
||
key: 'PER_ORDER_KEY',
|
||
});
|
||
});
|
||
|
||
it('快手:没有 encryptedData 时回退平台下发的 printInfo', () => {
|
||
const fields = DgjService.buildWaybillPrintFields({
|
||
platformCode: 'KS',
|
||
contents: { ...contents, encryptprintinfo: '' },
|
||
documentPrintInfo: 'PLAIN_PRINT_DATA',
|
||
});
|
||
assert.strictEqual(fields.printinfo, 'PLAIN_PRINT_DATA');
|
||
assert.strictEqual(fields.key, 'PER_ORDER_KEY');
|
||
});
|
||
|
||
it('淘宝:printinfo 回拼菜鸟整包 JSON(含模板地址),encryptprintinfo 仍是密文', () => {
|
||
const fields = DgjService.buildWaybillPrintFields({
|
||
platformCode: 'TB',
|
||
contents,
|
||
documentPrintInfo: '',
|
||
});
|
||
assert.deepStrictEqual(JSON.parse(fields.printinfo), {
|
||
encryptedData: 'AES:rU904rj6UH2oqfSUb43+Z199',
|
||
signature: 'MD:xNFhrlrQ7keXD+RciHKOWA==',
|
||
ver: 'waybill_print_secret_version_1',
|
||
templateURL: 'http://cloudprint.cainiao.com/template/standard/304351',
|
||
});
|
||
assert.strictEqual(fields.encryptprintinfo, 'AES:rU904rj6UH2oqfSUb43+Z199');
|
||
});
|
||
|
||
it('淘宝:平台已下发 printInfo 时保持原值,不覆盖', () => {
|
||
const fields = DgjService.buildWaybillPrintFields({
|
||
platformCode: 'TB',
|
||
contents,
|
||
documentPrintInfo: 'PLAIN_PRINT_DATA',
|
||
});
|
||
assert.strictEqual(fields.printinfo, 'PLAIN_PRINT_DATA');
|
||
});
|
||
|
||
it('其它平台:printinfo 原样,encryptprintinfo 仍是密文', () => {
|
||
const fields = DgjService.buildWaybillPrintFields({
|
||
platformCode: 'PDD',
|
||
contents,
|
||
documentPrintInfo: 'PLAIN_PRINT_DATA',
|
||
});
|
||
assert.deepStrictEqual(fields, {
|
||
printinfo: 'PLAIN_PRINT_DATA',
|
||
encryptprintinfo: 'AES:rU904rj6UH2oqfSUb43+Z199',
|
||
key: 'PER_ORDER_KEY',
|
||
});
|
||
});
|
||
});
|