@pisell/private-materials 6.12.228 → 6.12.230

package/lib/components/bigSale/templates/HDLKiosk/adapter/sales/index.js

@@ -1,10 +1,12 @@
 const require_objectSpread2 = require("../../../../../../_virtual/_@oxc-project_runtime@0.122.0/helpers/objectSpread2.js");
 const require_asyncToGenerator = require("../../../../../../_virtual/_@oxc-project_runtime@0.122.0/helpers/asyncToGenerator.js");
+const require_selectors = require("../../../../../../plus/salesSdk/selectors.js");
 const require_transactionState = require("../../utils/transactionState.js");
 const require_normalize = require("../../utils/normalize.js");
 const require_cart = require("./cart.js");
 const require_weightedOperations = require("./weightedOperations.js");
 //#region src/components/bigSale/templates/HDLKiosk/adapter/sales/index.ts
+/** BigSale 对 HDLSalesPort 的集中实现；复杂购物车与称重算法保留在独立模块。 */
 const PAYMENT_WRITE_FROZEN_STATUSES = new Set(["payment_pending", "processing"]);
 function readPaymentStatus(order) {
 	var _order$payment_status;
@@ -17,18 +19,6 @@ function isCommittedCompletedOrder(order) {
 function isWritableSessionOrder(order) {
 	return Boolean(order) && !isCommittedCompletedOrder(order) && !PAYMENT_WRITE_FROZEN_STATUSES.has(readPaymentStatus(order));
 }
-function projectConfirmedCustomer(customer) {
-	var _customer$id;
-	if (!customer || [
-		"0",
-		"1",
-		""
-	].includes(String((_customer$id = customer.id) !== null && _customer$id !== void 0 ? _customer$id : ""))) return;
-	return Object.freeze({
-		customerId: String(customer.id),
-		member: true
-	});
-}
 function cancelled(reason) {
 	return {
 		status: "cancelled",
@@ -110,12 +100,12 @@ function createBigSaleSalesPort(dependencies) {
 					}
 					const currentCustomer = context.customer.selected;
 					const selected = (_getAuthenticatedCust = getAuthenticatedCustomer === null || getAuthenticatedCustomer === void 0 ? void 0 : getAuthenticatedCustomer(customerId)) !== null && _getAuthenticatedCust !== void 0 ? _getAuthenticatedCust : String((_currentCustomer$id = currentCustomer === null || currentCustomer === void 0 ? void 0 : currentCustomer.id) !== null && _currentCustomer$id !== void 0 ? _currentCustomer$id : "") === customerId ? currentCustomer : void 0;
-					if (!projectConfirmedCustomer(selected)) return require_normalize.failed("authenticatedCustomerUnavailable", "back");
+					if (require_selectors.isWalkInCustomer(selected)) return require_normalize.failed("authenticatedCustomerUnavailable", "back");
 					context.customer.select(selected);
 					if (signal.aborted) return require_normalize.unknown("identityAbortedAfterDispatch");
 					return {
 						status: "succeeded",
-						data: { customer: projectConfirmedCustomer(selected) }
+						data: { customer: selected }
 					};
 				} catch (error) {
 					return require_normalize.partialFailure("identitySelectionFailed", error);

package/lib/components/bigSale/templates/HDLKiosk/hooks/useBigSaleHDLKioskAdapter.js

@@ -109,19 +109,43 @@ function useBigSaleHDLKioskAdapter({ context, businessCode, isActive, nativeScal
 	const hostRef = (0, react.useRef)(null);
 	if (!hostRef.current) hostRef.current = require_createHost.createBigSaleHDLKioskHost({
 		getContext: () => contextRef.current,
+		resolveScan: function() {
+			var _ref9 = require_asyncToGenerator._asyncToGenerator(function* (code, signal) {
+				if (signal.aborted) return null;
+				const ticket = contextRef.current.sales.bookingTicket;
+				if (typeof (ticket === null || ticket === void 0 ? void 0 : ticket.getGlobalScanCodeType) !== "function") {
+					ToastRef.current.fail(_pisell_utils.locales.getText("pisell2.hdl-kiosk.scan-service-unavailable"));
+					return null;
+				}
+				try {
+					const type = yield ticket.getGlobalScanCodeType(code);
+					if (signal.aborted) return null;
+					if (!type) ToastRef.current.fail(_pisell_utils.locales.getText("pisell2.text.scan-global-failed"));
+					return type;
+				} catch (_unused) {
+					if (!signal.aborted) ToastRef.current.fail(_pisell_utils.locales.getText("pisell2.hdl-kiosk.scan-request-failed"));
+					return null;
+				}
+			});
+			return function resolveScan(_x, _x2) {
+				return _ref9.apply(this, arguments);
+			};
+		}(),
 		executeScan: function() {
-			var _ref9 = require_asyncToGenerator._asyncToGenerator(function* (code) {
-				var _execution$scanResult, _execution$scanResult2, _execution$scanResult3;
+			var _ref10 = require_asyncToGenerator._asyncToGenerator(function* (code) {
+				var _execution$scanResult, _execution$scanResult2, _execution$scanResult3, _execution$scanResult4;
+				ToastRef.current.loading(_pisell_utils.locales.getText("pisell2.hdl-kiosk.processing"), 1500);
 				const beforeProducts = snapshotProductQuantityEvidence(readLiveProducts());
 				let selectionToastShown = false;
 				const execution = yield scanRef.current(code, { onProductAdded: ({ product, products }) => {
 					selectionToastShown = notifyScannedProductAdded(beforeProducts, products, product);
 				} });
 				if (!selectionToastShown && ((_execution$scanResult = execution.scanResult) === null || _execution$scanResult === void 0 ? void 0 : _execution$scanResult.status) === "success" && Number((_execution$scanResult2 = (_execution$scanResult3 = execution.scanResult.meta) === null || _execution$scanResult3 === void 0 ? void 0 : _execution$scanResult3.count) !== null && _execution$scanResult2 !== void 0 ? _execution$scanResult2 : 0) > 0) notifyScannedProductAdded(beforeProducts, readLiveProducts());
+				if (((_execution$scanResult4 = execution.scanResult) === null || _execution$scanResult4 === void 0 ? void 0 : _execution$scanResult4.status) === "success" && execution.scanResult.kind === "promotion") ToastRef.current.success(_pisell_utils.locales.getText("pisell2.hdl-kiosk.code-applied"));
 				return execution;
 			});
-			return function executeScan(_x) {
-				return _ref9.apply(this, arguments);
+			return function executeScan(_x3) {
+				return _ref10.apply(this, arguments);
 			};
 		}(),
 		hasScanExecutionSource: () => typeof scanRef.current === "function",

package/lib/components/bigSale/templates/HDLKiosk/index.js

@@ -2,8 +2,8 @@ const require_runtime = require("../../../../_virtual/_rolldown/runtime.js");
 const require_objectSpread2 = require("../../../../_virtual/_@oxc-project_runtime@0.122.0/helpers/objectSpread2.js");
 const require_useEngineContext = require("../../../../hooks/useEngineContext.js");
 const require_locales = require("../../../HDLKiosk/locales.js");
-const require_index = require("../../../HDLKiosk/index.js");
 const require_config = require("../../../HDLKiosk/app/contracts/config.js");
+const require_index = require("../../../HDLKiosk/index.js");
 const require_transactionState = require("./utils/transactionState.js");
 const require_useBigSaleHDLKioskAdapter = require("./hooks/useBigSaleHDLKioskAdapter.js");
 const require_useHDLKioskEntryPreparationToast = require("./hooks/useHDLKioskEntryPreparationToast.js");

package/lib/components/bigSale/templates/HDLKiosk/utils/transactionState.js

@@ -113,7 +113,7 @@ function normalizePayment(context, cartLineCount, amountDue) {
 	return Object.freeze({ status: "idle" });
 }
 function projectBigSaleTransactionState(context, observationId = 0) {
-	var _context$cart$display, _liveOrder$currency_c, _liveOrder$currency_s, _context$customer$sel, _context$sales$tempOr, _context$sales$tempOr2, _customer$customerId, _summary$product_quan;
+	var _context$cart$display, _liveOrder$currency_c, _liveOrder$currency_s, _context$sales$bookin3, _context$sales$tempOr, _context$sales$tempOr2, _customer$id, _summary$product_quan;
 	const rawLines = (_context$cart$display = context.cart.displayLines) !== null && _context$cart$display !== void 0 ? _context$cart$display : context.cart.items;
 	const lines = Object.freeze(rawLines.map(projectBigSaleCartLine).filter((line) => line !== null));
 	const summary = context.summary.summary;
@@ -126,19 +126,12 @@ function projectBigSaleTransactionState(context, observationId = 0) {
 		total: String(summary.total_amount),
 		due: amountDue.toFixed(2)
 	}) : context.sales.status === "loading" ? Object.freeze({ status: "calculating" }) : Object.freeze({ status: "missing" });
-	const customer = context.customer.selected ? Object.freeze({
-		customerId: String(context.customer.selected.id),
-		member: ![
-			"0",
-			"1",
-			""
-		].includes(String((_context$customer$sel = context.customer.selected.id) !== null && _context$customer$sel !== void 0 ? _context$customer$sel : ""))
-	}) : void 0;
+	const customer = typeof ((_context$sales$bookin3 = context.sales.bookingTicket) === null || _context$sales$bookin3 === void 0 ? void 0 : _context$sales$bookin3.getOrderCustomerSnapshot) === "function" ? context.sales.bookingTicket.getOrderCustomerSnapshot() : context.customer.selected;
 	const fingerprintValue = [
 		(_context$sales$tempOr = (_context$sales$tempOr2 = context.sales.tempOrder) === null || _context$sales$tempOr2 === void 0 ? void 0 : _context$sales$tempOr2.order_id) !== null && _context$sales$tempOr !== void 0 ? _context$sales$tempOr : "",
 		...lines.map((line) => `${line.lineId}:${line.quantity}`),
 		normalizedSummary.status === "ready" ? normalizedSummary.due : "",
-		(_customer$customerId = customer === null || customer === void 0 ? void 0 : customer.customerId) !== null && _customer$customerId !== void 0 ? _customer$customerId : ""
+		(_customer$id = customer === null || customer === void 0 ? void 0 : customer.id) !== null && _customer$id !== void 0 ? _customer$id : ""
 	].join("|");
 	return Object.freeze({
 		observationId,
@@ -163,9 +156,16 @@ function createBigSaleTransactionStateReader(getContext) {
 	let previousKey = "";
 	let previousSnapshot = projectBigSaleTransactionState(getContext(), observationId);
 	return () => {
+		var _candidate$customer$i, _candidate$customer;
 		const candidate = projectBigSaleTransactionState(getContext(), observationId + 1);
-		const semanticKey = JSON.stringify(require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, candidate), {}, { observationId: 0 }));
-		if (semanticKey === previousKey) return previousSnapshot;
+		const semanticKey = JSON.stringify(require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, candidate), {}, {
+			observationId: 0,
+			customer: String((_candidate$customer$i = (_candidate$customer = candidate.customer) === null || _candidate$customer === void 0 ? void 0 : _candidate$customer.id) !== null && _candidate$customer$i !== void 0 ? _candidate$customer$i : "")
+		}));
+		if (semanticKey === previousKey) {
+			if (candidate.customer !== previousSnapshot.customer) previousSnapshot = Object.freeze(require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, candidate), {}, { observationId }));
+			return previousSnapshot;
+		}
 		observationId += 1;
 		previousKey = semanticKey;
 		previousSnapshot = Object.freeze(require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, candidate), {}, { observationId }));

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

@@ -166,7 +166,7 @@ function runAfterNextPaint(task) {
 * - 新建态：按 OS persist 开关走 createNew 或 restore → initBookingContext
 * 须位于 SalesSdkSummaryProvider 内，以便 summaryProviderRef 已通过 useImperativeHandle 注入。
 */
-function SalesSdkBootstrap({ autoRestoreOnInit, autoBootstrap, autoInitBookingContext, orderId, preloadedSalesDetail, initBookingContext, prepareModule, prepareCatalog, catalogKey, lifecycleOwner }) {
+function SalesSdkBootstrap({ bootstrapKey, onSettled, autoRestoreOnInit, autoBootstrap, autoInitBookingContext, orderId, preloadedSalesDetail, initBookingContext, prepareModule, prepareCatalog, catalogKey, lifecycleOwner }) {
 	const sales = (0, react.useContext)(require_SalesSdkContext.SalesSdkContext);
 	const cart = require_useSalesSdkCart.useSalesSdkCart();
 	(0, react.useEffect)(() => {
@@ -205,6 +205,8 @@ function SalesSdkBootstrap({ autoRestoreOnInit, autoBootstrap, autoInitBookingCo
 					yield initBookingContext(bookingIds.length ? bookingIds : void 0, { loadResources: !(autoBootstrap && orderId) });
 				} catch (e) {
 					if (!cancelled) console.warn("[SalesSdk] bootstrap 失败", e);
+				} finally {
+					if (!cancelled) onSettled(bootstrapKey);
 				}
 			});
 			return function runBootstrap() {
@@ -218,6 +220,8 @@ function SalesSdkBootstrap({ autoRestoreOnInit, autoBootstrap, autoInitBookingCo
 			cancelBootstrapStart === null || cancelBootstrapStart === void 0 || cancelBootstrapStart();
 		};
 	}, [
+		bootstrapKey,
+		onSettled,
 		sales === null || sales === void 0 ? void 0 : sales.bookingTicket,
 		sales === null || sales === void 0 ? void 0 : sales.osKey,
 		sales === null || sales === void 0 ? void 0 : sales.createNew,
@@ -386,6 +390,18 @@ const SalesSdkProvider = ({ osKey, enableMultiCurrencySettlement = false, soluti
 		moduleOtherParams.channel,
 		productLoadChannel
 	]);
+	const bootstrapKey = (0, react.useMemo)(() => Symbol("sales-sdk-bootstrap"), [
+		bookingTicket,
+		osKey,
+		catalogKey,
+		lifecycleOwner,
+		autoBootstrap,
+		autoRestoreOnInit,
+		autoInitBookingContext,
+		orderId,
+		preloadedSalesDetail
+	]);
+	const [settledBootstrapKey, setSettledBootstrapKey] = (0, react.useState)(null);
 	const moduleParamsSyncRef = (0, react.useRef)(null);
 	const syncModuleOtherParams = (0, ahooks.useMemoizedFn)(require_asyncToGenerator._asyncToGenerator(function* () {
 		var _moduleParamsSyncRef$;
@@ -486,6 +502,7 @@ const SalesSdkProvider = ({ osKey, enableMultiCurrencySettlement = false, soluti
 	});
 	const { publishTempOrder } = require_useSalesSdkTempOrderSync.useSalesSdkTempOrderSync({
 		enabled: enableTempOrderSync,
+		ready: !(lifecycleOwner === "provider" && (autoRestoreOnInit || Boolean(autoBootstrap && orderId)) && settledBootstrapKey !== bootstrapKey),
 		isActive,
 		osKey: (osKey === null || osKey === void 0 || (_osKey$replace = osKey.replace) === null || _osKey$replace === void 0 ? void 0 : _osKey$replace.call(osKey, "bookingTicket-", "")) || osKey,
 		bookingTicket,
@@ -1512,6 +1529,8 @@ const SalesSdkProvider = ({ osKey, enableMultiCurrencySettlement = false, soluti
 		onPromotionScanComplete: handlePromotionScanComplete,
 		promotionScanSuccessMessageKey: promotionItemIncreaseMessageKey ? void 0 : promotionScanSuccessMessageKey
 	}), /* @__PURE__ */ react.default.createElement(SalesSdkBootstrap, {
+		bootstrapKey,
+		onSettled: setSettledBootstrapKey,
 		autoRestoreOnInit,
 		autoBootstrap,
 		autoInitBookingContext,

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

@@ -48,7 +48,7 @@ function isWalletSnapshotAlignedWithCurrentOrder(bookingTicket, snapshot) {
 * 两端都可发布本地变更、接收同 osKey 快照；页面激活时向更早激活的对端补拉。
 * 远端快照应用期间禁止再次发布，避免 replaceTempOrder 触发 refresh 后形成回环。
 */
-function useSalesSdkTempOrderSync({ enabled, isActive = true, osKey, bookingTicket, refreshRootSnapshot }) {
+function useSalesSdkTempOrderSync({ enabled, ready = true, isActive = true, osKey, bookingTicket, refreshRootSnapshot }) {
 	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);
@@ -61,17 +61,24 @@ function useSalesSdkTempOrderSync({ enabled, isActive = true, osKey, bookingTick
 	const sourceIdRef = (0, react.useRef)(createSourceId());
 	const revisionRef = (0, react.useRef)(0);
 	const activeSinceRef = (0, react.useRef)(0);
+	const pendingActiveSinceRef = (0, react.useRef)(null);
 	const isActiveRef = (0, react.useRef)(isActive);
+	const readyRef = (0, react.useRef)(ready);
 	const remoteApplyingRef = (0, react.useRef)(false);
 	const activationKeyRef = (0, react.useRef)(null);
 	const activationEpochRef = (0, react.useRef)(0);
 	const pendingRequestIdsRef = (0, react.useRef)(/* @__PURE__ */ new Set());
+	const deferredRequestsRef = (0, react.useRef)(/* @__PURE__ */ new Map());
+	const deferredPayloadsRef = (0, react.useRef)(/* @__PURE__ */ new Map());
+	const needsBootstrapRecoveryRef = (0, react.useRef)(!ready);
+	const bootstrapRecoveryRequestRef = (0, react.useRef)(null);
 	const lastRevisionBySourceRef = (0, react.useRef)(/* @__PURE__ */ new Map());
 	const lastTimestampBySourceRef = (0, react.useRef)(/* @__PURE__ */ new Map());
 	const latestOfferedRevisionBySourceRef = (0, react.useRef)(/* @__PURE__ */ new Map());
 	const applyQueueRef = (0, react.useRef)(Promise.resolve());
 	const lastAppliedRemoteOriginRef = (0, react.useRef)(null);
 	isActiveRef.current = isActive;
+	readyRef.current = ready;
 	const getPeerTarget = (0, ahooks.useMemoizedFn)((role) => require_tempOrderSync.resolveTempOrderSyncPeerTarget(role, endpoints));
 	/** 在触发发布时一次性深拷贝订单与折扣上下文，避免防抖期间 OS 原地修改造成版本错配。 */
 	const captureRuntimeSnapshot = (0, ahooks.useMemoizedFn)((tempOrder, causalOrigin) => {
@@ -101,7 +108,7 @@ function useSalesSdkTempOrderSync({ enabled, isActive = true, osKey, bookingTick
 	});
 	const sendTempOrderSnapshot = (0, ahooks.useMemoizedFn)(function() {
 		var _ref = require_asyncToGenerator._asyncToGenerator(function* (snapshot, options = {}) {
-			if (!enabled || !screenRole || !isActiveRef.current) return;
+			if (!enabled || !ready || !screenRole || !isActiveRef.current) return;
 			if (remoteApplyingRef.current && !options.responseToRequestId) return;
 			if (options.incrementRevision !== false) revisionRef.current += 1;
 			try {
@@ -152,15 +159,23 @@ function useSalesSdkTempOrderSync({ enabled, isActive = true, osKey, bookingTick
 	});
 	const publishTempOrder = (0, ahooks.useMemoizedFn)((tempOrder, options = {}) => {
 		var _lastAppliedRemoteOri;
-		if (!enabled || !screenRole || !isActiveRef.current || remoteApplyingRef.current) return;
+		if (!enabled || !ready || !screenRole || !isActiveRef.current || remoteApplyingRef.current) return;
 		const causalOrigin = options.preserveRemoteOrigin ? (_lastAppliedRemoteOri = lastAppliedRemoteOriginRef.current) !== null && _lastAppliedRemoteOri !== void 0 ? _lastAppliedRemoteOri : void 0 : void 0;
-		if (!options.preserveRemoteOrigin) lastAppliedRemoteOriginRef.current = null;
+		if (!options.preserveRemoteOrigin) {
+			lastAppliedRemoteOriginRef.current = null;
+			needsBootstrapRecoveryRef.current = false;
+			bootstrapRecoveryRequestRef.current = null;
+		}
 		debouncedPublish(captureRuntimeSnapshot(tempOrder, causalOrigin));
 	});
 	const requestPeerSnapshot = (0, ahooks.useMemoizedFn)(require_asyncToGenerator._asyncToGenerator(function* () {
-		if (!enabled || !screenRole || !bookingTicket || !isActiveRef.current) return;
+		if (!enabled || !ready || !screenRole || !bookingTicket || !isActiveRef.current) return;
 		const requestId = createRequestId();
 		pendingRequestIdsRef.current.add(requestId);
+		if (needsBootstrapRecoveryRef.current) bootstrapRecoveryRequestRef.current = {
+			requestId,
+			localRevision: revisionRef.current
+		};
 		try {
 			var _unifiedCommunication4, _unifiedCommunication5;
 			yield unifiedCommunication === null || unifiedCommunication === void 0 || (_unifiedCommunication4 = unifiedCommunication.sdk) === null || _unifiedCommunication4 === void 0 || (_unifiedCommunication5 = _unifiedCommunication4.publishData) === null || _unifiedCommunication5 === void 0 ? void 0 : _unifiedCommunication5.call(_unifiedCommunication4, {
@@ -181,19 +196,24 @@ function useSalesSdkTempOrderSync({ enabled, isActive = true, osKey, bookingTick
 			console.warn("[SalesSdk] 请求对端 tempOrder 快照失败", error);
 		}
 	}));
+	const isBootstrapRecoveryResponse = (0, ahooks.useMemoizedFn)((payload) => {
+		const recovery = bootstrapRecoveryRequestRef.current;
+		return Boolean(recovery && payload.responseToRequestId === recovery.requestId && pendingRequestIdsRef.current.has(recovery.requestId) && revisionRef.current === recovery.localRevision);
+	});
 	const shouldAcceptPayload = (0, ahooks.useMemoizedFn)((payload) => {
 		var _lastTimestampBySourc;
 		const sourceKey = getPayloadSourceKey(payload);
 		const revision = getPayloadRevision(payload);
 		if (revision !== null) {
 			var _lastRevisionBySource, _latestOfferedRevisio;
-			if (revision <= ((_lastRevisionBySource = lastRevisionBySourceRef.current.get(sourceKey)) !== null && _lastRevisionBySource !== void 0 ? _lastRevisionBySource : -1)) return false;
+			const lastRevision = (_lastRevisionBySource = lastRevisionBySourceRef.current.get(sourceKey)) !== null && _lastRevisionBySource !== void 0 ? _lastRevisionBySource : -1;
+			if (revision < lastRevision || revision === lastRevision && !isBootstrapRecoveryResponse(payload)) return false;
 			if (revision < ((_latestOfferedRevisio = latestOfferedRevisionBySourceRef.current.get(sourceKey)) !== null && _latestOfferedRevisio !== void 0 ? _latestOfferedRevisio : -1)) return false;
 			latestOfferedRevisionBySourceRef.current.set(sourceKey, revision);
 			return true;
 		}
 		const lastTimestamp = (_lastTimestampBySourc = lastTimestampBySourceRef.current.get(sourceKey)) !== null && _lastTimestampBySourc !== void 0 ? _lastTimestampBySourc : 0;
-		return payload.timestamp > lastTimestamp;
+		return payload.timestamp > lastTimestamp || payload.timestamp === lastTimestamp && isBootstrapRecoveryResponse(payload);
 	});
 	const applyPayload = (0, ahooks.useMemoizedFn)((payload) => {
 		const requestId = payload.responseToRequestId;
@@ -203,13 +223,16 @@ function useSalesSdkTempOrderSync({ enabled, isActive = true, osKey, bookingTick
 		}
 		const activationEpoch = activationEpochRef.current;
 		applyQueueRef.current = applyQueueRef.current.then(require_asyncToGenerator._asyncToGenerator(function* () {
-			if (!isActiveRef.current || activationEpochRef.current !== activationEpoch || activationKeyRef.current !== `${screenRole}:${payload.osKey}`) return;
+			const isCurrentActivation = () => readyRef.current && isActiveRef.current && activationEpochRef.current === activationEpoch && activationKeyRef.current === `${screenRole}:${payload.osKey}`;
+			if (!isCurrentActivation()) return;
 			const sourceKey = getPayloadSourceKey(payload);
 			const revision = getPayloadRevision(payload);
 			const isRequestedResponse = Boolean(requestId && pendingRequestIdsRef.current.has(requestId));
+			const isRecoveryResponse = isBootstrapRecoveryResponse(payload);
 			if (revision !== null) {
 				var _lastRevisionBySource2, _latestOfferedRevisio2;
-				if (revision <= ((_lastRevisionBySource2 = lastRevisionBySourceRef.current.get(sourceKey)) !== null && _lastRevisionBySource2 !== void 0 ? _lastRevisionBySource2 : -1)) {
+				const lastApplied = (_lastRevisionBySource2 = lastRevisionBySourceRef.current.get(sourceKey)) !== null && _lastRevisionBySource2 !== void 0 ? _lastRevisionBySource2 : -1;
+				if (revision < lastApplied || revision === lastApplied && !isRecoveryResponse) {
 					if (requestId) pendingRequestIdsRef.current.delete(requestId);
 					return;
 				}
@@ -220,12 +243,12 @@ function useSalesSdkTempOrderSync({ enabled, isActive = true, osKey, bookingTick
 			} else {
 				var _lastTimestampBySourc2;
 				const lastAppliedTimestamp = (_lastTimestampBySourc2 = lastTimestampBySourceRef.current.get(sourceKey)) !== null && _lastTimestampBySourc2 !== void 0 ? _lastTimestampBySourc2 : 0;
-				if (payload.timestamp <= lastAppliedTimestamp) {
+				if (payload.timestamp < lastAppliedTimestamp || payload.timestamp === lastAppliedTimestamp && !isRecoveryResponse) {
 					if (requestId) pendingRequestIdsRef.current.delete(requestId);
 					return;
 				}
 			}
-			if (payload.originSourceId === sourceIdRef.current && Number.isSafeInteger(payload.originRevision) && payload.originRevision <= revisionRef.current) {
+			if (payload.originSourceId === sourceIdRef.current && Number.isSafeInteger(payload.originRevision) && payload.originRevision <= revisionRef.current && !isRecoveryResponse) {
 				lastAppliedRemoteOriginRef.current = null;
 				if (requestId) pendingRequestIdsRef.current.delete(requestId);
 				if (revision !== null) lastRevisionBySourceRef.current.set(sourceKey, revision);
@@ -244,6 +267,7 @@ function useSalesSdkTempOrderSync({ enabled, isActive = true, osKey, bookingTick
 			try {
 				var _bookingTicket$getWal;
 				if (bookingTicket === null || bookingTicket === void 0 ? void 0 : bookingTicket.replaceDiscountStoreLists) yield bookingTicket.replaceDiscountStoreLists(resolvePayloadDiscountState(payload));
+				if (!isCurrentActivation()) return;
 				if (payload.tempOrder) {
 					if (!(bookingTicket === null || bookingTicket === void 0 ? void 0 : bookingTicket.replaceTempOrder)) {
 						console.warn("[SalesSdk] 当前 BookingTicket 不支持 replaceTempOrder，已跳过双屏同步");
@@ -254,12 +278,17 @@ function useSalesSdkTempOrderSync({ enabled, isActive = true, osKey, bookingTick
 					var _bookingTicket$restor;
 					yield bookingTicket === null || bookingTicket === void 0 || (_bookingTicket$restor = bookingTicket.restoreOrder) === null || _bookingTicket$restor === void 0 ? void 0 : _bookingTicket$restor.call(bookingTicket);
 				}
+				if (!isCurrentActivation()) return;
 				if (payload.walletAssetsSnapshot && (bookingTicket === null || bookingTicket === void 0 ? void 0 : bookingTicket.importWalletAssetsSnapshot)) yield bookingTicket.importWalletAssetsSnapshot((0, lodash.cloneDeep)(payload.walletAssetsSnapshot));
+				if (!isCurrentActivation()) return;
 				const importedWalletSnapshotIsAligned = payload.walletAssetsSnapshot ? isWalletSnapshotAlignedWithCurrentOrder(bookingTicket, payload.walletAssetsSnapshot) : false;
 				const currentWalletState = bookingTicket === null || bookingTicket === void 0 || (_bookingTicket$getWal = bookingTicket.getWalletAssetsState) === null || _bookingTicket$getWal === void 0 ? void 0 : _bookingTicket$getWal.call(bookingTicket);
 				const hasWalletRuntimeState = Boolean(currentWalletState && (currentWalletState.items.length > 0 || currentWalletState.selectedIds.length > 0 || currentWalletState.committedIds.length > 0));
 				if (payload.tempOrder && (bookingTicket === null || bookingTicket === void 0 ? void 0 : bookingTicket.refreshWalletAssets) && hasWalletRuntimeState && !importedWalletSnapshotIsAligned) yield bookingTicket.refreshWalletAssets({ preserveSelection: true });
+				if (!isCurrentActivation()) return;
 				refreshRootSnapshot();
+				needsBootstrapRecoveryRef.current = false;
+				bootstrapRecoveryRequestRef.current = null;
 				if (isRequestedResponse) pendingRequestIdsRef.current.delete(requestId);
 				if (revision !== null) lastRevisionBySourceRef.current.set(sourceKey, revision);
 				else lastTimestampBySourceRef.current.set(sourceKey, payload.timestamp);
@@ -273,6 +302,32 @@ function useSalesSdkTempOrderSync({ enabled, isActive = true, osKey, bookingTick
 			console.warn("[SalesSdk] tempOrder 同步队列失败", error);
 		});
 	});
+	const respondToSnapshotRequest = (0, ahooks.useMemoizedFn)((request) => {
+		if (!enabled || !screenRole || !bookingTicket || !isActiveRef.current) return;
+		if (request.sourceId === sourceIdRef.current) return;
+		if (request.osKey !== void 0 && request.osKey !== osKey) return;
+		if (!ready || activationKeyRef.current !== `${screenRole}:${osKey}`) {
+			deferredRequestsRef.current.set(request.requestId, request);
+			return;
+		}
+		if (!require_tempOrderSync.shouldRespondToTempOrderSyncRequest(request, {
+			ownRole: screenRole,
+			ownActiveSince: activeSinceRef.current
+		})) return;
+		const queue = applyQueueRef.current;
+		const activationEpoch = activationEpochRef.current;
+		queue.then(() => {
+			var _bookingTicket$getTem, _bookingTicket$getTem2, _lastAppliedRemoteOri2;
+			if (queue !== applyQueueRef.current || activationEpoch !== activationEpochRef.current || !readyRef.current || !isActiveRef.current) {
+				respondToSnapshotRequest(request);
+				return;
+			}
+			sendTempOrderSnapshot(captureRuntimeSnapshot((_bookingTicket$getTem = (_bookingTicket$getTem2 = bookingTicket.getTempOrder) === null || _bookingTicket$getTem2 === void 0 ? void 0 : _bookingTicket$getTem2.call(bookingTicket)) !== null && _bookingTicket$getTem !== void 0 ? _bookingTicket$getTem : null, (_lastAppliedRemoteOri2 = lastAppliedRemoteOriginRef.current) !== null && _lastAppliedRemoteOri2 !== void 0 ? _lastAppliedRemoteOri2 : void 0), {
+				incrementRevision: false,
+				responseToRequestId: request.requestId
+			});
+		});
+	});
 	(0, react.useEffect)(() => {
 		var _unifiedCommunication6, _unifiedCommunication7;
 		if (!enabled || !screenRole || !bookingTicket) return;
@@ -280,17 +335,7 @@ function useSalesSdkTempOrderSync({ enabled, isActive = true, osKey, bookingTick
 			if (!isActiveRef.current) return;
 			const request = require_tempOrderSync.getTempOrderSyncRequestPayload(event);
 			if (request) {
-				var _bookingTicket$getTem, _bookingTicket$getTem2;
-				if (request.sourceId === sourceIdRef.current) return;
-				if (request.osKey !== void 0 && request.osKey !== osKey) return;
-				if (!require_tempOrderSync.shouldRespondToTempOrderSyncRequest(request, {
-					ownRole: screenRole,
-					ownActiveSince: activeSinceRef.current
-				})) return;
-				sendTempOrderSnapshot(captureRuntimeSnapshot((_bookingTicket$getTem = (_bookingTicket$getTem2 = bookingTicket.getTempOrder) === null || _bookingTicket$getTem2 === void 0 ? void 0 : _bookingTicket$getTem2.call(bookingTicket)) !== null && _bookingTicket$getTem !== void 0 ? _bookingTicket$getTem : null), {
-					incrementRevision: false,
-					responseToRequestId: request.requestId
-				});
+				respondToSnapshotRequest(request);
 				return;
 			}
 			const payload = require_tempOrderSync.getTempOrderSyncPayload(event);
@@ -299,6 +344,17 @@ function useSalesSdkTempOrderSync({ enabled, isActive = true, osKey, bookingTick
 			if (payload.sourceId === sourceIdRef.current) return;
 			if (payload.isActive === false) return;
 			if (payload.sourceRole === screenRole) return;
+			if (!readyRef.current) {
+				if (payload.responseToRequestId) return;
+				const sourceKey = getPayloadSourceKey(payload);
+				const previous = deferredPayloadsRef.current.get(sourceKey);
+				const revision = getPayloadRevision(payload);
+				const previousRevision = previous ? getPayloadRevision(previous) : null;
+				if (previous && (revision !== null && previousRevision !== null ? revision < previousRevision || revision === previousRevision && payload.timestamp <= previous.timestamp : payload.timestamp <= previous.timestamp)) return;
+				deferredPayloadsRef.current.delete(sourceKey);
+				deferredPayloadsRef.current.set(sourceKey, payload);
+				return;
+			}
 			applyPayload(payload);
 		};
 		const listenerHandle = unifiedCommunication === null || unifiedCommunication === void 0 || (_unifiedCommunication6 = unifiedCommunication.sdk) === null || _unifiedCommunication6 === void 0 || (_unifiedCommunication7 = _unifiedCommunication6.onMessage) === null || _unifiedCommunication7 === void 0 ? void 0 : _unifiedCommunication7.call(_unifiedCommunication6, handleMessage);
@@ -318,17 +374,30 @@ function useSalesSdkTempOrderSync({ enabled, isActive = true, osKey, bookingTick
 		bookingTicket,
 		osKey,
 		applyPayload,
-		captureRuntimeSnapshot,
-		sendTempOrderSnapshot,
+		respondToSnapshotRequest,
 		unifiedCommunication
 	]);
 	(0, react.useEffect)(() => {
-		if (!enabled || !screenRole || !bookingTicket || !isActive) {
+		var _pendingActiveSinceRe2;
+		if (!ready) {
+			needsBootstrapRecoveryRef.current = true;
+			lastAppliedRemoteOriginRef.current = null;
+		}
+		if (!enabled || !screenRole || !bookingTicket || !isActive || !ready) {
 			if (activationKeyRef.current !== null) {
 				activationEpochRef.current += 1;
 				activationKeyRef.current = null;
 			}
 			pendingRequestIdsRef.current.clear();
+			bootstrapRecoveryRequestRef.current = null;
+			if (!enabled || !screenRole || !bookingTicket || !isActive) {
+				deferredRequestsRef.current.clear();
+				deferredPayloadsRef.current.clear();
+				pendingActiveSinceRef.current = null;
+			} else {
+				var _pendingActiveSinceRe;
+				(_pendingActiveSinceRe = pendingActiveSinceRef.current) !== null && _pendingActiveSinceRe !== void 0 || (pendingActiveSinceRef.current = Date.now());
+			}
 			cancelDebouncedPublish();
 			return;
 		}
@@ -337,21 +406,42 @@ function useSalesSdkTempOrderSync({ enabled, isActive = true, osKey, bookingTick
 		activationEpochRef.current += 1;
 		pendingRequestIdsRef.current.clear();
 		activationKeyRef.current = activationKey;
-		activeSinceRef.current = Date.now();
-		requestPeerSnapshot();
+		activeSinceRef.current = (_pendingActiveSinceRe2 = pendingActiveSinceRef.current) !== null && _pendingActiveSinceRe2 !== void 0 ? _pendingActiveSinceRe2 : Date.now();
+		pendingActiveSinceRef.current = null;
+		const activationEpoch = activationEpochRef.current;
+		const resumeSync = () => {
+			if (!readyRef.current || !isActiveRef.current || activationEpochRef.current !== activationEpoch) return;
+			requestPeerSnapshot();
+			const deferredRequests = [...deferredRequestsRef.current.values()];
+			deferredRequestsRef.current.clear();
+			deferredRequests.forEach(respondToSnapshotRequest);
+		};
+		const deferredPayloads = [...deferredPayloadsRef.current.values()];
+		deferredPayloadsRef.current.clear();
+		if (deferredPayloads.length) {
+			deferredPayloads.forEach(applyPayload);
+			applyQueueRef.current.then(resumeSync);
+		} else resumeSync();
 	}, [
 		enabled,
+		ready,
 		screenRole,
 		bookingTicket,
 		isActive,
 		osKey,
 		requestPeerSnapshot,
+		respondToSnapshotRequest,
+		applyPayload,
 		cancelDebouncedPublish
 	]);
 	(0, react.useEffect)(() => () => {
 		activationEpochRef.current += 1;
 		activationKeyRef.current = null;
 		pendingRequestIdsRef.current.clear();
+		bootstrapRecoveryRequestRef.current = null;
+		deferredRequestsRef.current.clear();
+		deferredPayloadsRef.current.clear();
+		pendingActiveSinceRef.current = null;
 		cancelDebouncedPublish();
 	}, [cancelDebouncedPublish]);
 	return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.12.228",
+  "version": "6.12.230",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -70,8 +70,8 @@
     "styled-components": "^6.0.0-rc.3",
     "use-sync-external-store": "^1.6.0",
     "@pisell/pi-payment-sdk": "0.0.3",
-    "@pisell/icon": "0.0.11",
     "@pisell/utils": "3.0.4",
+    "@pisell/icon": "0.0.11",
     "@pisell/materials": "6.12.61",
     "@pisell/date-picker": "3.0.10"
   },

package/es/private-materials/lowcode/authmodal/meta.d.ts

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