上一版只覆盖了整包 `Success:false + Message` 的形态,线上这条提示其实走的是**逐单**分支:
`{"Success":true,"Data":{"Orders":[{"IsSuccess":false,"ErrorMessage":"存在不是待发货的商品,发货失败;"}]}}`,
而逐单幂等正则要求「不是待发货状态」,少了「状态」两字没命中,于是照旧抛错重试。
用户看到的 `店管家发货同步失败:: 存在不是待发货…` 里的双冒号就是逐单分支 + 平台未回 LogicOrderId 造成的。
- 抽出 SEND_ALREADY_DONE_PATTERN(不是待发货 / 已发货 / 已取消 / 已关闭),整包与逐单共用
- 逐单失败且平台未回 LogicOrderId 时不再拼「: 」前缀,避免出现「失败:: xxx」
- 单测补 2 例(逐单幂等 / 无单号时不出现双冒号),共 5 例
- 文档补两种形态的报文明细
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
110 lines
4.1 KiB
JavaScript
110 lines
4.1 KiB
JavaScript
'use strict';
|
||
|
||
const { assert } = require('egg-mock/bootstrap');
|
||
const DgjService = require('../../../app/lib/printPlatform/dgj');
|
||
|
||
/**
|
||
* 造一个只调本模块自身方法的服务实例(不打网络)
|
||
* @return {Object} dgj 服务实例
|
||
*/
|
||
function buildService() {
|
||
const service = new DgjService({ platform: { code: 'dgj', name: '店管家' }, account: { token: 'token', cookie: 'cookie' } });
|
||
service.logger = { info() {}, warn() {}, error() {} };
|
||
return service;
|
||
}
|
||
|
||
/** 单条订单行(OnlineSend 只需要能拼出 LogicOrderId 等字段) */
|
||
const ROW = {
|
||
Id: 51757087,
|
||
LogicOrderId: '875172836006880609',
|
||
PlatformOrderId: '6919339119937728149',
|
||
PathFlowCode: 'b676e3c07457bf8e',
|
||
ShopId: 4500493,
|
||
FxUserId: 751728,
|
||
UpFxUserId: 953516,
|
||
LastWaybillCode: '321450799451452',
|
||
WaybillCodes: [{ WaybillCode: '321450799451452', ExpressCpCode: 'YUNDA', WaybillCodeId: 68998609 }],
|
||
SubOrders: [{ OrderItemId: 118342400, OrderItemCode: 'c6ee12d85619a5ab' }],
|
||
};
|
||
|
||
/**
|
||
* 让 postPlatformForm 直接回指定响应
|
||
* @param {Object} service 服务实例
|
||
* @param {Object} json 平台响应
|
||
* @return {Object} 服务实例
|
||
*/
|
||
function stubResponse(service, json) {
|
||
service.postPlatformForm = async () => ({ status: 200, json, text: '' });
|
||
return service;
|
||
}
|
||
|
||
describe('dgj.sendOrders 幂等口径', () => {
|
||
it('整包回「存在不是待发货的商品」时按已同步处理(单包裹)', async () => {
|
||
const service = stubResponse(buildService(), {
|
||
Success: false,
|
||
ErrorCode: null,
|
||
Message: '存在不是待发货的商品,发货失败;',
|
||
});
|
||
const out = await service.sendOrders('fxdd.dgjapp.com', {
|
||
traceId: 't', dbname: '', rows: [ ROW ], templateId: '12360764', expressCompanyId: 7, expressCode: 'YUNDA',
|
||
});
|
||
assert.strictEqual(out.Message, '存在不是待发货的商品,发货失败;');
|
||
});
|
||
|
||
it('逐单回「不是待发货状态」也按已同步处理', async () => {
|
||
const service = stubResponse(buildService(), {
|
||
Success: true,
|
||
ErrorCode: '200',
|
||
Data: { Orders: [{ LogicOrderId: 875172836006880609, IsSuccess: false, ErrorMessage: '订单不是待发货状态,请检查' }] },
|
||
});
|
||
const out = await service.sendOrders('fxdd.dgjapp.com', {
|
||
traceId: 't', dbname: '', rows: [ ROW ], templateId: '12360764', expressCompanyId: 7, expressCode: 'YUNDA',
|
||
});
|
||
assert.strictEqual(out.Success, true);
|
||
});
|
||
|
||
it('其它整包失败仍然抛错(不能被当成已同步)', async () => {
|
||
const service = stubResponse(buildService(), {
|
||
Success: false,
|
||
ErrorCode: '500',
|
||
Message: '12',
|
||
});
|
||
await assert.rejects(
|
||
() => service.sendOrders('fxdd.dgjapp.com', {
|
||
traceId: 't', dbname: '', rows: [ ROW ], templateId: '12360764', expressCompanyId: 7, expressCode: 'YUNDA',
|
||
}),
|
||
/店管家发货同步失败:12;ErrorCode=500/
|
||
);
|
||
});
|
||
|
||
it('逐单回「存在不是待发货的商品」也按已同步处理(LogicOrderId 为空)', async () => {
|
||
const service = stubResponse(buildService(), {
|
||
Success: true,
|
||
ErrorCode: '200',
|
||
Data: { Orders: [{ IsSuccess: false, ErrorMessage: '存在不是待发货的商品,发货失败;' }] },
|
||
});
|
||
const out = await service.sendOrders('fxdd.dgjapp.com', {
|
||
traceId: 't', dbname: '', rows: [ ROW ], templateId: '12360764', expressCompanyId: 7, expressCode: 'YUNDA',
|
||
});
|
||
assert.strictEqual(out.Success, true);
|
||
});
|
||
|
||
it('逐单真失败时错误里的单号前缀不会出现「::」', async () => {
|
||
const service = stubResponse(buildService(), {
|
||
Success: true,
|
||
ErrorCode: '200',
|
||
Data: { Orders: [{ IsSuccess: false, ErrorMessage: '运单号已被使用' }] },
|
||
});
|
||
await assert.rejects(
|
||
() => service.sendOrders('fxdd.dgjapp.com', {
|
||
traceId: 't', dbname: '', rows: [ ROW ], templateId: '12360764', expressCompanyId: 7, expressCode: 'YUNDA',
|
||
}),
|
||
err => {
|
||
assert.match(err.message, /店管家发货同步失败:运单号已被使用/);
|
||
assert.doesNotMatch(err.message, /::/);
|
||
return true;
|
||
}
|
||
);
|
||
});
|
||
});
|