@pisell/private-materials 6.12.367 → 6.12.368

package/es/components/sharedSecondaryBigSale/SharedSecondaryBigSaleReceiver.d.ts

@@ -0,0 +1 @@
+export { };

package/es/components/sharedSecondaryBigSale/SharedSecondaryBigSaleReceiver.js

@@ -1,65 +1,50 @@
 import useEngineContext from "../../hooks/useEngineContext.js";
 import { _asyncToGenerator } from "../../_virtual/_@oxc-project_runtime@0.122.0/helpers/asyncToGenerator.js";
 import { useSalesSdk } from "../../plus/salesSdk/hooks/useSalesSdk.js";
-import { getTempOrderSyncPayload, shouldApplySharedTempOrderPayload } from "../../plus/salesSdk/tempOrderSync.js";
+import { TEMP_ORDER_SYNC_REQUEST_MESSAGE_TYPE, getTempOrderSyncPayload, shouldApplySharedTempOrderPayload } from "../../plus/salesSdk/tempOrderSync.js";
 import "../../plus/salesSdk/index.js";
-import { useEffect, useRef } from "react";
-import { useMemoizedFn } from "ahooks";
+import { useEffect, useRef, useState } from "react";
 //#region src/components/sharedSecondaryBigSale/SharedSecondaryBigSaleReceiver.tsx
 function createRequestId() {
 	return `shared-secondary-${Date.now()}-${Math.random().toString(16).slice(2)}`;
 }
 /**
-* 通用副屏消息桥：不按 osKey / businessCode 过滤，只接受激活主屏的最新快照。
+* 在销售 Provider 外接收快照，先确定业务上下文，再创建只读销售实例。
 */
-function SharedSecondaryBigSaleReceiver() {
+function useSharedSecondaryBigSaleSnapshot() {
 	var _context$appHelper, _context$appHelper$ge, _app$getPlugin, _unifiedCommunication;
 	const context = useEngineContext();
 	const app = context === null || context === void 0 || (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 || (_context$appHelper = _context$appHelper.utils) === null || _context$appHelper === void 0 || (_context$appHelper$ge = _context$appHelper.getApp) === null || _context$appHelper$ge === void 0 ? void 0 : _context$appHelper$ge.call(_context$appHelper);
 	const unifiedCommunication = app === null || app === void 0 || (_app$getPlugin = app.getPlugin) === null || _app$getPlugin === void 0 ? void 0 : _app$getPlugin.call(app, "unifiedCommunication");
 	const { runtime } = (unifiedCommunication === null || unifiedCommunication === void 0 || (_unifiedCommunication = unifiedCommunication.useRuntime) === null || _unifiedCommunication === void 0 ? void 0 : _unifiedCommunication.call(unifiedCommunication)) || {};
 	const isSecondaryScreen = (runtime === null || runtime === void 0 ? void 0 : runtime.role) === "secondary-screen";
-	const sales = useSalesSdk();
 	const latestTimestampRef = useRef(0);
-	const applyQueueRef = useRef(Promise.resolve());
-	const applyPayload = useMemoizedFn((payload) => {
-		if (!shouldApplySharedTempOrderPayload(payload, latestTimestampRef.current)) return;
-		latestTimestampRef.current = payload.timestamp;
-		applyQueueRef.current = applyQueueRef.current.then(_asyncToGenerator(function* () {
-			var _sales$bookingTicket2;
-			if (payload.timestamp < latestTimestampRef.current) return;
-			if (payload.tempOrder) {
-				var _sales$bookingTicket;
-				if (!((_sales$bookingTicket = sales.bookingTicket) === null || _sales$bookingTicket === void 0 ? void 0 : _sales$bookingTicket.replaceTempOrder)) {
-					console.warn("[SharedSecondaryBigSale] 当前 BookingTicket 不支持 replaceTempOrder");
-					return;
-				}
-				yield sales.bookingTicket.replaceTempOrder(payload.tempOrder);
-			} else yield sales.clearCartAndReset();
-			if (payload.walletAssetsSnapshot && ((_sales$bookingTicket2 = sales.bookingTicket) === null || _sales$bookingTicket2 === void 0 ? void 0 : _sales$bookingTicket2.importWalletAssetsSnapshot)) yield sales.bookingTicket.importWalletAssetsSnapshot(payload.walletAssetsSnapshot);
-		})).catch((error) => {
-			console.warn("[SharedSecondaryBigSale] 应用副屏订单快照失败", error);
-		});
-	});
+	const [snapshot, setSnapshot] = useState(null);
 	useEffect(() => {
 		var _unifiedCommunication2, _unifiedCommunication3, _unifiedCommunication4, _unifiedCommunication5;
-		if (!isSecondaryScreen || !sales.bookingTicket) return;
+		if (!isSecondaryScreen) return;
+		let cancelled = false;
 		const handleMessage = (event) => {
 			const payload = getTempOrderSyncPayload(event);
-			if (!payload) return;
-			applyPayload(payload);
+			if (cancelled || !payload || payload.sourceRole === "secondary-screen") return;
+			if (!shouldApplySharedTempOrderPayload(payload, latestTimestampRef.current)) return;
+			latestTimestampRef.current = payload.timestamp;
+			setSnapshot(payload);
 		};
 		const listenerHandle = unifiedCommunication === null || unifiedCommunication === void 0 || (_unifiedCommunication2 = unifiedCommunication.sdk) === null || _unifiedCommunication2 === void 0 || (_unifiedCommunication3 = _unifiedCommunication2.onMessage) === null || _unifiedCommunication3 === void 0 ? void 0 : _unifiedCommunication3.call(_unifiedCommunication2, handleMessage);
-		unifiedCommunication === null || unifiedCommunication === void 0 || (_unifiedCommunication4 = unifiedCommunication.sdk) === null || _unifiedCommunication4 === void 0 || (_unifiedCommunication5 = _unifiedCommunication4.publishData) === null || _unifiedCommunication5 === void 0 || _unifiedCommunication5.call(_unifiedCommunication4, {
+		Promise.resolve(unifiedCommunication === null || unifiedCommunication === void 0 || (_unifiedCommunication4 = unifiedCommunication.sdk) === null || _unifiedCommunication4 === void 0 || (_unifiedCommunication5 = _unifiedCommunication4.publishData) === null || _unifiedCommunication5 === void 0 ? void 0 : _unifiedCommunication5.call(_unifiedCommunication4, {
 			target: { type: "main" },
 			data: {
-				type: "sales_sdk_temp_order_sync_request",
+				type: TEMP_ORDER_SYNC_REQUEST_MESSAGE_TYPE,
 				requestId: createRequestId(),
 				timestamp: Date.now()
 			},
 			meta: {}
+		})).catch((error) => {
+			console.warn("[SharedSecondaryBigSale] 请求主屏订单快照失败", error);
 		});
 		return () => {
+			cancelled = true;
 			if (listenerHandle && typeof listenerHandle.then === "function") listenerHandle.then((handle) => {
 				var _handle$remove;
 				return handle === null || handle === void 0 || (_handle$remove = handle.remove) === null || _handle$remove === void 0 ? void 0 : _handle$remove.call(handle);
@@ -69,13 +54,43 @@ function SharedSecondaryBigSaleReceiver() {
 				listenerHandle === null || listenerHandle === void 0 || (_remove = listenerHandle.remove) === null || _remove === void 0 || _remove.call(listenerHandle);
 			}
 		};
+	}, [isSecondaryScreen, unifiedCommunication]);
+	return snapshot;
+}
+/** 配置就绪后将同一业务实例的订单快照串行应用，不等待只读实例变为 ready。 */
+function SharedSecondaryBigSaleReceiver({ payload }) {
+	const sales = useSalesSdk();
+	const bookingTicket = sales.bookingTicket;
+	const clearCartAndReset = sales.clearCartAndReset;
+	const settingsPending = sales.salesSettingsSource === "picoding" && !sales.salesSettings;
+	const applyQueueRef = useRef(Promise.resolve());
+	useEffect(() => {
+		if (!bookingTicket || settingsPending) return;
+		let cancelled = false;
+		applyQueueRef.current = applyQueueRef.current.then(_asyncToGenerator(function* () {
+			if (cancelled) return;
+			if (payload.tempOrder) {
+				if (!bookingTicket.replaceTempOrder) {
+					console.warn("[SharedSecondaryBigSale] 当前销售实例不支持 replaceTempOrder");
+					return;
+				}
+				yield bookingTicket.replaceTempOrder(payload.tempOrder);
+			} else yield clearCartAndReset();
+			if (cancelled) return;
+			if (payload.walletAssetsSnapshot && bookingTicket.importWalletAssetsSnapshot) yield bookingTicket.importWalletAssetsSnapshot(payload.walletAssetsSnapshot);
+		})).catch((error) => {
+			console.warn("[SharedSecondaryBigSale] 应用副屏订单快照失败", error);
+		});
+		return () => {
+			cancelled = true;
+		};
 	}, [
-		applyPayload,
-		isSecondaryScreen,
-		sales.bookingTicket,
-		unifiedCommunication
+		bookingTicket,
+		clearCartAndReset,
+		payload,
+		settingsPending
 	]);
 	return null;
 }
 //#endregion
-export { SharedSecondaryBigSaleReceiver };
+export { SharedSecondaryBigSaleReceiver, useSharedSecondaryBigSaleSnapshot };

package/es/components/sharedSecondaryBigSale/index.js

@@ -1,14 +1,38 @@
+import useEngineContext from "../../hooks/useEngineContext.js";
+import { resolveTempOrderSyncSalesContext } from "../../plus/salesSdk/tempOrderSync.js";
 import BigSale from "../bigSale/index.js";
-import { SharedSecondaryBigSaleReceiver } from "./SharedSecondaryBigSaleReceiver.js";
-import React from "react";
+import { SharedSecondaryBigSaleReceiver, useSharedSecondaryBigSaleSnapshot } from "./SharedSecondaryBigSaleReceiver.js";
+import React, { useMemo } from "react";
 //#region src/components/sharedSecondaryBigSale/index.tsx
 const DEFAULT_OS_KEY = "shared-secondary-big-sale";
+let nextScopeId = 0;
 /**
 * 多个主屏销售实例共用的只读副屏；订单内容和布局继续复用 BigSale。
 */
 function SharedSecondaryBigSale({ osKey = DEFAULT_OS_KEY, saleDetailModuleConfig, secondaryScreenDisplay, className, style }) {
-	return /* @__PURE__ */ React.createElement(BigSale, {
+	var _context$appHelper, _context$appHelper$ge;
+	const payload = useSharedSecondaryBigSaleSnapshot();
+	const context = useEngineContext();
+	const salesContext = payload ? resolveTempOrderSyncSalesContext(payload) : void 0;
+	const businessCode = salesContext === null || salesContext === void 0 ? void 0 : salesContext.businessCode;
+	const localChannel = context === null || context === void 0 || (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 || (_context$appHelper = _context$appHelper.utils) === null || _context$appHelper === void 0 || (_context$appHelper$ge = _context$appHelper.getData) === null || _context$appHelper$ge === void 0 ? void 0 : _context$appHelper$ge.call(_context$appHelper, "channel");
+	const channel = (salesContext === null || salesContext === void 0 ? void 0 : salesContext.channel) || (typeof localChannel === "string" && localChannel.trim() ? localChannel.trim() : "cds");
+	const scopeId = useMemo(() => ++nextScopeId, [
 		osKey,
+		businessCode,
+		channel
+	]);
+	const otherParams = useMemo(() => ({ channel }), [channel]);
+	if (!payload || !businessCode) return /* @__PURE__ */ React.createElement("div", {
+		className,
+		style,
+		"aria-busy": "true"
+	});
+	return /* @__PURE__ */ React.createElement(BigSale, {
+		key: scopeId,
+		osKey: `${osKey}-${encodeURIComponent(channel)}-${scopeId}`,
+		businessCode,
+		otherParams,
 		mode: "ticket",
 		template: "secondaryScreen",
 		saleDetailTemplate: "A",
@@ -20,7 +44,7 @@ function SharedSecondaryBigSale({ osKey = DEFAULT_OS_KEY, saleDetailModuleConfig
 		saleDetailModuleConfig,
 		className,
 		style,
-		bootstrapSlot: /* @__PURE__ */ React.createElement(SharedSecondaryBigSaleReceiver, null)
+		bootstrapSlot: /* @__PURE__ */ React.createElement(SharedSecondaryBigSaleReceiver, { payload })
 	});
 }
 //#endregion

package/es/plus/invoice/ReceiptRenderer.js

@@ -285,8 +285,9 @@ function bookingHeadersAreVisible(config) {
 	return isInvoiceFieldVisible(config, "booking");
 }
 const renderBrand = ({ config, receipt }) => {
-	var _receipt$secondary2, _receipt$secondary3;
+	var _receipt$secondary2, _receipt$secondary3, _receipt$secondary4;
 	const base = receipt.baseData;
+	const isJapaneseEnglish = receipt.locale.toLowerCase().startsWith("ja") && ((_receipt$secondary2 = receipt.secondary) === null || _receipt$secondary2 === void 0 ? void 0 : _receipt$secondary2.locale.toLowerCase().startsWith("en"));
 	const show = (field) => isInvoiceFieldVisible(config, field);
 	const logo = show("logo") && receipt.brandLogo;
 	const name = show("store_name") && base.shop_name;
@@ -298,7 +299,7 @@ const renderBrand = ({ config, receipt }) => {
 	return /* @__PURE__ */ React.createElement("section", { className: `${PREFIX}__receipt-brand` }, logo ? /* @__PURE__ */ React.createElement("img", {
 		alt: "",
 		src: receipt.brandLogo
-	}) : null, name ? /* @__PURE__ */ React.createElement("h2", null, bilingualText(base.shop_name, (_receipt$secondary2 = receipt.secondary) === null || _receipt$secondary2 === void 0 ? void 0 : _receipt$secondary2.baseData.shop_name)) : null, taxNumber ? /* @__PURE__ */ React.createElement("div", null, receipt.taxNumberLabel ? `${receipt.taxNumberLabel}: ` : "", base.shop_tax_number) : null, address ? /* @__PURE__ */ React.createElement("div", null, bilingualText(base.shop_address, (_receipt$secondary3 = receipt.secondary) === null || _receipt$secondary3 === void 0 ? void 0 : _receipt$secondary3.baseData.shop_address)) : null, phone ? /* @__PURE__ */ React.createElement("div", null, base.shop_phone) : null, title ? /* @__PURE__ */ React.createElement("strong", { className: `${PREFIX}__receipt-bill-title` }, receiptLabel(receipt, receipt.billTitle)) : null);
+	}) : null, name ? /* @__PURE__ */ React.createElement("h2", null, bilingualText(base.shop_name, (_receipt$secondary3 = receipt.secondary) === null || _receipt$secondary3 === void 0 ? void 0 : _receipt$secondary3.baseData.shop_name)) : null, taxNumber ? /* @__PURE__ */ React.createElement("div", null, receipt.taxNumberLabel ? `${receipt.taxNumberLabel}: ` : "", base.shop_tax_number) : null, address ? /* @__PURE__ */ React.createElement("div", null, bilingualText(base.shop_address, (_receipt$secondary4 = receipt.secondary) === null || _receipt$secondary4 === void 0 ? void 0 : _receipt$secondary4.baseData.shop_address)) : null, phone ? /* @__PURE__ */ React.createElement("div", null, base.shop_phone) : null, title ? /* @__PURE__ */ React.createElement("strong", { className: `${PREFIX}__receipt-bill-title` }, isJapaneseEnglish ? label(receipt.billTitle, "en") : receiptLabel(receipt, receipt.billTitle)) : null);
 };
 /** Stable row keys survive translation; localized labels are never selectors. */
 function visibleSemanticRows(rows, config, fields) {
@@ -326,8 +327,8 @@ const renderOrder = ({ config, receipt }) => {
 	}) : null);
 };
 const renderCustom = ({ config, receipt }) => {
-	var _receipt$secondary4;
-	return renderCustomModule(config, receipt.locale, (_receipt$secondary4 = receipt.secondary) === null || _receipt$secondary4 === void 0 ? void 0 : _receipt$secondary4.locale);
+	var _receipt$secondary5;
+	return renderCustomModule(config, receipt.locale, (_receipt$secondary5 = receipt.secondary) === null || _receipt$secondary5 === void 0 ? void 0 : _receipt$secondary5.locale);
 };
 const MODULE_RENDERERS = {
 	reference: ({ receipt }) => receipt.reference ? /* @__PURE__ */ React.createElement("section", { className: `${PREFIX}__receipt-reference` }, /* @__PURE__ */ React.createElement("span", null, receiptLabel(receipt, "Reference")), /* @__PURE__ */ React.createElement("strong", null, receipt.reference)) : null,
@@ -346,8 +347,8 @@ const MODULE_RENDERERS = {
 	line_groups: ({ config, receipt }) => {
 		const showBookingHeaders = bookingHeadersAreVisible(config);
 		const lineGroups = showBookingHeaders ? receipt.lineGroups.filter((group) => {
-			var _receipt$secondary5;
-			return group.products.length || lineGroupMetaRows(group, receipt.locale, (_receipt$secondary5 = receipt.secondary) === null || _receipt$secondary5 === void 0 ? void 0 : _receipt$secondary5.locale).length;
+			var _receipt$secondary6;
+			return group.products.length || lineGroupMetaRows(group, receipt.locale, (_receipt$secondary6 = receipt.secondary) === null || _receipt$secondary6 === void 0 ? void 0 : _receipt$secondary6.locale).length;
 		}) : receipt.products.length ? [{
 			key: "all-items",
 			products: receipt.products,
@@ -358,12 +359,12 @@ const MODULE_RENDERERS = {
 			locale: receipt.locale,
 			rows: tableRows
 		}), lineGroups.map((group) => {
-			var _receipt$secondary6;
+			var _receipt$secondary7;
 			return /* @__PURE__ */ React.createElement(LineGroup, {
 				group,
 				key: group.key,
 				locale: receipt.locale,
-				secondaryLocale: (_receipt$secondary6 = receipt.secondary) === null || _receipt$secondary6 === void 0 ? void 0 : _receipt$secondary6.locale,
+				secondaryLocale: (_receipt$secondary7 = receipt.secondary) === null || _receipt$secondary7 === void 0 ? void 0 : _receipt$secondary7.locale,
 				config
 			});
 		})) : null;
@@ -399,8 +400,8 @@ const MODULE_RENDERERS = {
 		locale: receipt.locale
 	})) : null,
 	total_savings: ({ config, receipt }) => {
-		var _receipt$secondary7;
-		return receipt.totalSavings ? /* @__PURE__ */ React.createElement("section", null, /* @__PURE__ */ React.createElement("div", { className: `${PREFIX}__receipt-savings` }, /* @__PURE__ */ React.createElement("strong", null, receiptLabel(receipt, "Total Savings")), /* @__PURE__ */ React.createElement("strong", null, receipt.totalSavings)), isInvoiceFieldVisible(config, "description") && receipt.totalSavingsDescription ? /* @__PURE__ */ React.createElement("p", { className: `${PREFIX}__receipt-savings-description` }, bilingualText(receipt.totalSavingsDescription, (_receipt$secondary7 = receipt.secondary) === null || _receipt$secondary7 === void 0 ? void 0 : _receipt$secondary7.totalSavingsDescription)) : null) : null;
+		var _receipt$secondary8;
+		return receipt.totalSavings ? /* @__PURE__ */ React.createElement("section", null, /* @__PURE__ */ React.createElement("div", { className: `${PREFIX}__receipt-savings` }, /* @__PURE__ */ React.createElement("strong", null, receiptLabel(receipt, "Total Savings")), /* @__PURE__ */ React.createElement("strong", null, receipt.totalSavings)), isInvoiceFieldVisible(config, "description") && receipt.totalSavingsDescription ? /* @__PURE__ */ React.createElement("p", { className: `${PREFIX}__receipt-savings-description` }, bilingualText(receipt.totalSavingsDescription, (_receipt$secondary8 = receipt.secondary) === null || _receipt$secondary8 === void 0 ? void 0 : _receipt$secondary8.totalSavingsDescription)) : null) : null;
 	},
 	custom_3: renderCustom,
 	barcode: ({ receipt }) => receipt.barcodeValue ? /* @__PURE__ */ React.createElement("section", { className: `${PREFIX}__receipt-barcode` }, /* @__PURE__ */ React.createElement(QRCode, {

package/es/plus/saasDevice/devicePasscodes/model.js

@@ -1,10 +1,10 @@
 import { _objectSpread2 } from "../../../_virtual/_@oxc-project_runtime@0.122.0/helpers/objectSpread2.js";
 import dayjs from "dayjs";
-import timezone from "dayjs/plugin/timezone";
-import utc from "dayjs/plugin/utc";
+import timezonePlugin from "dayjs/plugin/timezone";
+import utcPlugin from "dayjs/plugin/utc";
 //#region src/plus/saasDevice/devicePasscodes/model.ts
-dayjs.extend(utc);
-dayjs.extend(timezone);
+dayjs.extend(utcPlugin);
+dayjs.extend(timezonePlugin);
 const INITIAL_DEVICE_PASSCODE_STATE = {
 	deviceIds: [],
 	devicesById: {}

package/es/plus/salesSdk/context/SalesSdkProvider.js

@@ -563,11 +563,17 @@ const SalesSdkProvider = ({ osKey, enableMultiCurrencySettlement = false, soluti
 			snapshotPreserved: false
 		};
 	});
+	const isOrderBootstrapPending = lifecycleOwner === "provider" && (autoRestoreOnInit || Boolean(autoBootstrap && orderId)) && settledBootstrapKey !== bootstrapKey;
+	const syncBusinessCode = businessCode || moduleOtherParams.businessCode || (otherParams === null || otherParams === void 0 ? void 0 : otherParams.business_code);
 	const { publishTempOrder } = useSalesSdkTempOrderSync({
 		enabled: enableTempOrderSync,
-		ready: !(lifecycleOwner === "provider" && (autoRestoreOnInit || Boolean(autoBootstrap && orderId)) && settledBootstrapKey !== bootstrapKey),
+		ready: !isOrderBootstrapPending,
 		isActive,
 		osKey: (osKey === null || osKey === void 0 || (_osKey$replace = osKey.replace) === null || _osKey$replace === void 0 ? void 0 : _osKey$replace.call(osKey, "bookingTicket-", "")) || osKey,
+		salesContext: typeof syncBusinessCode === "string" && syncBusinessCode.trim() ? {
+			businessCode: syncBusinessCode,
+			channel: productLoadChannel
+		} : void 0,
 		bookingTicket,
 		refreshRootSnapshot
 	});

package/es/plus/salesSdk/hooks/useSalesSdkTempOrderSync.js

@@ -1,6 +1,6 @@
 import useEngineContext from "../../../hooks/useEngineContext.js";
 import { _asyncToGenerator } from "../../../_virtual/_@oxc-project_runtime@0.122.0/helpers/asyncToGenerator.js";
-import { TEMP_ORDER_SYNC_MESSAGE_TYPE, TEMP_ORDER_SYNC_REQUEST_MESSAGE_TYPE, cloneTempOrderSyncSnapshot, getTempOrderSyncPayload, getTempOrderSyncRequestPayload, resolveTempOrderSyncPeerTarget, resolveTempOrderSyncScreenRole, shouldRespondToTempOrderSyncRequest } from "../tempOrderSync.js";
+import { TEMP_ORDER_SYNC_MESSAGE_TYPE, TEMP_ORDER_SYNC_REQUEST_MESSAGE_TYPE, cloneTempOrderSyncSnapshot, getTempOrderSyncPayload, getTempOrderSyncRequestPayload, resolveTempOrderSyncPeerTarget, resolveTempOrderSyncSalesContext, resolveTempOrderSyncScreenRole, shouldRespondToTempOrderSyncRequest } from "../tempOrderSync.js";
 import { useEffect, useRef } from "react";
 import { cloneDeep } from "lodash";
 import { useDebounceFn, useMemoizedFn } from "ahooks";
@@ -17,6 +17,13 @@ function getPayloadRevision(payload) {
 function getPayloadSourceKey(payload) {
 	return `${payload.osKey}:${payload.sourceId}`;
 }
+function getSalesContextKey(salesContext) {
+	return JSON.stringify([salesContext === null || salesContext === void 0 ? void 0 : salesContext.businessCode, salesContext === null || salesContext === void 0 ? void 0 : salesContext.channel]);
+}
+function isSalesContextAlignedWithOrder(tempOrder, salesContext) {
+	const orderBusinessCode = tempOrder === null || tempOrder === void 0 ? void 0 : tempOrder.business_code;
+	return !salesContext || typeof orderBusinessCode !== "string" || !orderBusinessCode.trim() || orderBusinessCode === salesContext.businessCode;
+}
 function resolvePayloadDiscountState(payload) {
 	var _payload$tempOrder;
 	if (payload.discountState) return cloneDeep(payload.discountState);
@@ -50,7 +57,7 @@ function isWalletSnapshotAlignedWithCurrentOrder(bookingTicket, snapshot) {
 * 两端都可发布本地变更、接收同 osKey 快照；页面激活时向更早激活的对端补拉。
 * 远端快照应用期间禁止再次发布，避免 replaceTempOrder 触发 refresh 后形成回环。
 */
-function useSalesSdkTempOrderSync({ enabled, ready = true, isActive = true, osKey, bookingTicket, refreshRootSnapshot }) {
+function useSalesSdkTempOrderSync({ enabled, ready = true, isActive = true, osKey, salesContext, bookingTicket, refreshRootSnapshot }) {
 	var _context$appHelper, _context$appHelper$ge, _app$getPlugin, _unifiedCommunication;
 	const context = useEngineContext();
 	const app = context === null || context === void 0 || (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 || (_context$appHelper = _context$appHelper.utils) === null || _context$appHelper === void 0 || (_context$appHelper$ge = _context$appHelper.getApp) === null || _context$appHelper$ge === void 0 ? void 0 : _context$appHelper$ge.call(_context$appHelper);
@@ -79,13 +86,19 @@ function useSalesSdkTempOrderSync({ enabled, ready = true, isActive = true, osKe
 	const latestOfferedRevisionBySourceRef = useRef(/* @__PURE__ */ new Map());
 	const applyQueueRef = useRef(Promise.resolve());
 	const lastAppliedRemoteOriginRef = useRef(null);
+	const salesContextKey = getSalesContextKey(salesContext);
+	const previousSalesContextKeyRef = useRef(salesContextKey);
 	isActiveRef.current = isActive;
 	readyRef.current = ready;
 	const getPeerTarget = useMemoizedFn((role) => resolveTempOrderSyncPeerTarget(role, endpoints));
-	/** 在触发发布时一次性深拷贝订单与折扣上下文，避免防抖期间 OS 原地修改造成版本错配。 */
+	/** 发布时一起拷贝订单、业务与折扣上下文，避免防抖期间 OS 原地修改造成版本错配。 */
 	const captureRuntimeSnapshot = useMemoizedFn((tempOrder, causalOrigin) => {
 		const snapshot = {
 			tempOrder,
+			salesContext: resolveTempOrderSyncSalesContext({
+				tempOrder,
+				salesContext
+			}),
 			causalOrigin
 		};
 		if (!bookingTicket) return cloneTempOrderSyncSnapshot(snapshot);
@@ -112,6 +125,12 @@ function useSalesSdkTempOrderSync({ enabled, ready = true, isActive = true, osKe
 		var _ref = _asyncToGenerator(function* (snapshot, options = {}) {
 			if (!enabled || !ready || !screenRole || !isActiveRef.current) return;
 			if (remoteApplyingRef.current && !options.responseToRequestId) return;
+			if (!isSalesContextAlignedWithOrder(snapshot.tempOrder, snapshot.salesContext)) return;
+			const currentSalesContext = resolveTempOrderSyncSalesContext({
+				tempOrder: snapshot.tempOrder,
+				salesContext
+			});
+			if (getSalesContextKey(snapshot.salesContext) !== getSalesContextKey(currentSalesContext)) return;
 			if (options.incrementRevision !== false) revisionRef.current += 1;
 			try {
 				var _snapshot$causalOrigi, _unifiedCommunication2, _unifiedCommunication3;
@@ -134,6 +153,7 @@ function useSalesSdkTempOrderSync({ enabled, ready = true, isActive = true, osKe
 						timestamp: Date.now(),
 						isActive: true,
 						tempOrder: snapshot.tempOrder,
+						salesContext: snapshot.salesContext,
 						discountState: snapshot.discountState,
 						walletAssetsSnapshot: snapshot.walletAssetsSnapshot
 					},
@@ -161,7 +181,7 @@ function useSalesSdkTempOrderSync({ enabled, ready = true, isActive = true, osKe
 	});
 	const publishTempOrder = useMemoizedFn((tempOrder, options = {}) => {
 		var _lastAppliedRemoteOri;
-		if (!enabled || !ready || !screenRole || !isActiveRef.current || remoteApplyingRef.current) return;
+		if (!enabled || !ready || !screenRole || !isActiveRef.current || remoteApplyingRef.current || !isSalesContextAlignedWithOrder(tempOrder, salesContext)) return;
 		const causalOrigin = options.preserveRemoteOrigin ? (_lastAppliedRemoteOri = lastAppliedRemoteOriginRef.current) !== null && _lastAppliedRemoteOri !== void 0 ? _lastAppliedRemoteOri : void 0 : void 0;
 		if (!options.preserveRemoteOrigin) {
 			lastAppliedRemoteOriginRef.current = null;
@@ -476,6 +496,26 @@ function useSalesSdkTempOrderSync({ enabled, ready = true, isActive = true, osKe
 		applyPayload,
 		cancelDebouncedPublish
 	]);
+	useEffect(() => {
+		var _bookingTicket$getTem5, _bookingTicket$getTem6;
+		if (previousSalesContextKeyRef.current === salesContextKey) return;
+		cancelDebouncedPublish();
+		if (!enabled || !ready || !isActive || screenRole !== "main" || !salesContext || !bookingTicket || remoteApplyingRef.current) return;
+		const tempOrder = (_bookingTicket$getTem5 = (_bookingTicket$getTem6 = bookingTicket.getTempOrder) === null || _bookingTicket$getTem6 === void 0 ? void 0 : _bookingTicket$getTem6.call(bookingTicket)) !== null && _bookingTicket$getTem5 !== void 0 ? _bookingTicket$getTem5 : null;
+		if (!isSalesContextAlignedWithOrder(tempOrder, salesContext)) return;
+		previousSalesContextKeyRef.current = salesContextKey;
+		publishTempOrder(tempOrder);
+	}, [
+		salesContextKey,
+		bookingTicket,
+		enabled,
+		ready,
+		isActive,
+		osKey,
+		screenRole,
+		publishTempOrder,
+		cancelDebouncedPublish
+	]);
 	useEffect(() => () => {
 		activationEpochRef.current += 1;
 		activationKeyRef.current = null;

package/es/plus/salesSdk/tempOrderSync.d.ts

@@ -0,0 +1 @@
+export { };

package/es/plus/salesSdk/tempOrderSync.js

@@ -20,6 +20,16 @@ function getMessageData(event) {
 function isRecord(value) {
 	return Boolean(value) && typeof value === "object" && !Array.isArray(value);
 }
+function isSalesContext(value) {
+	return isRecord(value) && typeof value.businessCode === "string" && value.businessCode.trim().length > 0 && (value.channel === void 0 || typeof value.channel === "string" && value.channel.trim().length > 0);
+}
+/** 旧发送端只有订单字段；它无法证明销售渠道，因此不推测 channel。 */
+function resolveTempOrderSyncSalesContext(payload) {
+	var _payload$tempOrder;
+	if (payload.salesContext) return payload.salesContext;
+	const businessCode = (_payload$tempOrder = payload.tempOrder) === null || _payload$tempOrder === void 0 ? void 0 : _payload$tempOrder.business_code;
+	return typeof businessCode === "string" && businessCode.trim() ? { businessCode } : void 0;
+}
 function isWalletAssetsSnapshot(value) {
 	if (!isRecord(value) || !isRecord(value.state)) return false;
 	const state = value.state;
@@ -41,6 +51,7 @@ function getTempOrderSyncPayload(event) {
 	if (payload.activeSince !== void 0 && !Number.isFinite(payload.activeSince)) return null;
 	if (!Object.prototype.hasOwnProperty.call(payload, "tempOrder")) return null;
 	if (payload.tempOrder !== null && (typeof payload.tempOrder !== "object" || Array.isArray(payload.tempOrder))) return null;
+	if (payload.salesContext !== void 0 && !isSalesContext(payload.salesContext)) return null;
 	if (payload.discountState !== void 0) {
 		if (!payload.discountState || typeof payload.discountState !== "object" || Array.isArray(payload.discountState) || !Array.isArray(payload.discountState.discountList) || !Array.isArray(payload.discountState.originalDiscountList)) return null;
 	}
@@ -86,4 +97,4 @@ function shouldApplySharedTempOrderPayload(payload, latestTimestamp) {
 	return payload.isActive === true && payload.timestamp > latestTimestamp;
 }
 //#endregion
-export { TEMP_ORDER_SYNC_MESSAGE_TYPE, TEMP_ORDER_SYNC_REQUEST_MESSAGE_TYPE, cloneTempOrderSyncSnapshot, getTempOrderSyncPayload, getTempOrderSyncRequestPayload, resolveTempOrderSyncPeerTarget, resolveTempOrderSyncScreenRole, shouldApplySharedTempOrderPayload, shouldRespondToTempOrderSyncRequest };
+export { TEMP_ORDER_SYNC_MESSAGE_TYPE, TEMP_ORDER_SYNC_REQUEST_MESSAGE_TYPE, cloneTempOrderSyncSnapshot, getTempOrderSyncPayload, getTempOrderSyncRequestPayload, resolveTempOrderSyncPeerTarget, resolveTempOrderSyncSalesContext, resolveTempOrderSyncScreenRole, shouldApplySharedTempOrderPayload, shouldRespondToTempOrderSyncRequest };

package/es/plus/walletPassGallery/components/timelineSection/index.js

@@ -6,12 +6,12 @@ import React, { useCallback, useEffect, useMemo, useRef } from "react";
 import { locales } from "@pisell/utils";
 import { Button, PisellEmpty, PisellModal, PisellStatisticList, Skeleton, Timeline, usePisellConfig } from "@pisell/materials";
 import { useRequest } from "ahooks";
-import timezone from "dayjs/plugin/timezone";
-import utc from "dayjs/plugin/utc";
+import timezonePlugin from "dayjs/plugin/timezone";
+import utcPlugin from "dayjs/plugin/utc";
 import "./index.less";
 //#region src/plus/walletPassGallery/components/timelineSection/index.tsx
-dayjs.extend(timezone);
-dayjs.extend(utc);
+dayjs.extend(timezonePlugin);
+dayjs.extend(utcPlugin);
 const stateTimeUnix = 1723255863;
 const POLL_INTERVAL = 2e3;
 const POLL_MAX_TIMES = 5;

package/lib/components/sharedSecondaryBigSale/SharedSecondaryBigSaleReceiver.d.ts

@@ -0,0 +1 @@
+export { };

package/lib/components/sharedSecondaryBigSale/SharedSecondaryBigSaleReceiver.js

@@ -4,62 +4,47 @@ const require_asyncToGenerator = require("../../_virtual/_@oxc-project_runtime@0
 const require_useSalesSdk = require("../../plus/salesSdk/hooks/useSalesSdk.js");
 const require_tempOrderSync = require("../../plus/salesSdk/tempOrderSync.js");
 let react = require("react");
-let ahooks = require("ahooks");
 //#region src/components/sharedSecondaryBigSale/SharedSecondaryBigSaleReceiver.tsx
 function createRequestId() {
 	return `shared-secondary-${Date.now()}-${Math.random().toString(16).slice(2)}`;
 }
 /**
-* 通用副屏消息桥：不按 osKey / businessCode 过滤，只接受激活主屏的最新快照。
+* 在销售 Provider 外接收快照，先确定业务上下文，再创建只读销售实例。
 */
-function SharedSecondaryBigSaleReceiver() {
+function useSharedSecondaryBigSaleSnapshot() {
 	var _context$appHelper, _context$appHelper$ge, _app$getPlugin, _unifiedCommunication;
 	const context = require_useEngineContext.default();
 	const app = context === null || context === void 0 || (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 || (_context$appHelper = _context$appHelper.utils) === null || _context$appHelper === void 0 || (_context$appHelper$ge = _context$appHelper.getApp) === null || _context$appHelper$ge === void 0 ? void 0 : _context$appHelper$ge.call(_context$appHelper);
 	const unifiedCommunication = app === null || app === void 0 || (_app$getPlugin = app.getPlugin) === null || _app$getPlugin === void 0 ? void 0 : _app$getPlugin.call(app, "unifiedCommunication");
 	const { runtime } = (unifiedCommunication === null || unifiedCommunication === void 0 || (_unifiedCommunication = unifiedCommunication.useRuntime) === null || _unifiedCommunication === void 0 ? void 0 : _unifiedCommunication.call(unifiedCommunication)) || {};
 	const isSecondaryScreen = (runtime === null || runtime === void 0 ? void 0 : runtime.role) === "secondary-screen";
-	const sales = require_useSalesSdk.useSalesSdk();
 	const latestTimestampRef = (0, react.useRef)(0);
-	const applyQueueRef = (0, react.useRef)(Promise.resolve());
-	const applyPayload = (0, ahooks.useMemoizedFn)((payload) => {
-		if (!require_tempOrderSync.shouldApplySharedTempOrderPayload(payload, latestTimestampRef.current)) return;
-		latestTimestampRef.current = payload.timestamp;
-		applyQueueRef.current = applyQueueRef.current.then(require_asyncToGenerator._asyncToGenerator(function* () {
-			var _sales$bookingTicket2;
-			if (payload.timestamp < latestTimestampRef.current) return;
-			if (payload.tempOrder) {
-				var _sales$bookingTicket;
-				if (!((_sales$bookingTicket = sales.bookingTicket) === null || _sales$bookingTicket === void 0 ? void 0 : _sales$bookingTicket.replaceTempOrder)) {
-					console.warn("[SharedSecondaryBigSale] 当前 BookingTicket 不支持 replaceTempOrder");
-					return;
-				}
-				yield sales.bookingTicket.replaceTempOrder(payload.tempOrder);
-			} else yield sales.clearCartAndReset();
-			if (payload.walletAssetsSnapshot && ((_sales$bookingTicket2 = sales.bookingTicket) === null || _sales$bookingTicket2 === void 0 ? void 0 : _sales$bookingTicket2.importWalletAssetsSnapshot)) yield sales.bookingTicket.importWalletAssetsSnapshot(payload.walletAssetsSnapshot);
-		})).catch((error) => {
-			console.warn("[SharedSecondaryBigSale] 应用副屏订单快照失败", error);
-		});
-	});
+	const [snapshot, setSnapshot] = (0, react.useState)(null);
 	(0, react.useEffect)(() => {
 		var _unifiedCommunication2, _unifiedCommunication3, _unifiedCommunication4, _unifiedCommunication5;
-		if (!isSecondaryScreen || !sales.bookingTicket) return;
+		if (!isSecondaryScreen) return;
+		let cancelled = false;
 		const handleMessage = (event) => {
 			const payload = require_tempOrderSync.getTempOrderSyncPayload(event);
-			if (!payload) return;
-			applyPayload(payload);
+			if (cancelled || !payload || payload.sourceRole === "secondary-screen") return;
+			if (!require_tempOrderSync.shouldApplySharedTempOrderPayload(payload, latestTimestampRef.current)) return;
+			latestTimestampRef.current = payload.timestamp;
+			setSnapshot(payload);
 		};
 		const listenerHandle = unifiedCommunication === null || unifiedCommunication === void 0 || (_unifiedCommunication2 = unifiedCommunication.sdk) === null || _unifiedCommunication2 === void 0 || (_unifiedCommunication3 = _unifiedCommunication2.onMessage) === null || _unifiedCommunication3 === void 0 ? void 0 : _unifiedCommunication3.call(_unifiedCommunication2, handleMessage);
-		unifiedCommunication === null || unifiedCommunication === void 0 || (_unifiedCommunication4 = unifiedCommunication.sdk) === null || _unifiedCommunication4 === void 0 || (_unifiedCommunication5 = _unifiedCommunication4.publishData) === null || _unifiedCommunication5 === void 0 || _unifiedCommunication5.call(_unifiedCommunication4, {
+		Promise.resolve(unifiedCommunication === null || unifiedCommunication === void 0 || (_unifiedCommunication4 = unifiedCommunication.sdk) === null || _unifiedCommunication4 === void 0 || (_unifiedCommunication5 = _unifiedCommunication4.publishData) === null || _unifiedCommunication5 === void 0 ? void 0 : _unifiedCommunication5.call(_unifiedCommunication4, {
 			target: { type: "main" },
 			data: {
-				type: "sales_sdk_temp_order_sync_request",
+				type: require_tempOrderSync.TEMP_ORDER_SYNC_REQUEST_MESSAGE_TYPE,
 				requestId: createRequestId(),
 				timestamp: Date.now()
 			},
 			meta: {}
+		})).catch((error) => {
+			console.warn("[SharedSecondaryBigSale] 请求主屏订单快照失败", error);
 		});
 		return () => {
+			cancelled = true;
 			if (listenerHandle && typeof listenerHandle.then === "function") listenerHandle.then((handle) => {
 				var _handle$remove;
 				return handle === null || handle === void 0 || (_handle$remove = handle.remove) === null || _handle$remove === void 0 ? void 0 : _handle$remove.call(handle);
@@ -69,13 +54,44 @@ function SharedSecondaryBigSaleReceiver() {
 				listenerHandle === null || listenerHandle === void 0 || (_remove = listenerHandle.remove) === null || _remove === void 0 || _remove.call(listenerHandle);
 			}
 		};
+	}, [isSecondaryScreen, unifiedCommunication]);
+	return snapshot;
+}
+/** 配置就绪后将同一业务实例的订单快照串行应用，不等待只读实例变为 ready。 */
+function SharedSecondaryBigSaleReceiver({ payload }) {
+	const sales = require_useSalesSdk.useSalesSdk();
+	const bookingTicket = sales.bookingTicket;
+	const clearCartAndReset = sales.clearCartAndReset;
+	const settingsPending = sales.salesSettingsSource === "picoding" && !sales.salesSettings;
+	const applyQueueRef = (0, react.useRef)(Promise.resolve());
+	(0, react.useEffect)(() => {
+		if (!bookingTicket || settingsPending) return;
+		let cancelled = false;
+		applyQueueRef.current = applyQueueRef.current.then(require_asyncToGenerator._asyncToGenerator(function* () {
+			if (cancelled) return;
+			if (payload.tempOrder) {
+				if (!bookingTicket.replaceTempOrder) {
+					console.warn("[SharedSecondaryBigSale] 当前销售实例不支持 replaceTempOrder");
+					return;
+				}
+				yield bookingTicket.replaceTempOrder(payload.tempOrder);
+			} else yield clearCartAndReset();
+			if (cancelled) return;
+			if (payload.walletAssetsSnapshot && bookingTicket.importWalletAssetsSnapshot) yield bookingTicket.importWalletAssetsSnapshot(payload.walletAssetsSnapshot);
+		})).catch((error) => {
+			console.warn("[SharedSecondaryBigSale] 应用副屏订单快照失败", error);
+		});
+		return () => {
+			cancelled = true;
+		};
 	}, [
-		applyPayload,
-		isSecondaryScreen,
-		sales.bookingTicket,
-		unifiedCommunication
+		bookingTicket,
+		clearCartAndReset,
+		payload,
+		settingsPending
 	]);
 	return null;
 }
 //#endregion
 exports.SharedSecondaryBigSaleReceiver = SharedSecondaryBigSaleReceiver;
+exports.useSharedSecondaryBigSaleSnapshot = useSharedSecondaryBigSaleSnapshot;

package/lib/components/sharedSecondaryBigSale/index.js

@@ -1,16 +1,40 @@
 const require_runtime = require("../../_virtual/_rolldown/runtime.js");
+const require_useEngineContext = require("../../hooks/useEngineContext.js");
+const require_tempOrderSync = require("../../plus/salesSdk/tempOrderSync.js");
 const require_index = require("../bigSale/index.js");
 const require_SharedSecondaryBigSaleReceiver = require("./SharedSecondaryBigSaleReceiver.js");
 let react = require("react");
 react = require_runtime.__toESM(react);
 //#region src/components/sharedSecondaryBigSale/index.tsx
 const DEFAULT_OS_KEY = "shared-secondary-big-sale";
+let nextScopeId = 0;
 /**
 * 多个主屏销售实例共用的只读副屏；订单内容和布局继续复用 BigSale。
 */
 function SharedSecondaryBigSale({ osKey = DEFAULT_OS_KEY, saleDetailModuleConfig, secondaryScreenDisplay, className, style }) {
-	return /* @__PURE__ */ react.default.createElement(require_index.default, {
+	var _context$appHelper, _context$appHelper$ge;
+	const payload = require_SharedSecondaryBigSaleReceiver.useSharedSecondaryBigSaleSnapshot();
+	const context = require_useEngineContext.default();
+	const salesContext = payload ? require_tempOrderSync.resolveTempOrderSyncSalesContext(payload) : void 0;
+	const businessCode = salesContext === null || salesContext === void 0 ? void 0 : salesContext.businessCode;
+	const localChannel = context === null || context === void 0 || (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 || (_context$appHelper = _context$appHelper.utils) === null || _context$appHelper === void 0 || (_context$appHelper$ge = _context$appHelper.getData) === null || _context$appHelper$ge === void 0 ? void 0 : _context$appHelper$ge.call(_context$appHelper, "channel");
+	const channel = (salesContext === null || salesContext === void 0 ? void 0 : salesContext.channel) || (typeof localChannel === "string" && localChannel.trim() ? localChannel.trim() : "cds");
+	const scopeId = (0, react.useMemo)(() => ++nextScopeId, [
 		osKey,
+		businessCode,
+		channel
+	]);
+	const otherParams = (0, react.useMemo)(() => ({ channel }), [channel]);
+	if (!payload || !businessCode) return /* @__PURE__ */ react.default.createElement("div", {
+		className,
+		style,
+		"aria-busy": "true"
+	});
+	return /* @__PURE__ */ react.default.createElement(require_index.default, {
+		key: scopeId,
+		osKey: `${osKey}-${encodeURIComponent(channel)}-${scopeId}`,
+		businessCode,
+		otherParams,
 		mode: "ticket",
 		template: "secondaryScreen",
 		saleDetailTemplate: "A",
@@ -22,7 +46,7 @@ function SharedSecondaryBigSale({ osKey = DEFAULT_OS_KEY, saleDetailModuleConfig
 		saleDetailModuleConfig,
 		className,
 		style,
-		bootstrapSlot: /* @__PURE__ */ react.default.createElement(require_SharedSecondaryBigSaleReceiver.SharedSecondaryBigSaleReceiver, null)
+		bootstrapSlot: /* @__PURE__ */ react.default.createElement(require_SharedSecondaryBigSaleReceiver.SharedSecondaryBigSaleReceiver, { payload })
 	});
 }
 //#endregion