上一版按「最近一次成功取号记录」取快递编码与面单标识,但同一单可能取过多次号 (每次分配新号,本地库里 dgj-10000267890142_1 就有 4 条不同运单号的记录)。 随便取一条会让发货模板(快递)和 WaybillCodes 面单标识与真正发出的运单号错位, 甚至把别的运单号发到平台。 - externalSendSync.findLatestFetchRecord:按配送单的运单号 (express_codes / express_code)逐条匹配取号记录的 waybill_code / waybill_codes, 主运单优先;运单号对不上返回 null 并 warn,报文宁可不带面单标识也不拿别人的; 订单号 LIKE 前缀匹配转义下划线,避免 `..._1` 误匹配 `..._10` - dgjSendRow:新增 parseOrderWaybills / parseFetchWaybills; pickWaybillFromFetchRecord(raw, waybills) 只取与订单运单号一致的那张; buildSendRow 的 WaybillCodes 只保留本单运单号,LastWaybillCode 以本单运单号为准 - 单测:dgjSendRow 补 3 例(按号选面单 / 对不上不回填 / 运单号清单解析), externalSendTemplate 补 3 例(按号挑记录 / 无匹配返回 null / 多包裹主运单优先) - 文档补匹配口径与实测表 真实库实测:配送单运单 772085332374413 → 记录 #14;改成 772085215446719 → 记录 #13 (不再取最新那条);改成不存在的号 → null + warn。 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
213 lines
8.8 KiB
JavaScript
213 lines
8.8 KiB
JavaScript
'use strict';
|
||
|
||
const { assert } = require('egg-mock/bootstrap');
|
||
const { buildSendRow, pickWaybillFromFetchRecord, toWaybillEntry, parseOrderWaybills } = require('../../../app/lib/dgjSendRow');
|
||
|
||
/**
|
||
* 最小可用的拉单快照(字段名与店管家订单行一致)
|
||
* @param {Object} overrides 覆盖字段
|
||
* @return {Object} 快照
|
||
*/
|
||
function buildSnapshot(overrides = {}) {
|
||
return {
|
||
Id: '10000279877231',
|
||
LogicOrderId: '10000279877231',
|
||
PlatformOrderId: '5127000000000000001',
|
||
PathFlowCode: '10000001527089',
|
||
ShippingType: 'ENCRYPTED_BLOB',
|
||
ShopId: 9560713,
|
||
ShopName: '13668975305(意洁)',
|
||
PlatformType: 'Taobao',
|
||
PlatformTypeName: '淘宝',
|
||
FxUserId: 1227061,
|
||
UpFxUserId: 953516,
|
||
OrderTags: [{ Tag: 'OutChannel', TagValue: 'douyin' }],
|
||
MergeredType: 0,
|
||
ExtField1: '',
|
||
ExtField2: '',
|
||
SellerRemarkFlagTag: '',
|
||
ReceiverIsChange: false,
|
||
IsPddCrossBorderOrder: false,
|
||
IsPddCourierDoorToDoorCollect: false,
|
||
IsOfflineOrder: false,
|
||
DataFlag: 1,
|
||
PayTime: '2026-11-06 19:16:01',
|
||
PrintState: 0,
|
||
WaybillCodes: [],
|
||
SubOrders: [{ OrderItemId: 10000305495583, OrderItemCode: '10000305495583', ProductID: 881526926136, SkuCode: '007' }],
|
||
ToName: '吴*',
|
||
ToPhone: '1**********',
|
||
ToProvince: '湖北省',
|
||
ToCity: '黄冈市',
|
||
ToCounty: '武穴市',
|
||
ToTown: '武穴街道',
|
||
ToAddress: '武穴街道********',
|
||
ToFullAddress: '湖北省黄冈市武穴市武穴街道********',
|
||
...overrides,
|
||
};
|
||
}
|
||
|
||
/** 取号记录(raw_response 是 ExpressPrint 响应) */
|
||
function buildFetchRecord() {
|
||
return {
|
||
express_code: 'STO',
|
||
waybill_code: '770357410089880',
|
||
created_at: new Date('2026-11-07T07:39:45Z'),
|
||
raw_response: JSON.stringify({
|
||
Success: true,
|
||
Data: {
|
||
WaybillCode: [{
|
||
WaybillCode: '770357410089880',
|
||
WaybillCodeId: 10000304201567,
|
||
WaybillCodePid: '8c51d72ab1f_2_1',
|
||
CpCode: 'STO',
|
||
RealCpCode: 'STO',
|
||
WaybillCodeCreateDate: '2026-11-07 07:39:45',
|
||
OrderId: '10000279877231',
|
||
}],
|
||
},
|
||
}),
|
||
};
|
||
}
|
||
|
||
const template = { template_id: '10776786', express_company_code: 'STO', express_company_name: '申通' };
|
||
|
||
describe('lib/dgjSendRow 本地快照拼发货报文', () => {
|
||
it('从快照 + 取号记录拼出订单行(不回读平台)', () => {
|
||
const order = {
|
||
order_no: 'dgj-10000279877231',
|
||
parent_order_no: '10000279877231',
|
||
oaid_order_source_code: '5127000000000000001',
|
||
express_code: 'STO',
|
||
express_codes: JSON.stringify([ '770357410089880' ]),
|
||
receiver: '吴*',
|
||
mobile: '1**********',
|
||
province: '湖北省',
|
||
city: '黄冈市',
|
||
area: '武穴市',
|
||
town: '武穴街道',
|
||
detail_address: '武穴街道********',
|
||
address: '湖北省黄冈市武穴市武穴街道********',
|
||
extend_props: { platform_order_no: '5127000000000000001' },
|
||
};
|
||
const row = buildSendRow({ order, snapshot: buildSnapshot(), fetchRecord: buildFetchRecord(), template });
|
||
console.log('拼装结果:', row.LogicOrderId, row.WaybillCode || row.LastWaybillCode, '| PrintState:', row.PrintState,
|
||
'| 面单:', row.WaybillCodes[0].WaybillCodeId, row.WaybillCodes[0].Pid);
|
||
assert.strictEqual(row.PathFlowCode, '10000001527089');
|
||
assert.strictEqual(row.ShippingType, 'ENCRYPTED_BLOB');
|
||
assert.strictEqual(row.LastWaybillCode, '770357410089880');
|
||
assert.strictEqual(row.PrintState, 1, '取号后应按已打印处理');
|
||
assert.strictEqual(row.UpFxUserId, 953516);
|
||
assert.strictEqual(row.WaybillCodes[0].WaybillCodeId, 10000304201567);
|
||
assert.strictEqual(row.WaybillCodes[0].Pid, '8c51d72ab1f_2_1');
|
||
assert.strictEqual(row.WaybillCodes[0].ExpressCpCode, 'STO');
|
||
});
|
||
|
||
it('收件人以状态表为准(快照可能早于改地址)', () => {
|
||
const order = {
|
||
order_no: 'dgj-1', parent_order_no: '1', express_codes: JSON.stringify([ 'W1' ]),
|
||
receiver: '新收件人', mobile: '13900000000', province: '广东省', city: '广州市', area: '白云区',
|
||
town: '钟落潭镇', detail_address: '新地址', address: '广东省广州市白云区新地址',
|
||
extend_props: {},
|
||
};
|
||
const row = buildSendRow({ order, snapshot: buildSnapshot(), fetchRecord: buildFetchRecord(), template });
|
||
assert.strictEqual(row.ToName, '新收件人');
|
||
assert.strictEqual(row.ToAddress, '新地址');
|
||
});
|
||
|
||
it('没有快照 / 没有运单号时返回 null(上层回退回读平台)', () => {
|
||
assert.strictEqual(buildSendRow({ order: { order_no: 'dgj-1', parent_order_no: '1' }, snapshot: null }), null);
|
||
const noWaybill = buildSendRow({
|
||
order: { order_no: 'dgj-1', parent_order_no: '1', extend_props: {} },
|
||
snapshot: buildSnapshot(),
|
||
fetchRecord: null,
|
||
});
|
||
assert.strictEqual(noWaybill, null);
|
||
});
|
||
|
||
it('面单快递编码优先取号记录,不被模板编码覆盖(抖音会按模板渠道校验运单号)', () => {
|
||
// 平台响应里没有 CpCode/RealCpCode 时,旧实现会用模板快递(可能是别的快递)兜底
|
||
const fetchRecord = {
|
||
express_code: 'STO',
|
||
waybill_code: '770357410089880',
|
||
created_at: new Date('2026-11-07T07:39:45Z'),
|
||
raw_response: JSON.stringify({
|
||
Success: true,
|
||
Data: {
|
||
WaybillCode: [{
|
||
WaybillCode: '770357410089880',
|
||
WaybillCodeId: 10000304201567,
|
||
WaybillCodePid: '8c51d72ab1f_2_1',
|
||
OrderId: '10000279877231',
|
||
}],
|
||
},
|
||
}),
|
||
};
|
||
const order = {
|
||
order_no: 'dgj-10000279877231',
|
||
parent_order_no: '10000279877231',
|
||
express_codes: JSON.stringify([ '770357410089880' ]),
|
||
extend_props: {},
|
||
};
|
||
const ztoTemplate = { template_id: '13987231', express_company_code: 'ZTO' };
|
||
const row = buildSendRow({ order, snapshot: buildSnapshot(), fetchRecord, template: ztoTemplate });
|
||
console.log('快递编码兜底:', row.WaybillCodes[0].ExpressCpCode, '| 模板:', ztoTemplate.express_company_code);
|
||
assert.strictEqual(row.WaybillCodes[0].ExpressCpCode, 'STO');
|
||
});
|
||
|
||
it('面单只取与本单运单号对得上的取号记录(同一单多次取号时不能取错号)', () => {
|
||
const raw = JSON.stringify({
|
||
Success: true,
|
||
Data: {
|
||
WaybillCode: [
|
||
{ WaybillCode: '770357400000001', WaybillCodeId: 1, WaybillCodePid: 'p1' },
|
||
{ WaybillCode: '770357400000002', WaybillCodeId: 2, WaybillCodePid: 'p2' },
|
||
],
|
||
},
|
||
});
|
||
const fetchRecord = { express_code: 'STO', waybill_code: '770357400000002', raw_response: raw, created_at: new Date('2026-11-07T07:39:45Z') };
|
||
const order = {
|
||
order_no: 'dgj-1',
|
||
parent_order_no: '1',
|
||
express_codes: JSON.stringify([ '770357400000002' ]),
|
||
extend_props: {},
|
||
};
|
||
const row = buildSendRow({ order, snapshot: buildSnapshot(), fetchRecord, template });
|
||
console.log('按运单号选面单:', row.LastWaybillCode, row.WaybillCodes.map(item => item.WaybillCode).join(','));
|
||
assert.strictEqual(row.LastWaybillCode, '770357400000002');
|
||
assert.strictEqual(row.WaybillCodes.length, 1);
|
||
assert.strictEqual(row.WaybillCodes[0].WaybillCode, '770357400000002');
|
||
assert.strictEqual(row.WaybillCodes[0].Pid, 'p2');
|
||
});
|
||
|
||
it('取号记录是别的运单号时不回填(宁可少带,也不能发出错误的运单号)', () => {
|
||
const fetchRecord = buildFetchRecord();
|
||
const order = {
|
||
order_no: 'dgj-1',
|
||
parent_order_no: '1',
|
||
express_codes: JSON.stringify([ '770357499999999' ]),
|
||
extend_props: {},
|
||
};
|
||
const row = buildSendRow({ order, snapshot: buildSnapshot(), fetchRecord, template });
|
||
console.log('运单号对不上:', row.LastWaybillCode, '| WaybillCodes:', JSON.stringify(row.WaybillCodes));
|
||
assert.strictEqual(row.LastWaybillCode, '770357499999999');
|
||
assert.deepStrictEqual(row.WaybillCodes, []);
|
||
});
|
||
|
||
it('面单信息解析:优先 RealCpCode,缺字段不炸', () => {
|
||
const waybill = pickWaybillFromFetchRecord(buildFetchRecord().raw_response);
|
||
const entry = toWaybillEntry(waybill, { templateId: '10776786', expressCode: 'STO', subOrders: [{ OrderItemId: 1, OrderItemCode: 'A' }] });
|
||
assert.strictEqual(entry.ExpressCpCode, 'STO');
|
||
assert.strictEqual(entry.WaybillCodeOrderProducts[0].OrderItemId, 1);
|
||
assert.strictEqual(pickWaybillFromFetchRecord('not-json'), null);
|
||
});
|
||
|
||
it('订单运单号清单:express_codes(数组/JSON 串)+ express_code 去重', () => {
|
||
assert.deepStrictEqual(parseOrderWaybills({ express_codes: [ 'A', 'B' ], express_code: 'A' }), [ 'A', 'B' ]);
|
||
assert.deepStrictEqual(parseOrderWaybills({ express_codes: '["A","B"]' }), [ 'A', 'B' ]);
|
||
assert.deepStrictEqual(parseOrderWaybills({ express_codes: 'A,B' }), [ 'A', 'B' ]);
|
||
assert.deepStrictEqual(parseOrderWaybills({ express_code: 'C' }), [ 'C' ]);
|
||
assert.deepStrictEqual(parseOrderWaybills({}), []);
|
||
});
|
||
});
|