oms/backend/app/lib/dgjSendRow.js
liufumingren da468f6cb2 fix(send): 取号记录必须与本单运单号匹配,不再取最近一条
上一版按「最近一次成功取号记录」取快递编码与面单标识,但同一单可能取过多次号
(每次分配新号,本地库里 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>
2026-11-07 09:22:16 +08:00

216 lines
9.2 KiB
JavaScript
Raw Permalink Blame History

This file contains ambiguous Unicode characters

This file contains Unicode characters that might be confused with other characters. If you think that this is intentional, you can safely ignore this warning. Use the Escape button to reveal them.

'use strict';
/**
* 用本地快照组装店管家「发货回传」需要的订单行
*
* 背景:`POST /NewOrder/OnlineSend` 的 `Orders[i]` 基本就是平台订单行本身。
* 拉单时我们已把平台整行存进老表 `orders.external_data`(实测 113 个字段,含
* `PathFlowCode` / `ShippingType` / `OrderTags` / `SubOrders[].OrderItemId` 等内部字段),
* 因此发货时不必再回读平台,只需把「快照 + 状态表(最新业务字段)+ 取号记录(最新面单信息)」拼起来。
*
* 时效性处理:
* - 快照里的 `PrintState` / `ExpressPrintTime` / `WaybillCodes` 是拉单那一刻的,
* 取号之后才有正确值 → 用取号记录(`waybill_fetch_records`)覆盖;
* - 收件人、平台单号等以状态表为准(快照可能早于改地址/改备注)。
*/
/**
* 安全解析 JSON(快照/原始响应可能是字符串)
* @param {*} value 原始值
* @return {Object|null} 解析结果
*/
function parseJson(value) {
if (!value) return null;
if (typeof value === 'object') return value;
try {
return JSON.parse(String(value));
} catch {
return null;
}
}
/**
* 解析店管家原始响应里的面单清单
* @param {string|Object} rawResponse 取号记录的 raw_response
* @return {Array<Object>} 面单对象数组
*/
function parseFetchWaybills(rawResponse) {
const json = parseJson(rawResponse);
const list = json && json.Data && Array.isArray(json.Data.WaybillCode) ? json.Data.WaybillCode : [];
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;
}
/**
* 把平台面单对象转成订单行里的 `WaybillCodes[]` 元素
* @param {Object} waybill 平台面单对象(ExpressPrint 返回)
* @param {Object} params 补充参数
* @param {string} [params.templateId] 面单模板ID
* @param {string} [params.expressCode] 快递编码
* @param {string} [params.expressName] 快递名称
* @param {Array} [params.subOrders] 平台子单(生成面单-商品关联)
* @return {Object|null} WaybillCodes 元素
*/
function toWaybillEntry(waybill, { templateId = '', expressCode = '', expressName = '', subOrders = [] } = {}) {
if (!waybill || !waybill.WaybillCode) return null;
const cpCode = waybill.RealCpCode || waybill.CpCode || expressCode || '';
const orderId = String(waybill.WaybillCode);
const masterIdBase = `${waybill.OrderId || ''}_${orderId}_EI`;
return {
TemplateId: templateId || null,
ExpressCpCode: cpCode,
ExpressName: expressName || cpCode,
WaybillCode: orderId,
ChildWaybillCode: null,
ChildWaybillCodes: null,
CompanyCode: cpCode,
WaybillCodeId: waybill.WaybillCodeId || null,
CreateDate: waybill.WaybillCodeCreateDate || '',
IsSended: false,
IsPreviewed: null,
TotalWeight: 0,
SendType: 0,
Status: 1,
UniqueKey: waybill.WaybillUniqueKey || null,
Pid: waybill.WaybillCodePid || null,
LogisticType: null,
WaybillCodeOrderProducts: (subOrders || []).map(sub => ({
Id: null,
MasterId: `${masterIdBase}_${sub.OrderItemId || ''}`,
OrderItemId: sub.OrderItemId,
OrderItemIdStr: String(sub.OrderItemId == null ? '' : sub.OrderItemId),
Quantity: 1,
OrderItemCode: sub.OrderItemCode,
SendType: null,
ParentUniqueKey: null,
WaybillCodeId: waybill.WaybillCodeId || null,
StockCode: null,
})),
IsManual: false,
};
}
/**
* 组装发货回传用的订单行(本地快照优先,不访问平台)
* @param {Object} params 参数
* @param {Object} params.order 配送状态行(含 parent_order_no / 收件人 / extend_props / express_codes)
* @param {Object} [params.snapshot] 拉单快照(orders.external_data)
* @param {Object} [params.fetchRecord] 最近一次成功取号记录(waybill_fetch_records)
* @param {Object} [params.template] 快递接口记录(template_id / express_company_code / express_company_name)
* @return {Object|null} 订单行;快照缺失且状态表信息不足以拼装时返回 null(调用方回退到回读平台)
*/
function buildSendRow({ order, snapshot, fetchRecord, template }) {
const snap = snapshot && typeof snapshot === 'object' ? snapshot : null;
if (!snap) return null;
const extendProps = order && typeof order.extend_props === 'object' && order.extend_props ? order.extend_props : {};
const logicalOrderId = String((order && (order.parent_order_no || order.order_no)) || snap.LogicOrderId || '').trim();
if (!logicalOrderId) return null;
const templateId = String((template && template.template_id) || '');
// 快递编码优先取号记录(运单实际所属快递),模板编码只做兜底:
// 模板与运单快递不一致时,平台会按模板渠道校验运单号(抖音会报 NOT_MATCH_SEGMENT_CHANNEL)
const expressCode = String((fetchRecord && fetchRecord.express_code) || (template && template.express_company_code) || '').trim();
const expressName = String((template && template.express_company_name) || '').trim();
const subOrders = Array.isArray(snap.SubOrders) ? snap.SubOrders : [];
// 面单信息:只用与本单运单号对得上的取号记录,取不到就不带(宁可少带,也不能把别的运单号发出去)
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 &&
(!orderWaybills.length || orderWaybills.includes(String(item.WaybillCode).trim())))
: [];
if (waybillEntry) waybillCodes = [ waybillEntry ];
const waybillCode = String(orderWaybills[0] || (waybillEntry && waybillEntry.WaybillCode) || '').trim();
if (!waybillCode) return null;
const pick = (stateValue, snapKey) => {
const value = stateValue == null ? '' : String(stateValue).trim();
return value || (snap[snapKey] == null ? '' : String(snap[snapKey]));
};
return {
...snap,
Id: snap.Id || logicalOrderId,
LogicOrderId: logicalOrderId,
PlatformOrderId: logicalOrderId,
CustomerOrderId: pick(extendProps.platform_order_no || (order && order.oaid_order_source_code), 'PlatformOrderId'),
PathFlowCode: snap.PathFlowCode || '',
ShopId: snap.ShopId,
ShopName: snap.ShopName || extendProps.platform_shop_name || '',
PlatformType: snap.PlatformType || '',
PlatformTypeName: snap.PlatformTypeName || '',
FxUserId: snap.FxUserId,
UpFxUserId: snap.UpFxUserId,
OrderTags: Array.isArray(snap.OrderTags) ? snap.OrderTags : [],
SubOrders: subOrders,
WaybillCodes: waybillCodes,
LastWaybillCode: waybillCode,
// 取号/打印之后才有:快照里恒为 0 / 空
PrintState: 1,
ExpressPrintTime: (fetchRecord && fetchRecord.created_at) || snap.ExpressPrintTime || '',
// 收件人以状态表为准(快照可能早于改地址)
ToName: pick(order && order.receiver, 'ToName'),
ToPhone: pick(order && (order.mobile || order.tel), 'ToPhone'),
ToProvince: pick(order && order.province, 'ToProvince'),
ToCity: pick(order && order.city, 'ToCity'),
ToCounty: pick(order && order.area, 'ToCounty'),
ToTown: pick(order && order.town, 'ToTown'),
ToAddress: pick(order && order.detail_address, 'ToAddress'),
ToFullAddress: pick(order && order.address, 'ToFullAddress'),
};
}
module.exports = {
buildSendRow,
// 供单测复用
parseJson,
parseOrderWaybills,
parseFetchWaybills,
pickWaybillFromFetchRecord,
toWaybillEntry,
};