From da468f6cb2af669b4ea088dc72a0c0bb98973aeb Mon Sep 17 00:00:00 2001 From: liufumingren Date: Sat, 7 Nov 2026 09:22:16 +0800 Subject: [PATCH] =?UTF-8?q?fix(send):=20=E5=8F=96=E5=8F=B7=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E5=BF=85=E9=A1=BB=E4=B8=8E=E6=9C=AC=E5=8D=95=E8=BF=90?= =?UTF-8?q?=E5=8D=95=E5=8F=B7=E5=8C=B9=E9=85=8D=EF=BC=8C=E4=B8=8D=E5=86=8D?= =?UTF-8?q?=E5=8F=96=E6=9C=80=E8=BF=91=E4=B8=80=E6=9D=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 上一版按「最近一次成功取号记录」取快递编码与面单标识,但同一单可能取过多次号 (每次分配新号,本地库里 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> --- backend/app/lib/dgjSendRow.js | 70 +++++++++++++++---- backend/app/service/externalSendSync.js | 65 +++++++++++++++-- backend/test/app/lib/dgjSendRow.test.js | 49 ++++++++++++- .../test/app/lib/externalSendTemplate.test.js | 64 +++++++++++++++++ 店管家取号-旧系统提取.md | 14 +++- 5 files changed, 239 insertions(+), 23 deletions(-) diff --git a/backend/app/lib/dgjSendRow.js b/backend/app/lib/dgjSendRow.js index 5090ec9..1eb4861 100644 --- a/backend/app/lib/dgjSendRow.js +++ b/backend/app/lib/dgjSendRow.js @@ -30,14 +30,54 @@ function parseJson(value) { } /** - * 从取号记录的平台原始返回里取面单信息(WaybillCode[] 第一张) + * 解析店管家原始响应里的面单清单 * @param {string|Object} rawResponse 取号记录的 raw_response - * @return {Object|null} 平台面单对象 + * @return {Array} 面单对象数组 */ -function pickWaybillFromFetchRecord(rawResponse) { +function parseFetchWaybills(rawResponse) { const json = parseJson(rawResponse); const list = json && json.Data && Array.isArray(json.Data.WaybillCode) ? json.Data.WaybillCode : []; - return list.find(item => item && item.WaybillCode) || null; + return list.filter(item => item && item.WaybillCode); +} + +/** + * 订单当前要发货的运单号清单(配送表的 express_codes / express_code 存的都是运单号) + * @param {Object} order 配送状态行 + * @return {string[]} 运单号(去重,主运单在前) + */ +function parseOrderWaybills(order) { + const out = []; + const push = value => { + const text = String(value == null ? '' : value).trim(); + if (text && !out.includes(text)) out.push(text); + }; + const raw = order && order.express_codes; + if (Array.isArray(raw)) { + raw.forEach(push); + } else if (raw) { + const parsed = parseJson(raw); + if (Array.isArray(parsed)) parsed.forEach(push); + else String(raw).split(',').forEach(push); + } + if (order) push(order.express_code); + return out; +} + +/** + * 从取号记录的平台原始返回里取面单信息 + * + * 必须和订单当前的运单号对上:同一单可能取过多次号(每次分配新号), + * 取号记录里最早/最新的那张不一定是仓库实际发出的那张,取错就会把别的运单号发到平台。 + * @param {string|Object} rawResponse 取号记录的 raw_response + * @param {string[]} [waybills] 订单当前的运单号(不传则退回第一张,兼容老调用) + * @return {Object|null} 平台面单对象 + */ +function pickWaybillFromFetchRecord(rawResponse, waybills = []) { + const list = parseFetchWaybills(rawResponse); + if (!list.length) return null; + const wanted = (waybills || []).map(item => String(item).trim()).filter(Boolean); + if (!wanted.length) return list[0]; + return list.find(item => wanted.includes(String(item.WaybillCode).trim())) || null; } /** @@ -113,20 +153,18 @@ function buildSendRow({ order, snapshot, fetchRecord, template }) { const expressName = String((template && template.express_company_name) || '').trim(); const subOrders = Array.isArray(snap.SubOrders) ? snap.SubOrders : []; - // 面单信息:取号记录最新;没有取号记录时退回快照里的(可能为空) - const waybill = pickWaybillFromFetchRecord(fetchRecord && fetchRecord.raw_response); + // 面单信息:只用与本单运单号对得上的取号记录,取不到就不带(宁可少带,也不能把别的运单号发出去) + const orderWaybills = parseOrderWaybills(order); + const waybill = pickWaybillFromFetchRecord(fetchRecord && fetchRecord.raw_response, orderWaybills); const waybillEntry = toWaybillEntry(waybill, { templateId, expressCode, expressName, subOrders }); - let waybillCodes = Array.isArray(snap.WaybillCodes) ? snap.WaybillCodes.filter(item => item && item.WaybillCode) : []; + // 快照里的面单同样只保留本单运单号,避免带回拉单时的旧号 + let waybillCodes = Array.isArray(snap.WaybillCodes) + ? snap.WaybillCodes.filter(item => item && item.WaybillCode && + (!orderWaybills.length || orderWaybills.includes(String(item.WaybillCode).trim()))) + : []; if (waybillEntry) waybillCodes = [ waybillEntry ]; - const statusCodes = String((order && order.express_codes) || '').trim(); - const statusList = (() => { - if (!statusCodes) return []; - const parsed = parseJson(statusCodes); - if (Array.isArray(parsed)) return parsed.map(String); - return statusCodes.split(',').map(item => item.trim()).filter(Boolean); - })(); - const waybillCode = String((waybillEntry && waybillEntry.WaybillCode) || statusList[0] || order && order.express_code || '').trim(); + const waybillCode = String(orderWaybills[0] || (waybillEntry && waybillEntry.WaybillCode) || '').trim(); if (!waybillCode) return null; const pick = (stateValue, snapKey) => { @@ -170,6 +208,8 @@ module.exports = { buildSendRow, // 供单测复用 parseJson, + parseOrderWaybills, + parseFetchWaybills, pickWaybillFromFetchRecord, toWaybillEntry, }; diff --git a/backend/app/service/externalSendSync.js b/backend/app/service/externalSendSync.js index 24a9317..07c25b4 100644 --- a/backend/app/service/externalSendSync.js +++ b/backend/app/service/externalSendSync.js @@ -1,7 +1,7 @@ 'use strict'; const Service = require('egg').Service; -const { buildSendRow } = require('../lib/dgjSendRow'); +const { buildSendRow, parseOrderWaybills, parseJson } = require('../lib/dgjSendRow'); /** 外部发货同步状态 */ const SEND_STATUS = { @@ -49,6 +49,31 @@ function truncateText(value, max) { return String(value == null ? '' : value).slice(0, max); } +/** + * 转义 LIKE 里的通配符(订单号可能含 `_`,如 `FH_2_1`) + * @param {string} value 原始值 + * @return {string} 转义后的值 + */ +function escapeLike(value) { + return String(value == null ? '' : value).replace(/([\\%_])/g, '\\$1'); +} + +/** + * 取号记录里是否包含指定运单号 + * @param {Object} record 取号记录 + * @param {string} waybill 运单号 + * @return {boolean} 是否命中 + */ +function fetchRecordHasWaybill(record, waybill) { + const wanted = String(waybill == null ? '' : waybill).trim(); + if (!wanted || !record) return false; + if (String(record.waybill_code || '').trim() === wanted) return true; + const raw = record.waybill_codes; + const parsed = parseJson(raw); + const codes = Array.isArray(parsed) ? parsed : (raw ? String(raw).split(',') : []); + return codes.some(code => String(code).trim() === wanted); +} + /** * 是否为平台登录态失效类错误(分区接口统一返回「登录信息过期,请重新登录」) * @param {Error} err 异常 @@ -285,25 +310,55 @@ class ExternalSendSyncService extends Service { * @return {Promise} 目标信息;非外部打单订单返回 null */ /** - * 最近一次成功取号记录(含运单号、快递编码、平台面单标识) + * 最近一次**与本单运单号对得上**的成功取号记录(含运单号、快递编码、平台面单标识) + * + * 同一单可能取过多次号(每次分配新号),配送单上真正发出去的是 `express_codes` 里的号, + * 所以必须按运单号挑记录:拿别的号会让发货模板(快递)和面单标识都错位, + * 抖音这类平台会直接判「此运单号非抖音的运单号」。 + * * @param {Object} order 配送状态行 - * @return {Promise} 取号记录 + * @return {Promise} 取号记录;运单号对不上时返回 null */ async findLatestFetchRecord(order) { const { ctx } = this; if (!order || !order.order_no) return null; + const Op = ctx.app.Sequelize.Op; + const orderCode = String(order.order_no); + let records = []; try { - return await ctx.model.WaybillFetchRecord.findOne({ + records = await ctx.model.WaybillFetchRecord.findAll({ where: { principal_id: order.principal_id, - delivery_order_code: { [ ctx.app.Sequelize.Op.like ]: `${order.order_no}%` }, status: 1, + // 本单本身 + 本单的拆包(`_1` / `_2`):order_no 里的下划线是字面量,需转义 + [Op.or]: [ + { delivery_order_code: orderCode }, + { delivery_order_code: { [Op.like]: `${escapeLike(orderCode)}\\_%` } }, + ], }, order: [[ 'id', 'DESC' ]], + limit: 20, }); } catch { return null; } + if (!records.length) return null; + + const waybills = parseOrderWaybills(order); + // 配送单还没有运单号(异常数据):保持原有行为,取最近一条 + if (!waybills.length) return records[0]; + + for (const waybill of waybills) { + const hit = records.find(record => fetchRecordHasWaybill(record, waybill)); + if (hit) return hit; + } + ctx.logger.warn( + '[external-send] %s 的运单号 %s 没有对应取号记录(最近 %d 条都不是),将不带平台面单标识', + orderCode, + waybills.join(','), + records.length + ); + return null; } /** diff --git a/backend/test/app/lib/dgjSendRow.test.js b/backend/test/app/lib/dgjSendRow.test.js index ff71d7f..3a34da3 100644 --- a/backend/test/app/lib/dgjSendRow.test.js +++ b/backend/test/app/lib/dgjSendRow.test.js @@ -1,7 +1,7 @@ 'use strict'; const { assert } = require('egg-mock/bootstrap'); -const { buildSendRow, pickWaybillFromFetchRecord, toWaybillEntry } = require('../../../app/lib/dgjSendRow'); +const { buildSendRow, pickWaybillFromFetchRecord, toWaybillEntry, parseOrderWaybills } = require('../../../app/lib/dgjSendRow'); /** * 最小可用的拉单快照(字段名与店管家订单行一致) @@ -155,6 +155,45 @@ describe('lib/dgjSendRow 本地快照拼发货报文', () => { 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' }] }); @@ -162,4 +201,12 @@ describe('lib/dgjSendRow 本地快照拼发货报文', () => { 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({}), []); + }); }); diff --git a/backend/test/app/lib/externalSendTemplate.test.js b/backend/test/app/lib/externalSendTemplate.test.js index d73800a..6899de4 100644 --- a/backend/test/app/lib/externalSendTemplate.test.js +++ b/backend/test/app/lib/externalSendTemplate.test.js @@ -114,3 +114,67 @@ describe('service/externalSendSync 发货模板按运单快递定位', () => { assert.strictEqual(warnings.length, 0); }); }); + +describe('service/externalSendSync 取号记录必须与本单运单号匹配', () => { + let ctx; + let service; + + beforeEach(() => { + ctx = app.mockContext(); + service = ctx.service.externalSendSync; + }); + + it('按运单号挑记录(同一单多次取号时取对的那条),订单号下划线做转义', async () => { + const calls = []; + ctx.model.WaybillFetchRecord.findAll = async options => { + calls.push(options); + return [ + { id: 31, waybill_code: 'B', waybill_codes: '["B"]', express_code: 'ZTO' }, + { id: 30, waybill_code: 'A', waybill_codes: '["A"]', express_code: 'STO' }, + ]; + }; + const record = await service.findLatestFetchRecord({ + order_no: 'FH_2_1', + principal_id: 5, + express_codes: '["A"]', + express_code: 'A', + }); + const Op = ctx.app.Sequelize.Op; + const where = calls[0].where; + const likeValue = where[Op.or][1].delivery_order_code[Op.like]; + console.log('命中记录:', record.id, record.express_code, '| LIKE:', likeValue); + assert.strictEqual(record.id, 30); + assert.strictEqual(likeValue, 'FH\\_2\\_1\\_%', '订单号里的下划线必须转义,避免前缀误匹配别的单'); + }); + + it('运单号没有对应记录时返回 null(不带别人的面单)并告警', async () => { + ctx.model.WaybillFetchRecord.findAll = async () => [ + { id: 31, waybill_code: 'B', waybill_codes: '["B"]', express_code: 'ZTO' }, + ]; + const warnings = []; + mm(ctx, 'logger', { warn: (...args) => warnings.push(args), info() {}, error() {} }); + + const record = await service.findLatestFetchRecord({ + order_no: 'dgj-1', + principal_id: 5, + express_codes: '["C"]', + }); + console.log('无匹配:', record, '| 告警条数:', warnings.length); + assert.strictEqual(record, null); + assert.ok(warnings.length > 0); + mm.restore(); + }); + + it('多包裹时按运单号顺序优先匹配主运单', async () => { + ctx.model.WaybillFetchRecord.findAll = async () => [ + { id: 9, waybill_code: 'B', waybill_codes: '["B"]', express_code: 'ZTO' }, + { id: 8, waybill_code: 'A', waybill_codes: '["A"]', express_code: 'STO' }, + ]; + const record = await service.findLatestFetchRecord({ + order_no: 'dgj-2', + principal_id: 5, + express_codes: '["A","B"]', + }); + assert.strictEqual(record.id, 8, '先按主运单 A 匹配'); + }); +}); diff --git a/店管家取号-旧系统提取.md b/店管家取号-旧系统提取.md index 456d577..38a232d 100644 --- a/店管家取号-旧系统提取.md +++ b/店管家取号-旧系统提取.md @@ -99,17 +99,27 @@ NOT_MATCH_SEGMENT_CHANNEL#…此运单号非抖音的运单号…`。 | 步骤 | 取值 | |---|---| -| 运单快递 | `waybill_fetch_records.express_code`(最近一次成功取号记录)→ 兜底 `order_status_delivery.logistics_code` | +| 本单运单号 | `order_status_delivery.express_codes`(JSON 数组,多包裹会有多个)+ `express_code`;注意这两列存的是**运单号**,快递编码在 `logistics_code` | +| 取号记录 | **必须和运单号对上**:按 `express_codes` 里的号逐条匹配 `waybill_fetch_records.waybill_code / waybill_codes`,主运单优先;同一单取过多次号时只会命中真正要发出去的那张(对不上就返回 null,不拿别人的面单) | +| 运单快递 | 命中记录的 `express_code` → 兜底 `logistics_code` | | 模板定位 | `externalPrintExpressInterface.resolveByCode(账号, {平台编码, 快递编码})`(显式绑定)→ 模板自带 `express_company_code` 匹配 → 该平台第一条(保留历史行为并 `warn`) | | 面单快照 | `WaybillCodes[].ExpressCpCode` 优先用**取号记录的快递编码**,模板编码只做兜底 | -注意 `order_status_delivery.express_code` 存的是**运单号**(不是快递编码),快递编码在 `logistics_code`。 +订单号前缀匹配也做了转义(`LIKE '...\\_%'`),避免 `..._1` 误匹配到 `..._10` 这类别的单。 验证(本地库真实数据):快手单 `dgj-10000267890142_1` 的运单 `772085332374413` 是申通, 旧逻辑命中模板 `#17 / YUNDA(圆通)`,修正后命中 `#29 / STO(申通)`, 拼出的报文 `ExpressCompanyCode=STO`、`WaybillCodes[0].ExpressCpCode=STO`; 抖音四张模板也能按快递分别命中(STO→10776786 / ZTO→13987231 / YUNDA→12360764 / POSTB→12712711)。 +取号记录按运单号匹配的实测(同一单有 4 条不同运单号的取号记录 11~14): + +| 配送单运单号 | 命中记录 | 说明 | +|---|---|---| +| 772085332374413 | `#14`(最新) | 正常命中 | +| 772085215446719 | `#13`(更早) | 不再无脑取最新那条 | +| 760000000000000(不存在) | 无 | 返回 null 并 `warn`,报文不带别人的面单标识 | + **请求量控制(避免被平台判成刷单/攻击)**: | 手段 | 说明 |