@pisell/private-materials 6.12.163 → 6.12.165

package/es/plus/saleDetail/tmpl/B/components/Pay/index.js

@@ -7,7 +7,7 @@ import { PiPaymentType } from "../../../../../piPaymentUI/contracts/index.js";
 import PiPayment from "../../../../../piPaymentUI/PiPayment.js";
 import { formatLocalizedDateTime } from "../../../../utils.js";
 import { SPI_PAYMENT_CODES } from "../../../../../../components/checkout/constants.js";
-import { getCurrentDeviceNumber } from "../../../../../../components/checkout/utils.js";
+import { getCurrentDeviceNumber, getShopWalletPassId } from "../../../../../../components/checkout/utils.js";
 import { RefundModal } from "../../../../components/RefundModal/index.js";
 import React, { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { message } from "antd";
@@ -360,11 +360,12 @@ function getPayV2RefundMethods() {
 		iconType: "pisell2-credit-card-02"
 	}];
 }
-function buildNormalRefundPayments(selected, editedAmounts) {
-	return selected.map((transaction) => ({
+function buildNormalRefundPayments(selected, editedAmounts, shopWalletPassId) {
+	const normalizedShopWalletPassId = String(shopWalletPassId || "").trim();
+	return selected.map((transaction) => _objectSpread2({
 		id: transaction.payment.orderPaymentId,
 		amount: editedAmounts.get(transaction.key) || toDecimal(transaction.refundableAmount).toFixed(2)
-	}));
+	}, normalizedShopWalletPassId && isCashRefundTransaction(transaction) ? { metadata: { shop_wallet_pass_id: normalizedShopWalletPassId } } : {}));
 }
 function PayV2RefundModalConnected({ context, onClose, open }) {
 	var _engineContext$appHel;
@@ -414,6 +415,14 @@ function PayV2RefundModalConnected({ context, onClose, open }) {
 			return next;
 		});
 	}, []);
+	const buildNormalRefundPaymentsForSubmit = useCallback(function() {
+		var _ref10 = _asyncToGenerator(function* (selected) {
+			return buildNormalRefundPayments(selected, editedAmounts, selected.some(isCashRefundTransaction) ? yield getShopWalletPassId(interaction) : null);
+		});
+		return function(_x) {
+			return _ref10.apply(this, arguments);
+		};
+	}(), [editedAmounts, interaction]);
 	const openCashDrawer = useCallback(() => {
 		try {
 			var _interaction$utils, _interaction$utils$po;
@@ -447,13 +456,12 @@ function PayV2RefundModalConnected({ context, onClose, open }) {
 		Toast
 	]);
 	const submitNormalRefund = useCallback(function() {
-		var _ref10 = _asyncToGenerator(function* (selected, cancelOrder, note) {
-			const payments = buildNormalRefundPayments(selected, editedAmounts);
-			const submittedRefundAmount = payments.reduce((total, payment) => total.plus(toDecimal(payment.amount)), new Decimal(0));
+		var _ref11 = _asyncToGenerator(function* (selected, cancelOrder, note) {
 			const shouldOpenCashDrawer = selected.some(isCashRefundTransaction);
 			setSubmitting(true);
 			try {
-				finishSuccessfulRefund(submittedRefundAmount, (yield context.sales.refundPayments(payments, {
+				const payments = yield buildNormalRefundPaymentsForSubmit(selected);
+				finishSuccessfulRefund(payments.reduce((total, payment) => total.plus(toDecimal(payment.amount)), new Decimal(0)), (yield context.sales.refundPayments(payments, {
 					cancelOrder,
 					note
 				})).refreshError, shouldOpenCashDrawer);
@@ -463,17 +471,17 @@ function PayV2RefundModalConnected({ context, onClose, open }) {
 				setSubmitting(false);
 			}
 		});
-		return function(_x, _x2, _x3) {
-			return _ref10.apply(this, arguments);
+		return function(_x2, _x3, _x4) {
+			return _ref11.apply(this, arguments);
 		};
 	}(), [
+		buildNormalRefundPaymentsForSubmit,
 		context.sales,
-		editedAmounts,
 		finishSuccessfulRefund,
 		getErrorText
 	]);
 	const submitSpiMx51Refund = useCallback(function() {
-		var _ref11 = _asyncToGenerator(function* (transaction, normalTransactions, cancelOrder, note) {
+		var _ref12 = _asyncToGenerator(function* (transaction, normalTransactions, cancelOrder, note) {
 			if (transaction.payment.orderPaymentId === void 0 || transaction.payment.orderPaymentId === null || !transaction.payment.paymentMethod.code) {
 				message.error(String(locales.getText("pisell2.sale-detail.refund-modal.eftpos-missing-identity")));
 				return;
@@ -482,13 +490,13 @@ function PayV2RefundModalConnected({ context, onClose, open }) {
 			const paymentMethodCode = transaction.payment.paymentMethod.code;
 			const amount = editedAmounts.get(transaction.key) || toDecimal(transaction.refundableAmount).toFixed(2);
 			const refundUuid = createRefundPaymentNumber();
-			const normalPayments = buildNormalRefundPayments(normalTransactions, editedAmounts);
-			const normalRefundAmount = normalPayments.reduce((total, payment) => total.plus(toDecimal(payment.amount)), new Decimal(0));
 			const shouldOpenCashDrawer = normalTransactions.some(isCashRefundTransaction);
 			setSubmitting(true);
 			let nativeRefundSucceeded = false;
 			try {
 				var _engineContext$appHel2, _engineContext$appHel3, _engineContext$appHel4, _nativeResult$code, _nativeResult$data, _nativeResult$data2, _transaction$payment$;
+				const normalPayments = yield buildNormalRefundPaymentsForSubmit(normalTransactions);
+				const normalRefundAmount = normalPayments.reduce((total, payment) => total.plus(toDecimal(payment.amount)), new Decimal(0));
 				const mx51Plugin = engineContext === null || engineContext === void 0 || (_engineContext$appHel2 = engineContext.appHelper) === null || _engineContext$appHel2 === void 0 || (_engineContext$appHel2 = _engineContext$appHel2.utils) === null || _engineContext$appHel2 === void 0 || (_engineContext$appHel3 = _engineContext$appHel2.getApp) === null || _engineContext$appHel3 === void 0 || (_engineContext$appHel3 = _engineContext$appHel3.call(_engineContext$appHel2)) === null || _engineContext$appHel3 === void 0 || (_engineContext$appHel4 = _engineContext$appHel3.getPlugin) === null || _engineContext$appHel4 === void 0 ? void 0 : _engineContext$appHel4.call(_engineContext$appHel3, "mx51");
 				if (typeof (mx51Plugin === null || mx51Plugin === void 0 ? void 0 : mx51Plugin.refund) !== "function") throw new Error(String(locales.getText("pisell2.sale-detail.refund-modal.eftpos-open-failed")));
 				const nativeResult = yield mx51Plugin.refund({
@@ -530,10 +538,11 @@ function PayV2RefundModalConnected({ context, onClose, open }) {
 				setSubmitting(false);
 			}
 		});
-		return function(_x4, _x5, _x6, _x7) {
-			return _ref11.apply(this, arguments);
+		return function(_x5, _x6, _x7, _x8) {
+			return _ref12.apply(this, arguments);
 		};
 	}(), [
+		buildNormalRefundPaymentsForSubmit,
 		context.sales,
 		editedAmounts,
 		engineContext,
@@ -542,7 +551,7 @@ function PayV2RefundModalConnected({ context, onClose, open }) {
 		onClose
 	]);
 	const submitEftposRefund = useCallback(function() {
-		var _ref12 = _asyncToGenerator(function* (transaction, normalTransactions, cancelOrder, note) {
+		var _ref13 = _asyncToGenerator(function* (transaction, normalTransactions, cancelOrder, note) {
 			if (!transaction.eftposProvider || !transaction.originalPaymentNumber || !transaction.salesId || transaction.payment.orderPaymentId === void 0 || transaction.payment.orderPaymentId === null || !transaction.payment.paymentMethod.code) {
 				message.error(String(locales.getText("pisell2.sale-detail.refund-modal.eftpos-missing-identity")));
 				return;
@@ -551,15 +560,15 @@ function PayV2RefundModalConnected({ context, onClose, open }) {
 			const orderPaymentId = transaction.payment.orderPaymentId;
 			const paymentMethodCode = transaction.payment.paymentMethod.code;
 			const amount = editedAmounts.get(transaction.key) || toDecimal(transaction.refundableAmount).toFixed(2);
-			const normalPayments = buildNormalRefundPayments(normalTransactions, editedAmounts);
-			const normalRefundAmount = normalPayments.reduce((total, payment) => total.plus(toDecimal(payment.amount)), new Decimal(0));
 			const shouldOpenCashDrawer = normalTransactions.some(isCashRefundTransaction);
 			setSubmitting(true);
 			eftposSuccessHandlingRef.current = false;
-			const deviceNumber = yield getCurrentDeviceNumber(interaction);
 			let opened = false;
 			try {
 				var _piPaymentRef$current, _context$sales$tempOr3, _context$sales$salesD3;
+				const normalPayments = yield buildNormalRefundPaymentsForSubmit(normalTransactions);
+				const normalRefundAmount = normalPayments.reduce((total, payment) => total.plus(toDecimal(payment.amount)), new Decimal(0));
+				const deviceNumber = yield getCurrentDeviceNumber(interaction);
 				opened = Boolean((_piPaymentRef$current = piPaymentRef.current) === null || _piPaymentRef$current === void 0 ? void 0 : _piPaymentRef$current.open({
 					provider: transaction.eftposProvider,
 					mode: PaymentMode.Refund,
@@ -628,10 +637,11 @@ function PayV2RefundModalConnected({ context, onClose, open }) {
 				message.error(String(locales.getText("pisell2.sale-detail.refund-modal.eftpos-open-failed")));
 			}
 		});
-		return function(_x8, _x9, _x10, _x11) {
-			return _ref12.apply(this, arguments);
+		return function(_x9, _x10, _x11, _x12) {
+			return _ref13.apply(this, arguments);
 		};
 	}(), [
+		buildNormalRefundPaymentsForSubmit,
 		context.sales,
 		editedAmounts,
 		finishSuccessfulRefund,
@@ -693,10 +703,10 @@ function PayV2RefundModalConnected({ context, onClose, open }) {
 	}));
 }
 function Pay({ context }) {
-	var _ref13, _context$summary$summ2;
+	var _ref14, _context$summary$summ2;
 	const paymentMethodNameMap = usePaymentMethodNameMap();
 	const tempOrder = context.sales.tempOrder;
-	const summary = (_ref13 = (_context$summary$summ2 = context.summary.summary) !== null && _context$summary$summ2 !== void 0 ? _context$summary$summ2 : tempOrder === null || tempOrder === void 0 ? void 0 : tempOrder.summary) !== null && _ref13 !== void 0 ? _ref13 : null;
+	const summary = (_ref14 = (_context$summary$summ2 = context.summary.summary) !== null && _context$summary$summ2 !== void 0 ? _context$summary$summ2 : tempOrder === null || tempOrder === void 0 ? void 0 : tempOrder.summary) !== null && _ref14 !== void 0 ? _ref14 : null;
 	const symbol = (tempOrder === null || tempOrder === void 0 ? void 0 : tempOrder.currency_symbol) || "$";
 	const payments = Array.isArray(tempOrder === null || tempOrder === void 0 ? void 0 : tempOrder.payments) ? tempOrder === null || tempOrder === void 0 ? void 0 : tempOrder.payments : [];
 	const overviewItems = [

package/es/plus/salesSdk/services/refundPayments.js

@@ -10,6 +10,7 @@ function _refundOrderPayments() {
 	_refundOrderPayments = _asyncToGenerator(function* (orderId, payments, options = {}) {
 		var _options$note$trim, _options$note;
 		const payload = _objectSpread2({
+			platform: "pos",
 			note: (_options$note$trim = (_options$note = options.note) === null || _options$note === void 0 ? void 0 : _options$note.trim()) !== null && _options$note$trim !== void 0 ? _options$note$trim : "",
 			content: [],
 			is_notice: 0,

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

@@ -179,7 +179,8 @@ interface SalesSdkRefundPaymentInput {
   product_voucher?: unknown;
   payment_method_name?: string;
   metadata?: {
-    unique_refund_number: string;
+    /** 现金退款归属的钱箱 ID。 */shop_wallet_pass_id?: string;
+    unique_refund_number?: string;
     manual_marking_flag?: 1;
   };
 }
@@ -577,6 +578,11 @@ interface UpdateOrderProductParams {
    */
   allow_booking_discount_reapply?: boolean;
 }
+/** Order.updateOrderBooking 入参；仅覆盖 updates 中显式给出的 booking 字段。 */
+interface UpdateOrderBookingParams {
+  unique_identification_number: string;
+  updates: Record<string, any>;
+}
 /** Order.updateOrderProductQuantity 入参；行定位语义与 updateOrderProduct / removeProductFromOrder 一致 */
 interface UpdateOrderProductQuantityParams extends ScanOrderOrderProductIdentity {
   num: number;
@@ -944,6 +950,8 @@ interface BookingTicketHandle {
   }) => Promise<ScanOrderOrderProduct[]>;
   updateOrderProduct: (params: UpdateOrderProductParams) => Promise<ScanOrderOrderProduct[]>;
   updateOrderProducts?: (paramsList: UpdateOrderProductParams[]) => Promise<ScanOrderOrderProduct[]>;
+  /** 按 booking UID 更新预约；OS 会保留未出现在 updates 中的原字段。 */
+  updateOrderBooking?: (params: UpdateOrderBookingParams) => Record<string, any>[];
   updateOrderProductQuantity: (params: UpdateOrderProductQuantityParams) => Promise<ScanOrderOrderProduct[]>;
   removeProductFromOrder: (identity: ScanOrderOrderProductIdentity, options?: {
     preserveDisplayPosition?: {

package/es/pro/skuDetailModal/index.js

@@ -11,6 +11,7 @@ import withResponsive from "../../responsive/withResponsive.js";
 import noteModal_default from "../../plus/noteModal/index.js";
 import DiscountKeyboard from "../priceKeyboard/components/discountKeyboard/index.js";
 import NumericStepper from "../NumericStepper/index.js";
+import useLogger from "../../hooks/useLogger.js";
 import stock_default from "../../shared/locales/stock.js";
 import { resolveSkuValueCandidates } from "../../plus/skuOptionsSelection/utils/resolveSkuValue.js";
 import SKUOptionsSelection from "../../plus/skuOptionsSelection/index.js";
@@ -19,7 +20,6 @@ import locales_default$1 from "./flow/locales.js";
 import useLocale from "../../hooks/useLocale.js";
 import { canUseLocalProductData, formatSelectedSkuItems, getStockValidationResult, setHiddenStockAlertForToday, shouldShowQuantityStepper } from "./utils.js";
 import useToast$1 from "../../hooks/useToast.js";
-import useLogger from "../../hooks/useLogger.js";
 import SkuDetailLoadingPanel from "./LoadingPanel.js";
 import SkuDetailCollapsibleSection from "./components/CollapsibleSection/index.js";
 import { getProductSkuFromWeighingValue, getWeighedUnitPrice, getWeighingValueFromProductSku, hasPositiveNetWeight, isWeighingProduct, resolveActiveSkuValue } from "./components/weighing/utils.js";

package/lib/components/bigSale/components/ProductList/index.js

@@ -3,11 +3,11 @@ const require_objectSpread2 = require("../../../../_virtual/_@oxc-project_runtim
 const require_asyncToGenerator = require("../../../../_virtual/_@oxc-project_runtime@0.122.0/helpers/asyncToGenerator.js");
 const require_utils = require("../../../booking/info/service2/utils.js");
 const require_useScrollActivity = require("../../../../hooks/useScrollActivity.js");
+const require_useLogger = require("../../../../hooks/useLogger.js");
 const require_useInitLocalesOnce = require("../../../../hooks/useInitLocalesOnce.js");
 const require_index = require("../../../../plus/productSelect/ProductCard/index.js");
 const require_ProductCardV2 = require("../../../../plus/productSelect/ProductCard/ProductCardV2.js");
 const require_useLocale = require("../../../../hooks/useLocale.js");
-const require_useLogger = require("../../../../hooks/useLogger.js");
 const require_List = require("../../../list/List.js");
 const require_utils$1 = require("../../../ticketBooking/components/ProductDisplayAdapter/utils.js");
 const require_showAddToCartToast = require("../../../../plus/salesSdk/components/showAddToCartToast.js");

package/lib/components/bigSale/dialog.js

@@ -7,6 +7,7 @@ const require_useSalesSdk = require("../../plus/salesSdk/hooks/useSalesSdk.js");
 const require_useSalesSdkCart = require("../../plus/salesSdk/hooks/useSalesSdkCart.js");
 const require_SalesSdkProvider = require("../../plus/salesSdk/context/SalesSdkProvider.js");
 const require_seedDineInReservationToCart = require("../../plus/pisellReservation/utils/seedDineInReservationToCart.js");
+const require_orderIdentity = require("./utils/orderIdentity.js");
 const require_index$1 = require("./index.js");
 let dayjs = require("dayjs");
 dayjs = require_runtime.__toESM(dayjs);
@@ -26,9 +27,7 @@ const MemoizedBigSale = react.default.memo(require_index$1.default);
 * isTempOrderBoundToRemoteOrder({ order_id: 'local_order_xxx' }); // false
 */
 function isTempOrderBoundToRemoteOrder(tempOrder) {
-	const orderId = tempOrder === null || tempOrder === void 0 ? void 0 : tempOrder.order_id;
-	if (orderId === void 0 || orderId === null) return false;
-	return !String(orderId).startsWith("local_order");
+	return require_orderIdentity.isPersistedBigSaleOrderId(tempOrder === null || tempOrder === void 0 ? void 0 : tempOrder.order_id);
 }
 /**
 * 快照必须是与当前订单匹配的完整原始记录；展示层规范化对象不能直接交给 OS hydrate。
@@ -328,6 +327,8 @@ function BigSaleDialog(props) {
 	contentActiveRef.current = contentActive;
 	const onVisualStateSettledRef = (0, react.useRef)(onVisualStateSettled);
 	onVisualStateSettledRef.current = onVisualStateSettled;
+	const resolvedBusinessCode = String(businessCode !== null && businessCode !== void 0 ? businessCode : "").trim() || (mode === "retail" ? "dine_in" : mode);
+	const hideSelectFloorMapResourceAction = !(require_orderIdentity.isPersistedBigSaleOrderId(orderId) && resolvedBusinessCode === "dine_in");
 	const resolvedFallbackTitle = title || (orderId ? `#${orderId}` : "New Order");
 	/** preloaded 实例保持稳定 mount，避免每次 open 销毁 SalesSdkProvider。 */
 	const bigSaleInstanceKey = (0, react.useMemo)(() => `${osKey}-${mode}`, [osKey, mode]);
@@ -518,7 +519,7 @@ function BigSaleDialog(props) {
 		productLoadParams,
 		productCatalogSessionKey,
 		productCatalogReady,
-		hideSelectFloorMapResourceAction: true,
+		hideSelectFloorMapResourceAction,
 		rulesHooks,
 		otherParams,
 		enableTempOrderPersist: false,

package/lib/components/bigSale/hooks/useSelectFloorMapResourceForBigSale.js

@@ -6,7 +6,10 @@ const require_SalesSdkUIHostsContext = require("../../../plus/salesSdk/context/S
 const require_SalesSdkProvider = require("../../../plus/salesSdk/context/SalesSdkProvider.js");
 const require_bookingDetailHostActions = require("../../../plus/pisellReservation/components/bookingDetailModal/bookingDetailHostActions.js");
 const require_usePicoCodingOpenData = require("../../../plus/pisellReservation/hooks/usePicoCodingOpenData.js");
+const require_reservationTicketBookingHostParams = require("../../../plus/pisellReservation/utils/reservationTicketBookingHostParams.js");
 const require_seedDineInReservationToCart = require("../../../plus/pisellReservation/utils/seedDineInReservationToCart.js");
+const require_floorResourceSelection = require("../utils/floorResourceSelection.js");
+const require_orderIdentity = require("../utils/orderIdentity.js");
 let dayjs = require("dayjs");
 dayjs = require_runtime.__toESM(dayjs);
 let react = require("react");
@@ -70,13 +73,16 @@ function resolveCurrentBookingAt(context) {
 * openSelectFloorMapResource();
 */
 function useSelectFloorMapResourceForBigSale(options) {
-	const { context, mode, businessCode, bookingConfigParams, productLoadParams } = options;
+	var _context$sales$bookin5, _context$sales$bookin6, _context$sales$bookin7, _context$sales$tempOr;
+	const { context, mode, orderId, businessCode, bookingConfigParams, productLoadParams } = options;
 	const engineCtx = require_useEngineContext.default();
 	const refreshRoot = (0, react.useContext)(require_SalesSdkProvider.SalesSdkRootRefreshContext);
 	const uiHosts = require_SalesSdkUIHostsContext.useSalesSdkUIHosts();
 	const reservationBiz = resolveBigSaleReservationBiz(businessCode, mode);
 	const { reservationRuleProduct, reservationAssociatedMenuListIds } = require_usePicoCodingOpenData.usePicoCodingOpenData(engineCtx, reservationBiz);
 	const hasReservationRuleProduct = Boolean(reservationRuleProduct);
+	const hasPersistedCurrentOrder = require_orderIdentity.isPersistedBigSaleOrderId((_context$sales$bookin5 = (_context$sales$bookin6 = context.sales.bookingTicket) === null || _context$sales$bookin6 === void 0 || (_context$sales$bookin7 = _context$sales$bookin6.getTempOrder) === null || _context$sales$bookin7 === void 0 || (_context$sales$bookin7 = _context$sales$bookin7.call(_context$sales$bookin6)) === null || _context$sales$bookin7 === void 0 ? void 0 : _context$sales$bookin7.order_id) !== null && _context$sales$bookin5 !== void 0 ? _context$sales$bookin5 : (_context$sales$tempOr = context.sales.tempOrder) === null || _context$sales$tempOr === void 0 ? void 0 : _context$sales$tempOr.order_id);
+	const canSelectFloorMapResource = hasReservationRuleProduct || hasPersistedCurrentOrder;
 	const associatedMenuListIds = (0, react.useMemo)(() => {
 		const fromProductLoad = normalizeMenuListIdsFromLoadParams(productLoadParams);
 		return fromProductLoad.length > 0 ? fromProductLoad : reservationAssociatedMenuListIds;
@@ -89,10 +95,10 @@ function useSelectFloorMapResourceForBigSale(options) {
 	*/
 	const refreshBigSaleAfterResourceMerge = (0, ahooks.useMemoizedFn)(function() {
 		var _ref2 = require_asyncToGenerator._asyncToGenerator(function* (loadResources) {
-			var _context$sales$bookin5, _context$sales$bookin6, _context$sales$bookin7, _context$sales$bookin8, _context$sales$bookin9;
-			const liveTempOrder = (_context$sales$bookin5 = (_context$sales$bookin6 = context.sales.bookingTicket) === null || _context$sales$bookin6 === void 0 || (_context$sales$bookin7 = _context$sales$bookin6.getTempOrder) === null || _context$sales$bookin7 === void 0 ? void 0 : _context$sales$bookin7.call(_context$sales$bookin6)) !== null && _context$sales$bookin5 !== void 0 ? _context$sales$bookin5 : context.sales.tempOrder;
+			var _context$sales$bookin8, _context$sales$bookin9, _context$sales$bookin10, _context$sales$bookin11, _context$sales$bookin12;
+			const liveTempOrder = (_context$sales$bookin8 = (_context$sales$bookin9 = context.sales.bookingTicket) === null || _context$sales$bookin9 === void 0 || (_context$sales$bookin10 = _context$sales$bookin9.getTempOrder) === null || _context$sales$bookin10 === void 0 ? void 0 : _context$sales$bookin10.call(_context$sales$bookin9)) !== null && _context$sales$bookin8 !== void 0 ? _context$sales$bookin8 : context.sales.tempOrder;
 			const bookingIds = require_buildDefaultLoadProductsParams.collectBookingIdsFromTempOrder(liveTempOrder !== null && liveTempOrder !== void 0 ? liveTempOrder : null);
-			yield (_context$sales$bookin8 = context.sales.bookingTicket) === null || _context$sales$bookin8 === void 0 || (_context$sales$bookin9 = _context$sales$bookin8.initBookingContext) === null || _context$sales$bookin9 === void 0 ? void 0 : _context$sales$bookin9.call(_context$sales$bookin8, require_buildDefaultLoadProductsParams.buildInitBookingContextParams(bookingConfigParams, {
+			yield (_context$sales$bookin11 = context.sales.bookingTicket) === null || _context$sales$bookin11 === void 0 || (_context$sales$bookin12 = _context$sales$bookin11.initBookingContext) === null || _context$sales$bookin12 === void 0 ? void 0 : _context$sales$bookin12.call(_context$sales$bookin11, require_buildDefaultLoadProductsParams.buildInitBookingContextParams(bookingConfigParams, {
 				date: resolveCurrentBookingAt(context),
 				bookingIds: bookingIds.length ? bookingIds : void 0,
 				loadResources
@@ -112,8 +118,8 @@ function useSelectFloorMapResourceForBigSale(options) {
 	*/
 	const mergeExistingOrderToBigSale = (0, ahooks.useMemoizedFn)(function() {
 		var _ref3 = require_asyncToGenerator._asyncToGenerator(function* (orderId) {
-			var _context$sales$bookin10;
-			if (!((_context$sales$bookin10 = context.sales.bookingTicket) === null || _context$sales$bookin10 === void 0 ? void 0 : _context$sales$bookin10.loadSalesDetail)) throw new Error("[BigSale] loadSalesDetail 不可用");
+			var _context$sales$bookin13;
+			if (!((_context$sales$bookin13 = context.sales.bookingTicket) === null || _context$sales$bookin13 === void 0 ? void 0 : _context$sales$bookin13.loadSalesDetail)) throw new Error("[BigSale] loadSalesDetail 不可用");
 			yield context.sales.bookingTicket.loadSalesDetail({
 				orderId,
 				forceRemote: true,
@@ -133,18 +139,18 @@ function useSelectFloorMapResourceForBigSale(options) {
 	*/
 	const seedEmptyResourceToBigSale = (0, ahooks.useMemoizedFn)(function() {
 		var _ref4 = require_asyncToGenerator._asyncToGenerator(function* (selected) {
-			var _context$sales$bookin11, _context$sales$bookin12, _context$sales$bookin13, _context$sales$bookin14, _context$sales$bookin15, _context$sales$bookin16, _liveTempOrder$custom;
+			var _context$sales$bookin14, _context$sales$bookin15, _context$sales$bookin16, _context$sales$bookin17, _context$sales$bookin18, _context$sales$bookin19, _context$sales$bookin20, _context$sales$bookin21, _context$sales$bookin22, _liveTempOrder$custom;
 			if (!context.sales.bookingTicket) throw new Error("[BigSale] bookingTicket 未初始化");
 			if (!reservationRuleProduct || typeof reservationRuleProduct !== "object") throw new Error("[BigSale] 缺少桌台关联商品配置");
-			if (!context.sales.tempOrder) yield context.sales.createNew();
+			if (!((_context$sales$bookin14 = (_context$sales$bookin15 = (_context$sales$bookin16 = context.sales.bookingTicket).getTempOrder) === null || _context$sales$bookin15 === void 0 ? void 0 : _context$sales$bookin15.call(_context$sales$bookin16)) !== null && _context$sales$bookin14 !== void 0 ? _context$sales$bookin14 : context.sales.tempOrder)) yield context.sales.createNew();
 			const currentAt = resolveCurrentBookingAt(context);
-			const liveTempOrder = (_context$sales$bookin11 = (_context$sales$bookin12 = (_context$sales$bookin13 = context.sales.bookingTicket).getTempOrder) === null || _context$sales$bookin12 === void 0 ? void 0 : _context$sales$bookin12.call(_context$sales$bookin13)) !== null && _context$sales$bookin11 !== void 0 ? _context$sales$bookin11 : context.sales.tempOrder;
+			const liveTempOrder = (_context$sales$bookin17 = (_context$sales$bookin18 = (_context$sales$bookin19 = context.sales.bookingTicket).getTempOrder) === null || _context$sales$bookin18 === void 0 ? void 0 : _context$sales$bookin18.call(_context$sales$bookin19)) !== null && _context$sales$bookin17 !== void 0 ? _context$sales$bookin17 : context.sales.tempOrder;
 			yield require_seedDineInReservationToCart.seedDineInReservationToCart({
 				bookingTicket: context.sales.bookingTicket,
 				reservationRuleProduct,
-				row: selected.row,
+				row: require_floorResourceSelection.resolveSelectedReservationRow(selected),
 				appointmentStatus: "started",
-				bookingConfig: (_context$sales$bookin14 = (_context$sales$bookin15 = (_context$sales$bookin16 = context.sales.bookingTicket).getBookingConfig) === null || _context$sales$bookin15 === void 0 ? void 0 : _context$sales$bookin15.call(_context$sales$bookin16)) !== null && _context$sales$bookin14 !== void 0 ? _context$sales$bookin14 : null,
+				bookingConfig: (_context$sales$bookin20 = (_context$sales$bookin21 = (_context$sales$bookin22 = context.sales.bookingTicket).getBookingConfig) === null || _context$sales$bookin21 === void 0 ? void 0 : _context$sales$bookin21.call(_context$sales$bookin22)) !== null && _context$sales$bookin20 !== void 0 ? _context$sales$bookin20 : null,
 				tempOrder: liveTempOrder,
 				customerId: (_liveTempOrder$custom = liveTempOrder === null || liveTempOrder === void 0 ? void 0 : liveTempOrder.customer_id) !== null && _liveTempOrder$custom !== void 0 ? _liveTempOrder$custom : void 0,
 				date: currentAt.format("YYYY-MM-DD"),
@@ -156,29 +162,65 @@ function useSelectFloorMapResourceForBigSale(options) {
 			return _ref4.apply(this, arguments);
 		};
 	}());
+	/** 仅替换已有桌台 booking 的 resources，保留商品行与其余 booking 字段。 */
+	const replaceExistingTableResource = (0, ahooks.useMemoizedFn)(function() {
+		var _ref6 = require_asyncToGenerator._asyncToGenerator(function* (selected, booking) {
+			var _ref5, _booking$metadata$uni, _booking$metadata;
+			const bookingTicket = context.sales.bookingTicket;
+			if (!bookingTicket || typeof bookingTicket.updateOrderBooking !== "function") throw new Error("[BigSale] updateOrderBooking 不可用");
+			const bookingUid = String((_ref5 = (_booking$metadata$uni = (_booking$metadata = booking.metadata) === null || _booking$metadata === void 0 ? void 0 : _booking$metadata.unique_identification_number) !== null && _booking$metadata$uni !== void 0 ? _booking$metadata$uni : booking.unique_identification_number) !== null && _ref5 !== void 0 ? _ref5 : "").trim();
+			if (!bookingUid) throw new Error("[BigSale] 桌台 booking 缺少 UID，无法换桌");
+			if (!require_floorResourceSelection.resolveSelectedFloorResourceId(selected)) throw new Error("[BigSale] 所选桌台缺少有效资源 ID");
+			const resources = require_reservationTicketBookingHostParams.buildReplacementBookingResourcesFromReservationRow(require_floorResourceSelection.resolveSelectedReservationRow(selected), booking);
+			yield bookingTicket.updateOrderBooking({
+				unique_identification_number: bookingUid,
+				updates: { resources }
+			});
+			yield refreshBigSaleAfterResourceMerge(true);
+		});
+		return function(_x4, _x5) {
+			return _ref6.apply(this, arguments);
+		};
+	}());
 	/**
-	* 处理选择资源弹窗点击结果：已有订单走 merge，空桌走 seed。
+	* 处理选择资源弹窗点击结果：已落库订单只新增/替换桌台；新建订单命中已有订单
+	* 时 merge，选择空桌时按当前草稿执行新增、同桌不变或异桌替换。
 	*
 	* @example
 	* await handleSelectedFloorMapResource(selected);
 	*/
 	const handleSelectedFloorMapResource = (0, ahooks.useMemoizedFn)(function() {
-		var _ref5 = require_asyncToGenerator._asyncToGenerator(function* (selected) {
-			const orderId = resolveSelectedResourceOrderId(selected);
-			if (orderId != null) {
-				yield mergeExistingOrderToBigSale(orderId);
-				return;
-			}
-			if ((typeof selected.row.bookingCount === "number" && Number.isFinite(selected.row.bookingCount) ? selected.row.bookingCount : 0) > 0) console.warn("[BigSale] 当前桌台有订单记录，但未命中可合并订单");
-			if (!hasReservationRuleProduct) return;
-			yield seedEmptyResourceToBigSale(selected);
+		var _ref7 = require_asyncToGenerator._asyncToGenerator(function* (selected) {
+			var _context$sales$bookin23, _context$sales$bookin24, _context$sales$bookin25, _context$sales$salesD, _context$sales$salesD2, _context$sales$salesD3;
+			const liveTempOrder = (_context$sales$bookin23 = (_context$sales$bookin24 = context.sales.bookingTicket) === null || _context$sales$bookin24 === void 0 || (_context$sales$bookin25 = _context$sales$bookin24.getTempOrder) === null || _context$sales$bookin25 === void 0 ? void 0 : _context$sales$bookin25.call(_context$sales$bookin24)) !== null && _context$sales$bookin23 !== void 0 ? _context$sales$bookin23 : context.sales.tempOrder;
+			const currentOrderId = liveTempOrder === null || liveTempOrder === void 0 ? void 0 : liveTempOrder.order_id;
+			const isPersistedOrder = require_orderIdentity.isPersistedBigSaleOrderId(currentOrderId);
+			if (require_orderIdentity.isPersistedBigSaleOrderId(orderId) && String(currentOrderId !== null && currentOrderId !== void 0 ? currentOrderId : "").trim() !== String(orderId).trim()) throw new Error("[BigSale] 当前订单尚未加载完成，请稍后重试");
+			const salesDetailOrderId = (_context$sales$salesD = (_context$sales$salesD2 = context.sales.salesDetail) === null || _context$sales$salesD2 === void 0 || (_context$sales$salesD2 = _context$sales$salesD2.header) === null || _context$sales$salesD2 === void 0 ? void 0 : _context$sales$salesD2.order_id) !== null && _context$sales$salesD !== void 0 ? _context$sales$salesD : (_context$sales$salesD3 = context.sales.salesDetail) === null || _context$sales$salesD3 === void 0 ? void 0 : _context$sales$salesD3.order_id;
+			if (!liveTempOrder && require_orderIdentity.isPersistedBigSaleOrderId(salesDetailOrderId)) throw new Error("[BigSale] 当前订单尚未加载完成，请稍后重试");
+			const selectedOrderId = resolveSelectedResourceOrderId(selected);
+			const currentTableBookings = require_floorResourceSelection.resolveCurrentTableBookings(liveTempOrder, reservationRuleProduct);
+			const bookingCount = typeof selected.row.bookingCount === "number" && Number.isFinite(selected.row.bookingCount) ? selected.row.bookingCount : 0;
+			if (!isPersistedOrder && selectedOrderId == null && bookingCount > 0) console.warn("[BigSale] 当前桌台有订单记录，但未命中可合并订单");
+			const result = yield require_floorResourceSelection.applyBigSaleFloorResourceSelection({
+				isPersistedOrder,
+				selectedOrderId,
+				selectedResourceId: require_floorResourceSelection.resolveSelectedFloorResourceId(selected),
+				currentTableBookings,
+				add: () => seedEmptyResourceToBigSale(selected),
+				replace: (booking) => replaceExistingTableResource(selected, booking),
+				merge: (orderId) => mergeExistingOrderToBigSale(orderId)
+			});
+			if (result === "unchanged") antd.message.info("This table is already assigned");
+			return result;
 		});
-		return function(_x4) {
-			return _ref5.apply(this, arguments);
+		return function(_x6) {
+			return _ref7.apply(this, arguments);
 		};
 	}());
 	return {
 		hasReservationRuleProduct,
+		canSelectFloorMapResource,
 		openSelectFloorMapResource: (0, ahooks.useMemoizedFn)(() => {
 			var _engineCtx$appHelper;
 			const action = engineCtx === null || engineCtx === void 0 || (_engineCtx$appHelper = engineCtx.appHelper) === null || _engineCtx$appHelper === void 0 || (_engineCtx$appHelper = _engineCtx$appHelper.utils) === null || _engineCtx$appHelper === void 0 ? void 0 : _engineCtx$appHelper.action;
@@ -202,7 +244,8 @@ function useSelectFloorMapResourceForBigSale(options) {
 						at: currentAt
 					},
 					onClick: (selected) => {
-						handleSelectedFloorMapResource(selected).then(() => {
+						handleSelectedFloorMapResource(selected).then((result) => {
+							if (!require_floorResourceSelection.shouldCloseFloorResourceSelection(result)) return;
 							action({
 								type: "pisell1.closeSelectFloorMapResource",
 								data: {},

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

@@ -222,9 +222,10 @@ function StandardBigSaleTemplate({ isActive = true, osKey, productListPreference
 	]);
 	const [productListPreferences, setProductListPreferences] = (0, react.useState)(() => require_productListPreferences.readBigSaleProductListPreferences(productListPreferencesKey, defaultProductListPreferences));
 	const [hasProductListPreferencesOverride, setHasProductListPreferencesOverride] = (0, react.useState)(() => Boolean(require_productListPreferences.readStoredBigSaleProductListPreferences(productListPreferencesKey, defaultProductListPreferences)));
-	const { openSelectFloorMapResource } = require_useSelectFloorMapResourceForBigSale.useSelectFloorMapResourceForBigSale({
+	const { canSelectFloorMapResource, openSelectFloorMapResource } = require_useSelectFloorMapResourceForBigSale.useSelectFloorMapResourceForBigSale({
 		context,
 		mode,
+		orderId,
 		businessCode,
 		bookingConfigParams,
 		productLoadParams
@@ -235,7 +236,7 @@ function StandardBigSaleTemplate({ isActive = true, osKey, productListPreference
 		setProductListPreferences(storedPreferences || defaultProductListPreferences);
 		setHasProductListPreferencesOverride(Boolean(storedPreferences));
 	}, [defaultProductListPreferences, productListPreferencesKey]);
-	const shouldInjectFloorResourceAction = !hideSelectFloorMapResourceAction;
+	const shouldInjectFloorResourceAction = canSelectFloorMapResource && !hideSelectFloorMapResourceAction;
 	const dineInOrderActions = (0, react.useMemo)(() => {
 		if (!shouldInjectFloorResourceAction) return void 0;
 		return [
@@ -364,7 +365,8 @@ function StandardBigSaleTemplate({ isActive = true, osKey, productListPreference
 		defaultProductListPreferences,
 		onProductListPreferencesChange: handleProductListPreferencesChange,
 		onProductListPreferencesReset: handleProductListPreferencesReset,
-		variant
+		variant,
+		productSelectionTrigger: "click"
 	}), /* @__PURE__ */ react.default.createElement(require_index$4.default, {
 		variant,
 		floatingPanelRef,

package/lib/components/bigSale/utils/floorResourceSelection.js

@@ -0,0 +1,110 @@
+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");
+//#region src/components/bigSale/utils/floorResourceSelection.ts
+function normalizeIdentity(value) {
+	if (value === void 0 || value === null) return null;
+	const normalized = String(value).trim();
+	return normalized && normalized !== "0" ? normalized : null;
+}
+function resolveBookingResources(booking) {
+	return (Array.isArray(booking.resources) ? booking.resources : Array.isArray(booking.event_resources) ? booking.event_resources : []).filter((resource) => Boolean(resource) && typeof resource === "object");
+}
+function resolveProductUid(product) {
+	var _product$metadata$uni, _product$metadata;
+	return normalizeIdentity((_product$metadata$uni = (_product$metadata = product.metadata) === null || _product$metadata === void 0 ? void 0 : _product$metadata.unique_identification_number) !== null && _product$metadata$uni !== void 0 ? _product$metadata$uni : product.unique_identification_number);
+}
+function resolveBookingUid(booking) {
+	var _booking$metadata$uni, _booking$metadata;
+	return normalizeIdentity((_booking$metadata$uni = (_booking$metadata = booking.metadata) === null || _booking$metadata === void 0 ? void 0 : _booking$metadata.unique_identification_number) !== null && _booking$metadata$uni !== void 0 ? _booking$metadata$uni : booking.unique_identification_number);
+}
+/** 将选择 payload 归一为 seed / 换桌共同消费的桌台行。 */
+function resolveSelectedReservationRow(selected) {
+	var _selected$resource$ra, _ref, _selected$resource$re, _selected$resource$fo, _ref2, _selected$resource$co, _ref3, _selected$resource$ma;
+	const raw = (_selected$resource$ra = selected.resource.raw) !== null && _selected$resource$ra !== void 0 ? _selected$resource$ra : selected.row;
+	const relationId = (_ref = (_selected$resource$re = selected.resource.relation_id) !== null && _selected$resource$re !== void 0 ? _selected$resource$re : selected.resource.id) !== null && _ref !== void 0 ? _ref : raw.id;
+	return require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, selected.row), raw), {}, {
+		id: String(relationId),
+		form_id: (_selected$resource$fo = selected.resource.form_id) !== null && _selected$resource$fo !== void 0 ? _selected$resource$fo : raw.form_id,
+		code: (_ref2 = (_selected$resource$co = selected.resource.code) !== null && _selected$resource$co !== void 0 ? _selected$resource$co : raw.code) !== null && _ref2 !== void 0 ? _ref2 : String(relationId),
+		main_field: (_ref3 = (_selected$resource$ma = selected.resource.main_field) !== null && _selected$resource$ma !== void 0 ? _selected$resource$ma : raw.main_field) !== null && _ref3 !== void 0 ? _ref3 : selected.row.main_field
+	});
+}
+/** 选择 payload 中的资源主键，与 booking.resources[].relation_id 对齐。 */
+function resolveSelectedFloorResourceId(selected) {
+	var _ref4, _selected$resource$re2;
+	return normalizeIdentity((_ref4 = (_selected$resource$re2 = selected.resource.relation_id) !== null && _selected$resource$re2 !== void 0 ? _selected$resource$re2 : selected.resource.id) !== null && _ref4 !== void 0 ? _ref4 : selected.row.id);
+}
+/** 当前 booking 是否已经绑定了本次选中的桌台。 */
+function bookingUsesFloorResource(booking, resourceId) {
+	if (!resourceId) return false;
+	return resolveBookingResources(booking).some((resource) => normalizeIdentity(resource.relation_id) === resourceId);
+}
+/**
+* 从 tempOrder 找出桌台 booking。
+*
+* 优先使用当前配置的桌台规则商品关联关系；历史数据无法关联时，再退回到带资源的
+* 非 root booking。这样既兼容配置变更后的旧单，也不会把 root booking 当成桌台商品。
+*/
+function resolveCurrentTableBookings(tempOrder, reservationRuleProduct) {
+	var _tempOrder$bookings, _reservationRuleProdu, _tempOrder$products;
+	if (!tempOrder) return [];
+	const nonRootBookings = ((_tempOrder$bookings = tempOrder.bookings) !== null && _tempOrder$bookings !== void 0 ? _tempOrder$bookings : []).filter((booking) => {
+		if (!booking || typeof booking !== "object") return false;
+		return Number(booking.parent_id) !== 0;
+	});
+	const resourceBookings = nonRootBookings.filter((booking) => resolveBookingResources(booking).some((resource) => Boolean(normalizeIdentity(resource.relation_id))));
+	const ruleProductId = normalizeIdentity((_reservationRuleProdu = reservationRuleProduct === null || reservationRuleProduct === void 0 ? void 0 : reservationRuleProduct.id) !== null && _reservationRuleProdu !== void 0 ? _reservationRuleProdu : reservationRuleProduct === null || reservationRuleProduct === void 0 ? void 0 : reservationRuleProduct.product_id);
+	if (!ruleProductId) return resourceBookings;
+	const linkedProductUids = /* @__PURE__ */ new Set();
+	const linkedBookingUids = /* @__PURE__ */ new Set();
+	for (const product of (_tempOrder$products = tempOrder.products) !== null && _tempOrder$products !== void 0 ? _tempOrder$products : []) {
+		var _booking_uid, _product$metadata2;
+		if (normalizeIdentity(product.product_id) !== ruleProductId) continue;
+		const productUid = resolveProductUid(product);
+		if (productUid) linkedProductUids.add(productUid);
+		const bookingUid = normalizeIdentity((_booking_uid = product.booking_uid) !== null && _booking_uid !== void 0 ? _booking_uid : (_product$metadata2 = product.metadata) === null || _product$metadata2 === void 0 ? void 0 : _product$metadata2.booking_uid);
+		if (bookingUid) linkedBookingUids.add(bookingUid);
+	}
+	const linkedBookings = nonRootBookings.filter((booking) => {
+		const productUid = normalizeIdentity(booking.product_uid);
+		const bookingUid = resolveBookingUid(booking);
+		return Boolean(productUid && linkedProductUids.has(productUid) || bookingUid && linkedBookingUids.has(bookingUid));
+	});
+	return Array.from(new Set([...linkedBookings, ...resourceBookings]));
+}
+/**
+* 执行桌台选择分流。已落库订单永远不会进入 merge 回调；新订单命中已有
+* 订单时仍优先 merge，否则对当前草稿已有桌台执行同桌不变或异桌替换。
+*/
+function applyBigSaleFloorResourceSelection(_x) {
+	return _applyBigSaleFloorResourceSelection.apply(this, arguments);
+}
+function _applyBigSaleFloorResourceSelection() {
+	_applyBigSaleFloorResourceSelection = require_asyncToGenerator._asyncToGenerator(function* (options) {
+		const { isPersistedOrder, selectedOrderId, selectedResourceId, currentTableBookings, add, replace, merge } = options;
+		if (!isPersistedOrder && selectedOrderId != null) {
+			yield merge(selectedOrderId);
+			return "merged";
+		}
+		if (currentTableBookings.length > 1) throw new Error("[BigSale] 当前订单存在多条桌台 booking，无法自动换桌");
+		const currentTableBooking = currentTableBookings[0];
+		if (!currentTableBooking) {
+			yield add();
+			return "added";
+		}
+		if (bookingUsesFloorResource(currentTableBooking, selectedResourceId)) return "unchanged";
+		yield replace(currentTableBooking);
+		return "replaced";
+	});
+	return _applyBigSaleFloorResourceSelection.apply(this, arguments);
+}
+/** 只有发生实际写入或合单时才关闭桌台选择弹窗。 */
+function shouldCloseFloorResourceSelection(result) {
+	return result !== "unchanged";
+}
+//#endregion
+exports.applyBigSaleFloorResourceSelection = applyBigSaleFloorResourceSelection;
+exports.resolveCurrentTableBookings = resolveCurrentTableBookings;
+exports.resolveSelectedFloorResourceId = resolveSelectedFloorResourceId;
+exports.resolveSelectedReservationRow = resolveSelectedReservationRow;
+exports.shouldCloseFloorResourceSelection = shouldCloseFloorResourceSelection;

package/lib/components/bigSale/utils/orderIdentity.js

@@ -0,0 +1,16 @@
+//#region src/components/bigSale/utils/orderIdentity.ts
+/**
+* 判断订单 ID 是否指向后端已落库订单。
+*
+* `local_order*` / `LOCAL_*` 等本地草稿标识仍属于新建订单流程。
+*/
+function isPersistedBigSaleOrderId(orderId) {
+	if (orderId === void 0 || orderId === null) return false;
+	if (typeof orderId === "number") return Number.isFinite(orderId) && orderId > 0;
+	const normalized = String(orderId).trim();
+	if (!normalized || normalized === "0") return false;
+	const lower = normalized.toLowerCase();
+	return !(lower === "local" || lower.startsWith("local_") || lower.startsWith("local-"));
+}
+//#endregion
+exports.isPersistedBigSaleOrderId = isPersistedBigSaleOrderId;

package/lib/components/checkout/plugin.js

@@ -3,8 +3,8 @@ const require_objectSpread2 = require("../../_virtual/_@oxc-project_runtime@0.12
 const require_asyncToGenerator = require("../../_virtual/_@oxc-project_runtime@0.122.0/helpers/asyncToGenerator.js");
 const require_model = require("../booking/info/model.js");
 const require_useEngineContext = require("../../hooks/useEngineContext.js");
-const require_index = require("../../utils/index.js");
 const require_useLogger = require("../../hooks/useLogger.js");
+const require_index = require("../../utils/index.js");
 const require_payment_modal_utils = require("./payment-modal-utils.js");
 const require_PaymentModal = require("./PaymentModal.js");
 let react = require("react");