oms/backend/app/lib/dgjSendRow.js
liufumingren bcca0075be feat(external-send): 发货回传改用本地快照拼报文,不再回读平台订单行
拉单时已把平台整行存进 orders.external_data(实测 113 字段,含 PathFlowCode /
ShippingType / OrderTags / SubOrders[].OrderItemId 这些状态表没有的内部字段),
发货报文其实就是这一行,所以没必要再回读平台。

- 新增 lib/dgjSendRow.js#buildSendRow:快照(静态内部字段)
  + 状态表(收件人/平台单号/运单号,可能晚于快照更新)
  + 最近一次成功取号记录(WaybillCodeId / Pid / ExpressCpCode / CreateDate)
  拼成订单行;PrintState/ExpressPrintTime 用取号记录覆盖(快照里恒为 0/空)
- externalSendSync.resolveSendRow:快照可用就不访问平台;缺快照(历史单)才回读兜底
- dgj 暴露 buildSendOrder 静态方法,供脚本/单测复用同一口径

实测(本地真实单 dgj-10000279877231):拼出的 Orders[0] 覆盖抓包全部 47 个关键字段
(163 个顶层键),面单块含 WaybillCodeId=10000298258339、Pid=ced304e7c1ffd618_0_1。

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
2026-11-07 08:12:54 +08:00

174 lines
7.4 KiB
JavaScript
Raw 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;
}
}
/**
* 从取号记录的平台原始返回里取面单信息(WaybillCode[] 第一张)
* @param {string|Object} rawResponse 取号记录的 raw_response
* @return {Object|null} 平台面单对象
*/
function pickWaybillFromFetchRecord(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;
}
/**
* 把平台面单对象转成订单行里的 `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) || '');
const expressCode = String((template && template.express_company_code) || '').trim();
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 waybillEntry = toWaybillEntry(waybill, { templateId, expressCode, expressName, subOrders });
let waybillCodes = Array.isArray(snap.WaybillCodes) ? snap.WaybillCodes.filter(item => item && item.WaybillCode) : [];
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();
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,
pickWaybillFromFetchRecord,
toWaybillEntry,
};