fix(order): 修复视频号浏览器打印报缺少 orders.contents 的问题
视频号(微信小店)订单为平台原生 taskList 任务结构(taskID/printInfo/printNum/splitControl/showDeliveryLogo/customInfo/extendData),不含 contents。按 WMS printer_data_template/sph.json 与 express_print_payload_builder 的 sph 分支组装 { command:'print', version:'2.0', requestID, taskList, printType, size, printer } 下发;同时为通用分支补齐 contents/预构建载荷的 JSON 字符串兼容与失败诊断日志。
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
parent
093053391a
commit
0c5170faac
@ -1307,7 +1307,8 @@ function shouldAlignPrinterViaComponent(component: string): boolean {
|
|||||||
rawOrders.forEach((raw, index) => {
|
rawOrders.forEach((raw, index) => {
|
||||||
if (!raw || typeof raw !== 'object') return;
|
if (!raw || typeof raw !== 'object') return;
|
||||||
const order = raw as Record<string, unknown>;
|
const order = raw as Record<string, unknown>;
|
||||||
const contents = order.contents;
|
// 后端可能把 contents 以 JSON 字符串返回,需先解析
|
||||||
|
const contents = normalizeContentsValue(order.contents);
|
||||||
if (!Array.isArray(contents) || contents.length === 0) return;
|
if (!Array.isArray(contents) || contents.length === 0) return;
|
||||||
const validContents = contents.filter(
|
const validContents = contents.filter(
|
||||||
item => item && typeof item === 'object',
|
item => item && typeof item === 'object',
|
||||||
@ -1326,6 +1327,142 @@ function shouldAlignPrinterViaComponent(component: string): boolean {
|
|||||||
return documents;
|
return documents;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** 解析 JSON 字符串或已解析对象(后端常把嵌套结构序列化成字符串返回) */
|
||||||
|
function tryParseJsonValue(raw: unknown): unknown {
|
||||||
|
if (typeof raw !== 'string') return raw;
|
||||||
|
const text = raw.trim();
|
||||||
|
if (!text || (text[0] !== '{' && text[0] !== '[')) return raw;
|
||||||
|
try {
|
||||||
|
return JSON.parse(text);
|
||||||
|
} catch {
|
||||||
|
return raw;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** 归一化 contents:兼容 JSON 字符串 / 单对象 */
|
||||||
|
function normalizeContentsValue(raw: unknown): unknown[] | null {
|
||||||
|
const parsed = tryParseJsonValue(raw);
|
||||||
|
if (Array.isArray(parsed)) return parsed;
|
||||||
|
if (parsed && typeof parsed === 'object') {
|
||||||
|
const rec = parsed as Record<string, unknown>;
|
||||||
|
if (Array.isArray(rec.contents)) return rec.contents;
|
||||||
|
if (Array.isArray(rec.documents)) return rec.documents;
|
||||||
|
return [parsed];
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** 解析后端预构建的打印载荷(兼容 JSON 字符串 / 数组包裹) */
|
||||||
|
export function parsePrebuiltPrintPayload(raw: unknown): Record<string, unknown> | null {
|
||||||
|
const direct = asRecord(raw);
|
||||||
|
if (direct) return direct;
|
||||||
|
|
||||||
|
const parsedCandidate = tryParseJsonValue(raw);
|
||||||
|
const parsedRecord = asRecord(parsedCandidate);
|
||||||
|
if (parsedRecord) return parsedRecord;
|
||||||
|
|
||||||
|
if (Array.isArray(parsedCandidate)) {
|
||||||
|
for (const item of parsedCandidate) {
|
||||||
|
const rec = parsePrebuiltPrintPayload(item);
|
||||||
|
if (rec) return rec;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** 判断是否为可直接下发的打印组件载荷(cmd 协议或已含 documents/task) */
|
||||||
|
function looksLikeComponentPrintPayload(payload: Record<string, unknown>): boolean {
|
||||||
|
if (asRecord(payload.task)) return true;
|
||||||
|
if (Array.isArray(payload.documents)) return true;
|
||||||
|
return String(payload.cmd ?? '').trim().toLowerCase() === 'print';
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 解析平台分组上的预构建载荷。
|
||||||
|
* 优先平台级字段(保持宽松:任意对象都视为载荷,兼容只含 data 的结构);
|
||||||
|
* 平台级缺失时回退到订单级字段(此时要求是完整组件载荷,避免误用订单字段)。
|
||||||
|
*/
|
||||||
|
function resolvePlatformPrebuiltPayload(
|
||||||
|
platformRec: Record<string, unknown>,
|
||||||
|
): Record<string, unknown> | null {
|
||||||
|
const platformCandidates = [
|
||||||
|
platformRec.print_data,
|
||||||
|
platformRec.express_data,
|
||||||
|
platformRec.print_payload,
|
||||||
|
platformRec.message,
|
||||||
|
];
|
||||||
|
for (const candidate of platformCandidates) {
|
||||||
|
const direct = asRecord(candidate);
|
||||||
|
if (direct) return direct;
|
||||||
|
// 仅接受看起来是完整组件载荷的 JSON 字符串,避免把普通文本字段误当成载荷
|
||||||
|
const parsed = parsePrebuiltPrintPayload(candidate);
|
||||||
|
if (parsed && looksLikeComponentPrintPayload(parsed)) return parsed;
|
||||||
|
}
|
||||||
|
|
||||||
|
const rawOrders = platformRec.orders ?? platformRec.order_list;
|
||||||
|
if (!Array.isArray(rawOrders)) return null;
|
||||||
|
for (const rawOrder of rawOrders) {
|
||||||
|
const order = asRecord(rawOrder);
|
||||||
|
if (!order) continue;
|
||||||
|
for (const key of ['print_data', 'express_data', 'print_payload', 'message']) {
|
||||||
|
const payload = parsePrebuiltPrintPayload(order[key]);
|
||||||
|
if (payload && looksLikeComponentPrintPayload(payload)) return payload;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 从 printInfo(base64 + URL 编码的 JSON)解析标签尺寸,失败回退 76x130(与后端 sph 打印模板一致)
|
||||||
|
*/
|
||||||
|
function resolveShipinhaoPrintSize(printInfo: unknown): { width: number; height: number } {
|
||||||
|
const fallback = { width: 76, height: 130 };
|
||||||
|
const text = String(printInfo ?? '').trim();
|
||||||
|
if (!text) return fallback;
|
||||||
|
try {
|
||||||
|
const decoded = JSON.parse(decodeURIComponent(atob(text))) as Record<string, unknown>;
|
||||||
|
const template = asRecord(decoded.template);
|
||||||
|
const width = Number(template?.width);
|
||||||
|
const height = Number(template?.height);
|
||||||
|
if (Number.isFinite(width) && Number.isFinite(height) && width > 0 && height > 0) {
|
||||||
|
return { width, height };
|
||||||
|
}
|
||||||
|
} catch {
|
||||||
|
// 解析失败按模板默认尺寸
|
||||||
|
}
|
||||||
|
return fallback;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 视频号(微信小店)打印载荷,与 WMS 端 printer_data_template/sph.json 一致:
|
||||||
|
* { command:'print', version:'2.0', requestID, taskList:[订单原生任务], printType, size, printer }
|
||||||
|
* 订单原生字段(taskID/printInfo/printNum/splitControl/showDeliveryLogo/customInfo/extendData)原样保留。
|
||||||
|
*/
|
||||||
|
export function buildShipinhaoPrintPayload(params: {
|
||||||
|
orders: unknown;
|
||||||
|
printer: string;
|
||||||
|
requestCode?: string;
|
||||||
|
}): Record<string, unknown> | null {
|
||||||
|
const { orders, printer, requestCode } = params;
|
||||||
|
if (!Array.isArray(orders) || orders.length === 0) return null;
|
||||||
|
|
||||||
|
const taskList: Array<Record<string, unknown>> = orders
|
||||||
|
.map((raw) => asRecord(raw))
|
||||||
|
.filter((order): order is Record<string, unknown> => !!order)
|
||||||
|
.map((order) => ({ ...order, printer }));
|
||||||
|
if (taskList.length === 0) return null;
|
||||||
|
|
||||||
|
return {
|
||||||
|
command: 'print',
|
||||||
|
version: '2.0',
|
||||||
|
requestID: requestCode || `wave-sph-${Date.now()}`,
|
||||||
|
taskList,
|
||||||
|
printType: 1,
|
||||||
|
size: resolveShipinhaoPrintSize(taskList[0]?.printInfo),
|
||||||
|
printer,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
/** 组装发往平台打印组件的 express JSON(与 oldprint / 菜鸟组件协议一致) */
|
/** 组装发往平台打印组件的 express JSON(与 oldprint / 菜鸟组件协议一致) */
|
||||||
export function buildExpressComponentPayload(params: {
|
export function buildExpressComponentPayload(params: {
|
||||||
printer: string;
|
printer: string;
|
||||||
@ -2121,12 +2258,17 @@ async function resolveFinalExpressPrinter(
|
|||||||
}
|
}
|
||||||
|
|
||||||
const rawOrders = platformRec.orders ?? platformRec.order_list;
|
const rawOrders = platformRec.orders ?? platformRec.order_list;
|
||||||
const prebuilt = asRecord(
|
const prebuilt = resolvePlatformPrebuiltPayload(platformRec);
|
||||||
platformRec.print_data ??
|
// 视频号(微信小店)为原生 taskList 协议,与 contents 结构不兼容
|
||||||
platformRec.express_data ??
|
const shipinhaoPayload = isShipinhaoComponent(component)
|
||||||
platformRec.print_payload ??
|
? buildShipinhaoPrintPayload({
|
||||||
platformRec.message,
|
orders: rawOrders,
|
||||||
);
|
printer: finalPrinter,
|
||||||
|
requestCode: requestCode
|
||||||
|
? `${requestCode}-${wave_no}-${platform}-${sys_logistics_code}-${platformIndex}`
|
||||||
|
: undefined,
|
||||||
|
})
|
||||||
|
: null;
|
||||||
let expressPayload: Record<string, unknown>;
|
let expressPayload: Record<string, unknown>;
|
||||||
let orderCount = 0;
|
let orderCount = 0;
|
||||||
|
|
||||||
@ -2194,6 +2336,61 @@ async function resolveFinalExpressPrinter(
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
} else if (shipinhaoPayload) {
|
||||||
|
const nativeTaskList = shipinhaoPayload.taskList as Record<string, unknown>[];
|
||||||
|
waveBrowserPrintLog('sendWavePlatformBrowserPrint: 构建视频号 taskList 载荷', {
|
||||||
|
wave_no,
|
||||||
|
platform_name,
|
||||||
|
taskCount: nativeTaskList.length,
|
||||||
|
requestID: shipinhaoPayload.requestID,
|
||||||
|
});
|
||||||
|
const nativePrintData = buildPrintTaskData(
|
||||||
|
{
|
||||||
|
printer: finalPrinter,
|
||||||
|
type: 'express',
|
||||||
|
component,
|
||||||
|
computerId: 'browser',
|
||||||
|
data: shipinhaoPayload,
|
||||||
|
},
|
||||||
|
defaultPrintIdGenerator(),
|
||||||
|
shipinhaoPayload,
|
||||||
|
);
|
||||||
|
const nativeDispatchResult = await dispatchToPrintComponent(nativePrintData, {
|
||||||
|
fetchWindowsPrinters: createBrowserPrinterListFetcher(finalPrinter),
|
||||||
|
sendToComponent: sendPayloadToComponentWs,
|
||||||
|
skipPrinterValidation: true,
|
||||||
|
});
|
||||||
|
if (nativeDispatchResult.ok) {
|
||||||
|
successCount += 1;
|
||||||
|
waveBrowserPrintLog('sendWavePlatformBrowserPrint: 视频号分组下发成功', {
|
||||||
|
wave_no,
|
||||||
|
platform_name,
|
||||||
|
});
|
||||||
|
items.push({
|
||||||
|
...baseItem,
|
||||||
|
component,
|
||||||
|
printer: finalPrinter,
|
||||||
|
order_count: nativeTaskList.length,
|
||||||
|
flag: 'success',
|
||||||
|
message: '已发送至本地打印组件',
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
waveBrowserPrintLog('sendWavePlatformBrowserPrint: 视频号分组下发失败', {
|
||||||
|
wave_no,
|
||||||
|
platform_name,
|
||||||
|
error: nativeDispatchResult.error,
|
||||||
|
detail: nativeDispatchResult.detail,
|
||||||
|
});
|
||||||
|
items.push({
|
||||||
|
...baseItem,
|
||||||
|
component,
|
||||||
|
printer: finalPrinter,
|
||||||
|
order_count: nativeTaskList.length,
|
||||||
|
flag: 'failure',
|
||||||
|
message: nativeDispatchResult.error,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
continue;
|
||||||
} else {
|
} else {
|
||||||
const documents = extractWavePlatformPrintDocuments(rawOrders);
|
const documents = extractWavePlatformPrintDocuments(rawOrders);
|
||||||
waveBrowserPrintLog('sendWavePlatformBrowserPrint: 从 orders 提取面单', {
|
waveBrowserPrintLog('sendWavePlatformBrowserPrint: 从 orders 提取面单', {
|
||||||
@ -2202,9 +2399,15 @@ async function resolveFinalExpressPrinter(
|
|||||||
documentCount: documents.length,
|
documentCount: documents.length,
|
||||||
});
|
});
|
||||||
if (!documents.length) {
|
if (!documents.length) {
|
||||||
|
const orderList = Array.isArray(rawOrders) ? rawOrders : [];
|
||||||
|
const firstOrder = asRecord(orderList[0]);
|
||||||
waveBrowserPrintLog('sendWavePlatformBrowserPrint: 跳过 — 缺少 orders.contents', {
|
waveBrowserPrintLog('sendWavePlatformBrowserPrint: 跳过 — 缺少 orders.contents', {
|
||||||
wave_no,
|
wave_no,
|
||||||
platform_name,
|
platform_name,
|
||||||
|
orderCount: orderList.length,
|
||||||
|
platformKeys: Object.keys(platformRec),
|
||||||
|
firstOrderKeys: firstOrder ? Object.keys(firstOrder) : [],
|
||||||
|
firstOrderContentsType: firstOrder ? typeof firstOrder.contents : 'undefined',
|
||||||
});
|
});
|
||||||
items.push({
|
items.push({
|
||||||
...baseItem,
|
...baseItem,
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user