diff --git a/backend/app/lib/printPlatform/dgj.js b/backend/app/lib/printPlatform/dgj.js index ecc7b0b..f1a9abf 100644 --- a/backend/app/lib/printPlatform/dgj.js +++ b/backend/app/lib/printPlatform/dgj.js @@ -3111,6 +3111,15 @@ class DgjService extends PrintPlatformService { if (res.status === 401) { throw buildPlatformError(`店管家登录已失效:${(res.json && res.json.Message) || 'token is invalid'}`, res); } + // 单包裹发送时,平台整包回「存在不是待发货的商品,发货失败」= 这一单已经不在待发货 + // (平台侧已发货/已取消),属于幂等:直接按成功返回,避免反复重试被打成「异常」 + const topMessage = String((res.json && res.json.Message) || ''); + if (res.json && res.json.Success !== true && orders.length === 1 && /不是待发货|已发货|已取消|已关闭/.test(topMessage)) { + if (this.logger && typeof this.logger.info === 'function') { + this.logger.info('[dgj.sendOrders] 平台侧该单已不是待发货,按已同步处理:%s %s', orders[0].LogicOrderId, topMessage); + } + return res.json; + } if (!res.json || res.json.Success !== true) { const json = res.json || {}; const hints = []; diff --git a/backend/test/app/lib/dgjSendIdempotent.test.js b/backend/test/app/lib/dgjSendIdempotent.test.js new file mode 100644 index 0000000..3063479 --- /dev/null +++ b/backend/test/app/lib/dgjSendIdempotent.test.js @@ -0,0 +1,79 @@ +'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/ + ); + }); +}); diff --git a/店管家取号-旧系统提取.md b/店管家取号-旧系统提取.md index d079939..2f1ee50 100644 --- a/店管家取号-旧系统提取.md +++ b/店管家取号-旧系统提取.md @@ -77,6 +77,10 @@ Orders[0][Sender][SenderCompany/CompanyName] / [ReceiverIsEmpty]=0 / [PrintInfo] OMS 口径:逐单 `IsSuccess=false` 时,除「不是待发货状态 / 已发货 / 已取消 / 已关闭」(幂等,视为已同步)外都算失败。 +整包层面也有一种幂等:单包裹发送时若平台整包回 +`{"Success":false,"Message":"存在不是待发货的商品,发货失败;"}`,说明这一单平台侧已不在待发货 +(已发货/已取消),同样**按已同步处理**(`dgj.sendOrders` 直接返回,不发异常),否则会被重试 3 次打成「同步异常」。 + OMS 实现: | 位置 | 作用 | @@ -186,6 +190,9 @@ NOT_MATCH_SEGMENT_CHANNEL#…此运单号非抖音的运单号…`。 因此 §2.1.1 的「改用实时订单行重试」只有在 `dbname` 正确后才有意义——之前回读订单行也在错的区,拿不到行。 +修正后同一批单的返回变成 `存在不是待发货的商品,发货失败;`(业务类),这类按幂等处理即「已同步」, +见 §2.1 的 OMS 口径。 + **失败单不转表**:进了配送说明仓库已打包发货,是既成事实,必须留在配送表可见/可导出;