@pisell/private-materials 6.12.267 → 6.12.268

package/es/components/venueBooking/components/Addons/index.js

@@ -3,6 +3,7 @@ import { _objectSpread2 } from "../../../../_virtual/_@oxc-project_runtime@0.122
 import { _asyncToGenerator } from "../../../../_virtual/_@oxc-project_runtime@0.122.0/helpers/asyncToGenerator.js";
 import index from "../../../../plus/productSelect/index.js";
 import { transformProductDetailToOrderProduct } from "../../../scanOrder/utils/transformProductDetail.js";
+import { getVenueBookingProductIdentity, getVenueBookingProductUid } from "../../utils/orderProductIdentity.js";
 import { useVenueBookingContext } from "../../context.js";
 import React, { useEffect, useRef } from "react";
 import { Modal } from "antd";
@@ -20,6 +21,10 @@ function Addons() {
 	const { utils } = useEngineContext().appHelper || {};
 	const { runModuleAction, refreshViewModel, viewModel, goToStep } = useVenueBookingContext();
 	const productList = viewModel.addonProductList || [];
+	const addonCartItems = (Array.isArray(viewModel.cartItems) ? viewModel.cartItems : []).filter((cartItem) => {
+		var _cartItem$metadata;
+		return !(cartItem === null || cartItem === void 0 || (_cartItem$metadata = cartItem.metadata) === null || _cartItem$metadata === void 0 ? void 0 : _cartItem$metadata.venue_booking);
+	});
 	const scrollRef = useRef(null);
 	const isMobileView = isMobile();
 	const maxHeight = window.innerHeight - 100;
@@ -68,20 +73,15 @@ function Addons() {
 	}();
 	const removeOrderProduct = function() {
 		var _ref3 = _asyncToGenerator(function* (params) {
-			const { product_id, product_variant_id, identity_key, sourceData } = params;
+			const { identity, sourceData } = params;
 			try {
-				yield runModuleAction("removeProductFromOrder", _objectSpread2({
-					product_id,
-					product_variant_id
-				}, identity_key ? { identity_key } : {}));
+				yield runModuleAction("removeProductFromOrder", identity);
 				yield refreshViewModel();
 			} catch (error) {
 				console.error("[venueBooking] removeProductFromOrder failed", {
 					error,
 					sourceData,
-					product_id,
-					product_variant_id,
-					identity_key
+					identity
 				});
 			}
 		});
@@ -91,21 +91,16 @@ function Addons() {
 	}();
 	const updateOrderProduct = function() {
 		var _ref4 = _asyncToGenerator(function* (params) {
-			const { product_id, product_variant_id, identity_key, updates, sourceData } = params;
+			const { identity, num, sourceData } = params;
 			try {
-				yield runModuleAction("updateProductInOrder", _objectSpread2(_objectSpread2({
-					product_id,
-					product_variant_id
-				}, identity_key ? { identity_key } : {}), {}, { updates }));
+				yield runModuleAction("updateOrderProduct", _objectSpread2(_objectSpread2({}, identity), {}, { updates: { num } }));
 				yield refreshViewModel();
 			} catch (error) {
-				console.error("[venueBooking] updateProductInOrder failed", {
+				console.error("[venueBooking] updateOrderProduct failed", {
 					error,
 					sourceData,
-					product_id,
-					product_variant_id,
-					identity_key,
-					updates
+					identity,
+					num
 				});
 			}
 		});
@@ -123,7 +118,7 @@ function Addons() {
 		var _ref7 = _asyncToGenerator(function* (item, clickType, meta) {
 			const sourceItem = (meta === null || meta === void 0 ? void 0 : meta.product) || item;
 			if ((meta === null || meta === void 0 ? void 0 : meta.intent) === "quantity") {
-				var _item$option, _item$bundle, _item$price, _item$product_id, _ref5, _meta$quantity, _orderProduct$product, _orderProduct$product4;
+				var _item$option, _item$bundle, _item$price, _item$product_id, _ref5, _meta$quantity, _orderProduct$product;
 				const quantityData = _objectSpread2(_objectSpread2({}, item), {}, {
 					quantity: item === null || item === void 0 ? void 0 : item.num,
 					option: (_item$option = item === null || item === void 0 ? void 0 : item.option) !== null && _item$option !== void 0 ? _item$option : item === null || item === void 0 ? void 0 : item.product_option_item,
@@ -150,17 +145,36 @@ function Addons() {
 					return;
 				}
 				const normalizedQuantity = Number.isNaN(nextQuantity) ? 0 : Math.max(0, Math.floor(nextQuantity));
-				const existedCartItem = (Array.isArray(viewModel === null || viewModel === void 0 ? void 0 : viewModel.cartItems) ? viewModel.cartItems : []).find((cartItem) => {
-					var _cartItem$product_id, _orderProduct$product2, _cartItem$product_var;
-					return String((_cartItem$product_id = cartItem === null || cartItem === void 0 ? void 0 : cartItem.product_id) !== null && _cartItem$product_id !== void 0 ? _cartItem$product_id : null) === String((_orderProduct$product2 = orderProduct === null || orderProduct === void 0 ? void 0 : orderProduct.product_id) !== null && _orderProduct$product2 !== void 0 ? _orderProduct$product2 : null) && Number((_cartItem$product_var = cartItem === null || cartItem === void 0 ? void 0 : cartItem.product_variant_id) !== null && _cartItem$product_var !== void 0 ? _cartItem$product_var : 0) === productVariantId;
+				const productCartItems = addonCartItems.filter((cartItem) => {
+					var _cartItem$product_id, _orderProduct$product2;
+					return String((_cartItem$product_id = cartItem === null || cartItem === void 0 ? void 0 : cartItem.product_id) !== null && _cartItem$product_id !== void 0 ? _cartItem$product_id : null) === String((_orderProduct$product2 = orderProduct === null || orderProduct === void 0 ? void 0 : orderProduct.product_id) !== null && _orderProduct$product2 !== void 0 ? _orderProduct$product2 : null);
+				});
+				const matchedCartItems = productCartItems.filter((cartItem) => {
+					var _cartItem$product_var;
+					return Number((_cartItem$product_var = cartItem === null || cartItem === void 0 ? void 0 : cartItem.product_variant_id) !== null && _cartItem$product_var !== void 0 ? _cartItem$product_var : 0) === productVariantId;
 				});
-				const existedIdentityKey = typeof (existedCartItem === null || existedCartItem === void 0 ? void 0 : existedCartItem.identity_key) === "string" && existedCartItem.identity_key.length > 0 ? existedCartItem.identity_key : void 0;
+				const eventUid = getVenueBookingProductUid(item);
+				const uidMatchedItems = eventUid ? matchedCartItems.filter((cartItem) => getVenueBookingProductUid(cartItem) === eventUid) : matchedCartItems;
+				if (productCartItems.length > 1 || eventUid && uidMatchedItems.length !== 1) {
+					console.warn("[venueBooking] quantity action skipped: ambiguous or stale order line", {
+						mode: eventUid ? "uid" : "sku",
+						eventUid,
+						product_id: orderProduct.product_id,
+						product_variant_id: productVariantId,
+						matchedLineCount: productCartItems.length
+					});
+					return;
+				}
+				const existedCartItem = uidMatchedItems[0];
+				const existedIdentity = existedCartItem ? getVenueBookingProductIdentity(existedCartItem) : null;
+				if (existedCartItem && !existedIdentity) {
+					console.warn("[venueBooking] quantity action skipped: missing order line UID", { item: existedCartItem });
+					return;
+				}
 				if (normalizedQuantity <= 0) {
-					var _orderProduct$product3;
+					if (!existedIdentity) return;
 					yield removeOrderProduct({
-						product_id: (_orderProduct$product3 = orderProduct === null || orderProduct === void 0 ? void 0 : orderProduct.product_id) !== null && _orderProduct$product3 !== void 0 ? _orderProduct$product3 : null,
-						product_variant_id: productVariantId,
-						identity_key: existedIdentityKey,
+						identity: existedIdentity,
 						sourceData: quantityData
 					});
 					return;
@@ -172,14 +186,10 @@ function Addons() {
 					});
 					return;
 				}
+				if (!existedIdentity) return;
 				yield updateOrderProduct({
-					product_id: (_orderProduct$product4 = orderProduct === null || orderProduct === void 0 ? void 0 : orderProduct.product_id) !== null && _orderProduct$product4 !== void 0 ? _orderProduct$product4 : null,
-					product_variant_id: productVariantId,
-					identity_key: existedIdentityKey,
-					updates: {
-						num: normalizedQuantity,
-						_origin: orderProduct === null || orderProduct === void 0 ? void 0 : orderProduct._origin
-					},
+					identity: existedIdentity,
+					num: normalizedQuantity,
 					sourceData: quantityData
 				});
 			} else utils === null || utils === void 0 || utils.action({
@@ -237,7 +247,7 @@ function Addons() {
 		customScrollParent: ((_scrollRef$current = scrollRef.current) === null || _scrollRef$current === void 0 ? void 0 : _scrollRef$current.getScrollContainer()) || "",
 		hideCategoryWhenOne: true,
 		version: "v2",
-		value: (viewModel === null || viewModel === void 0 ? void 0 : viewModel.cartItems) || [],
+		value: addonCartItems,
 		productListSetting: {
 			imgWidth: 80,
 			imgHeight: 80

package/es/components/venueBooking/components/Cart/index.js

@@ -3,6 +3,7 @@ import { _objectSpread2 } from "../../../../_virtual/_@oxc-project_runtime@0.122
 import { _asyncToGenerator } from "../../../../_virtual/_@oxc-project_runtime@0.122.0/helpers/asyncToGenerator.js";
 import shoppingCart from "../../../shoppingCart/index.js";
 import SubTotal from "../../../subTotal/index.js";
+import { getVenueBookingProductIdentity } from "../../utils/orderProductIdentity.js";
 import { useVenueBookingContext } from "../../context.js";
 import VoucherCard from "../Voucher/index.js";
 import VenueDeposit from "../Deposit/index.js";
@@ -20,7 +21,7 @@ import "./index.less";
 function Cart(props) {
 	var _engineContext$appHel, _engineContext$appHel2, _engineContext$appHel3, _engineContext$engine, _businessUtils$getApp, _businessUtils$getApp2, _ref, _ref2, _ref3, _summary$total_amount, _summary$deposit3;
 	const { open, onCancel, onNext, items, summary, embedded = false, confirmLoading = false, extraContent } = props;
-	const { currentStep, runModuleAction, refreshViewModel, venueBookingModule, isAgreeDepositPolicy, setIsAgreeDepositPolicy } = useVenueBookingContext();
+	const { currentStep, runModuleAction, refreshViewModel, refreshTimeSlotGrid, venueBookingModule, isAgreeDepositPolicy, setIsAgreeDepositPolicy } = useVenueBookingContext();
 	const engineContext = useEngineContext();
 	const businessUtils = engineContext === null || engineContext === void 0 || (_engineContext$appHel = engineContext.appHelper) === null || _engineContext$appHel === void 0 || (_engineContext$appHel = _engineContext$appHel.utils) === null || _engineContext$appHel === void 0 ? void 0 : _engineContext$appHel.businessUtils;
 	const symbol = String((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.getSymbolic) === null || _engineContext$appHel3 === void 0 ? void 0 : _engineContext$appHel3.call(_engineContext$appHel2)) || "$");
@@ -104,14 +105,14 @@ function Cart(props) {
 	* 调用 OS 模块 removeProductFromOrder 后刷新 viewModel
 	*/
 	const isVenueBookingCartItem = (target) => {
+		var _target$metadata;
 		if (!target || typeof target !== "object") return false;
+		if ((_target$metadata = target.metadata) === null || _target$metadata === void 0 ? void 0 : _target$metadata.venue_booking) return true;
 		if ((target === null || target === void 0 ? void 0 : target.start_date) && (target === null || target === void 0 ? void 0 : target.end_date)) return true;
-		if (String((target === null || target === void 0 ? void 0 : target.identity_key) || "").startsWith("venue:")) return true;
 		return false;
 	};
 	const handleCartChange = function() {
-		var _ref6 = _asyncToGenerator(function* (item, type, sourceItem) {
-			var _ref5, _targetItem$product_i, _targetItem$product_v;
+		var _ref5 = _asyncToGenerator(function* (item, type, sourceItem) {
 			if (type !== "delete") return;
 			const targetItem = sourceItem && typeof sourceItem === "object" ? sourceItem : item;
 			if (currentStep !== "select-venue" && isVenueBookingCartItem(targetItem)) {
@@ -121,20 +122,14 @@ function Cart(props) {
 				});
 				return;
 			}
-			const productId = (_ref5 = (_targetItem$product_i = targetItem === null || targetItem === void 0 ? void 0 : targetItem.product_id) !== null && _targetItem$product_i !== void 0 ? _targetItem$product_i : targetItem === null || targetItem === void 0 ? void 0 : targetItem.id) !== null && _ref5 !== void 0 ? _ref5 : null;
-			const productVariantId = Number((_targetItem$product_v = targetItem === null || targetItem === void 0 ? void 0 : targetItem.product_variant_id) !== null && _targetItem$product_v !== void 0 ? _targetItem$product_v : 0);
-			const identityKey = targetItem === null || targetItem === void 0 ? void 0 : targetItem.identity_key;
-			if (productId === null && Number.isNaN(productVariantId)) return;
-			if (typeof identityKey !== "string" || identityKey.length === 0) {
-				console.error("[venueBooking] removeProductFromOrder skipped: missing identity_key", { item: targetItem });
+			const identity = getVenueBookingProductIdentity(targetItem);
+			if (!identity) {
+				console.error("[venueBooking] removeProductFromOrder skipped: missing product UID", { item: targetItem });
 				return;
 			}
 			try {
-				yield runModuleAction("removeProductFromOrder", {
-					product_id: productId,
-					product_variant_id: Number.isNaN(productVariantId) ? 0 : productVariantId,
-					identity_key: identityKey
-				});
+				yield runModuleAction("removeProductFromOrder", identity);
+				refreshTimeSlotGrid();
 				yield refreshViewModel();
 			} catch (error) {
 				console.error("[venueBooking] removeProductFromOrder failed", {
@@ -144,7 +139,7 @@ function Cart(props) {
 			}
 		});
 		return function handleCartChange(_x, _x2, _x3) {
-			return _ref6.apply(this, arguments);
+			return _ref5.apply(this, arguments);
 		};
 	}();
 	useEffect(() => {

package/es/components/venueBooking/hooks.js

@@ -1,7 +1,9 @@
 import useEngineContext, { usePisellOS } from "../../hooks/useEngineContext.js";
+import { _objectSpread2 } from "../../_virtual/_@oxc-project_runtime@0.122.0/helpers/objectSpread2.js";
 import { _asyncToGenerator } from "../../_virtual/_@oxc-project_runtime@0.122.0/helpers/asyncToGenerator.js";
 import useSalesUserLogin from "../../hooks/useSalesUserLogin.js";
 import { toShoppingCartProducts } from "../scanOrder/utils/toShoppingCartProducts.js";
+import { getVenueBookingProductUid } from "./utils/orderProductIdentity.js";
 import { useRef } from "react";
 //#region src/components/venueBooking/hooks.ts
 /**
@@ -199,12 +201,22 @@ function createVenueBookingViewModel(_x10) {
 function _createVenueBookingViewModel() {
 	_createVenueBookingViewModel = _asyncToGenerator(function* (module) {
 		const summaryByGetter = typeof (module === null || module === void 0 ? void 0 : module.getSummary) === "function" ? yield module.getSummary() : null;
-		const orderProducts = callModuleGetter(module, "getOrderProducts", []);
+		const rawOrderProducts = callModuleGetter(module, "getOrderProducts", []);
+		const orderProducts = Array.isArray(rawOrderProducts) ? rawOrderProducts : [];
 		const tempOrder = callModuleGetter(module, "getTempOrder", null);
-		const amountSymbol = (tempOrder === null || tempOrder === void 0 ? void 0 : tempOrder.currency_symbol) || "$";
 		const cartItems = toShoppingCartProducts({
-			orderProducts: Array.isArray(orderProducts) ? orderProducts : [],
-			amountSymbol
+			orderProducts,
+			amountSymbol: (tempOrder === null || tempOrder === void 0 ? void 0 : tempOrder.currency_symbol) || "$"
+		}).map((item, index) => {
+			const product = orderProducts[index];
+			const uid = getVenueBookingProductUid(product);
+			return _objectSpread2(_objectSpread2({}, item), {}, {
+				metadata: product.metadata,
+				product_sku: product.product_sku,
+				unique_identification_number: uid,
+				_id: uid !== null && uid !== void 0 ? uid : item._id,
+				rowKey: uid !== null && uid !== void 0 ? uid : item.rowKey
+			});
 		});
 		const summary = (summaryByGetter && typeof summaryByGetter === "object" ? summaryByGetter : null) || (tempOrder === null || tempOrder === void 0 ? void 0 : tempOrder.summary) || {};
 		return {

package/es/components/venueBooking/utils/orderProductIdentity.js

@@ -0,0 +1,15 @@
+import { pickIdentity } from "../../../plus/salesSdk/utils/identity.js";
+//#region src/components/venueBooking/utils/orderProductIdentity.ts
+/** VenueBooking 删改必须定位具体订单行，不能退回只按商品/SKU 匹配。 */
+function getVenueBookingProductIdentity(line) {
+	if (!line || typeof line !== "object") return null;
+	const identity = pickIdentity(line);
+	if (typeof identity.unique_identification_number !== "string" || identity.unique_identification_number.length === 0) return null;
+	return identity;
+}
+function getVenueBookingProductUid(line) {
+	var _getVenueBookingProdu;
+	return (_getVenueBookingProdu = getVenueBookingProductIdentity(line)) === null || _getVenueBookingProdu === void 0 ? void 0 : _getVenueBookingProdu.unique_identification_number;
+}
+//#endregion
+export { getVenueBookingProductIdentity, getVenueBookingProductUid };

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/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/venueBooking/components/Addons/index.js

@@ -4,6 +4,7 @@ const require_objectSpread2 = require("../../../../_virtual/_@oxc-project_runtim
 const require_asyncToGenerator = require("../../../../_virtual/_@oxc-project_runtime@0.122.0/helpers/asyncToGenerator.js");
 const require_index = require("../../../../plus/productSelect/index.js");
 const require_transformProductDetail = require("../../../scanOrder/utils/transformProductDetail.js");
+const require_orderProductIdentity = require("../../utils/orderProductIdentity.js");
 const require_context = require("../../context.js");
 let react = require("react");
 react = require_runtime.__toESM(react);
@@ -22,6 +23,10 @@ function Addons() {
 	const { utils } = require_useEngineContext.default().appHelper || {};
 	const { runModuleAction, refreshViewModel, viewModel, goToStep } = require_context.useVenueBookingContext();
 	const productList = viewModel.addonProductList || [];
+	const addonCartItems = (Array.isArray(viewModel.cartItems) ? viewModel.cartItems : []).filter((cartItem) => {
+		var _cartItem$metadata;
+		return !(cartItem === null || cartItem === void 0 || (_cartItem$metadata = cartItem.metadata) === null || _cartItem$metadata === void 0 ? void 0 : _cartItem$metadata.venue_booking);
+	});
 	const scrollRef = (0, react.useRef)(null);
 	const isMobileView = (0, _pisell_utils.isMobile)();
 	const maxHeight = window.innerHeight - 100;
@@ -70,20 +75,15 @@ function Addons() {
 	}();
 	const removeOrderProduct = function() {
 		var _ref3 = require_asyncToGenerator._asyncToGenerator(function* (params) {
-			const { product_id, product_variant_id, identity_key, sourceData } = params;
+			const { identity, sourceData } = params;
 			try {
-				yield runModuleAction("removeProductFromOrder", require_objectSpread2._objectSpread2({
-					product_id,
-					product_variant_id
-				}, identity_key ? { identity_key } : {}));
+				yield runModuleAction("removeProductFromOrder", identity);
 				yield refreshViewModel();
 			} catch (error) {
 				console.error("[venueBooking] removeProductFromOrder failed", {
 					error,
 					sourceData,
-					product_id,
-					product_variant_id,
-					identity_key
+					identity
 				});
 			}
 		});
@@ -93,21 +93,16 @@ function Addons() {
 	}();
 	const updateOrderProduct = function() {
 		var _ref4 = require_asyncToGenerator._asyncToGenerator(function* (params) {
-			const { product_id, product_variant_id, identity_key, updates, sourceData } = params;
+			const { identity, num, sourceData } = params;
 			try {
-				yield runModuleAction("updateProductInOrder", require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({
-					product_id,
-					product_variant_id
-				}, identity_key ? { identity_key } : {}), {}, { updates }));
+				yield runModuleAction("updateOrderProduct", require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, identity), {}, { updates: { num } }));
 				yield refreshViewModel();
 			} catch (error) {
-				console.error("[venueBooking] updateProductInOrder failed", {
+				console.error("[venueBooking] updateOrderProduct failed", {
 					error,
 					sourceData,
-					product_id,
-					product_variant_id,
-					identity_key,
-					updates
+					identity,
+					num
 				});
 			}
 		});
@@ -125,7 +120,7 @@ function Addons() {
 		var _ref7 = require_asyncToGenerator._asyncToGenerator(function* (item, clickType, meta) {
 			const sourceItem = (meta === null || meta === void 0 ? void 0 : meta.product) || item;
 			if ((meta === null || meta === void 0 ? void 0 : meta.intent) === "quantity") {
-				var _item$option, _item$bundle, _item$price, _item$product_id, _ref5, _meta$quantity, _orderProduct$product, _orderProduct$product4;
+				var _item$option, _item$bundle, _item$price, _item$product_id, _ref5, _meta$quantity, _orderProduct$product;
 				const quantityData = require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, item), {}, {
 					quantity: item === null || item === void 0 ? void 0 : item.num,
 					option: (_item$option = item === null || item === void 0 ? void 0 : item.option) !== null && _item$option !== void 0 ? _item$option : item === null || item === void 0 ? void 0 : item.product_option_item,
@@ -152,17 +147,36 @@ function Addons() {
 					return;
 				}
 				const normalizedQuantity = Number.isNaN(nextQuantity) ? 0 : Math.max(0, Math.floor(nextQuantity));
-				const existedCartItem = (Array.isArray(viewModel === null || viewModel === void 0 ? void 0 : viewModel.cartItems) ? viewModel.cartItems : []).find((cartItem) => {
-					var _cartItem$product_id, _orderProduct$product2, _cartItem$product_var;
-					return String((_cartItem$product_id = cartItem === null || cartItem === void 0 ? void 0 : cartItem.product_id) !== null && _cartItem$product_id !== void 0 ? _cartItem$product_id : null) === String((_orderProduct$product2 = orderProduct === null || orderProduct === void 0 ? void 0 : orderProduct.product_id) !== null && _orderProduct$product2 !== void 0 ? _orderProduct$product2 : null) && Number((_cartItem$product_var = cartItem === null || cartItem === void 0 ? void 0 : cartItem.product_variant_id) !== null && _cartItem$product_var !== void 0 ? _cartItem$product_var : 0) === productVariantId;
+				const productCartItems = addonCartItems.filter((cartItem) => {
+					var _cartItem$product_id, _orderProduct$product2;
+					return String((_cartItem$product_id = cartItem === null || cartItem === void 0 ? void 0 : cartItem.product_id) !== null && _cartItem$product_id !== void 0 ? _cartItem$product_id : null) === String((_orderProduct$product2 = orderProduct === null || orderProduct === void 0 ? void 0 : orderProduct.product_id) !== null && _orderProduct$product2 !== void 0 ? _orderProduct$product2 : null);
+				});
+				const matchedCartItems = productCartItems.filter((cartItem) => {
+					var _cartItem$product_var;
+					return Number((_cartItem$product_var = cartItem === null || cartItem === void 0 ? void 0 : cartItem.product_variant_id) !== null && _cartItem$product_var !== void 0 ? _cartItem$product_var : 0) === productVariantId;
 				});
-				const existedIdentityKey = typeof (existedCartItem === null || existedCartItem === void 0 ? void 0 : existedCartItem.identity_key) === "string" && existedCartItem.identity_key.length > 0 ? existedCartItem.identity_key : void 0;
+				const eventUid = require_orderProductIdentity.getVenueBookingProductUid(item);
+				const uidMatchedItems = eventUid ? matchedCartItems.filter((cartItem) => require_orderProductIdentity.getVenueBookingProductUid(cartItem) === eventUid) : matchedCartItems;
+				if (productCartItems.length > 1 || eventUid && uidMatchedItems.length !== 1) {
+					console.warn("[venueBooking] quantity action skipped: ambiguous or stale order line", {
+						mode: eventUid ? "uid" : "sku",
+						eventUid,
+						product_id: orderProduct.product_id,
+						product_variant_id: productVariantId,
+						matchedLineCount: productCartItems.length
+					});
+					return;
+				}
+				const existedCartItem = uidMatchedItems[0];
+				const existedIdentity = existedCartItem ? require_orderProductIdentity.getVenueBookingProductIdentity(existedCartItem) : null;
+				if (existedCartItem && !existedIdentity) {
+					console.warn("[venueBooking] quantity action skipped: missing order line UID", { item: existedCartItem });
+					return;
+				}
 				if (normalizedQuantity <= 0) {
-					var _orderProduct$product3;
+					if (!existedIdentity) return;
 					yield removeOrderProduct({
-						product_id: (_orderProduct$product3 = orderProduct === null || orderProduct === void 0 ? void 0 : orderProduct.product_id) !== null && _orderProduct$product3 !== void 0 ? _orderProduct$product3 : null,
-						product_variant_id: productVariantId,
-						identity_key: existedIdentityKey,
+						identity: existedIdentity,
 						sourceData: quantityData
 					});
 					return;
@@ -174,14 +188,10 @@ function Addons() {
 					});
 					return;
 				}
+				if (!existedIdentity) return;
 				yield updateOrderProduct({
-					product_id: (_orderProduct$product4 = orderProduct === null || orderProduct === void 0 ? void 0 : orderProduct.product_id) !== null && _orderProduct$product4 !== void 0 ? _orderProduct$product4 : null,
-					product_variant_id: productVariantId,
-					identity_key: existedIdentityKey,
-					updates: {
-						num: normalizedQuantity,
-						_origin: orderProduct === null || orderProduct === void 0 ? void 0 : orderProduct._origin
-					},
+					identity: existedIdentity,
+					num: normalizedQuantity,
 					sourceData: quantityData
 				});
 			} else utils === null || utils === void 0 || utils.action({
@@ -239,7 +249,7 @@ function Addons() {
 		customScrollParent: ((_scrollRef$current = scrollRef.current) === null || _scrollRef$current === void 0 ? void 0 : _scrollRef$current.getScrollContainer()) || "",
 		hideCategoryWhenOne: true,
 		version: "v2",
-		value: (viewModel === null || viewModel === void 0 ? void 0 : viewModel.cartItems) || [],
+		value: addonCartItems,
 		productListSetting: {
 			imgWidth: 80,
 			imgHeight: 80

package/lib/components/venueBooking/components/Cart/index.js

@@ -4,6 +4,7 @@ const require_objectSpread2 = require("../../../../_virtual/_@oxc-project_runtim
 const require_asyncToGenerator = require("../../../../_virtual/_@oxc-project_runtime@0.122.0/helpers/asyncToGenerator.js");
 const require_index = require("../../../shoppingCart/index.js");
 const require_index$1 = require("../../../subTotal/index.js");
+const require_orderProductIdentity = require("../../utils/orderProductIdentity.js");
 const require_context = require("../../context.js");
 const require_index$2 = require("../Voucher/index.js");
 const require_index$3 = require("../Deposit/index.js");
@@ -22,7 +23,7 @@ require("./index.less");
 function Cart(props) {
 	var _engineContext$appHel, _engineContext$appHel2, _engineContext$appHel3, _engineContext$engine, _businessUtils$getApp, _businessUtils$getApp2, _ref, _ref2, _ref3, _summary$total_amount, _summary$deposit3;
 	const { open, onCancel, onNext, items, summary, embedded = false, confirmLoading = false, extraContent } = props;
-	const { currentStep, runModuleAction, refreshViewModel, venueBookingModule, isAgreeDepositPolicy, setIsAgreeDepositPolicy } = require_context.useVenueBookingContext();
+	const { currentStep, runModuleAction, refreshViewModel, refreshTimeSlotGrid, venueBookingModule, isAgreeDepositPolicy, setIsAgreeDepositPolicy } = require_context.useVenueBookingContext();
 	const engineContext = require_useEngineContext.default();
 	const businessUtils = engineContext === null || engineContext === void 0 || (_engineContext$appHel = engineContext.appHelper) === null || _engineContext$appHel === void 0 || (_engineContext$appHel = _engineContext$appHel.utils) === null || _engineContext$appHel === void 0 ? void 0 : _engineContext$appHel.businessUtils;
 	const symbol = String((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.getSymbolic) === null || _engineContext$appHel3 === void 0 ? void 0 : _engineContext$appHel3.call(_engineContext$appHel2)) || "$");
@@ -106,14 +107,14 @@ function Cart(props) {
 	* 调用 OS 模块 removeProductFromOrder 后刷新 viewModel
 	*/
 	const isVenueBookingCartItem = (target) => {
+		var _target$metadata;
 		if (!target || typeof target !== "object") return false;
+		if ((_target$metadata = target.metadata) === null || _target$metadata === void 0 ? void 0 : _target$metadata.venue_booking) return true;
 		if ((target === null || target === void 0 ? void 0 : target.start_date) && (target === null || target === void 0 ? void 0 : target.end_date)) return true;
-		if (String((target === null || target === void 0 ? void 0 : target.identity_key) || "").startsWith("venue:")) return true;
 		return false;
 	};
 	const handleCartChange = function() {
-		var _ref6 = require_asyncToGenerator._asyncToGenerator(function* (item, type, sourceItem) {
-			var _ref5, _targetItem$product_i, _targetItem$product_v;
+		var _ref5 = require_asyncToGenerator._asyncToGenerator(function* (item, type, sourceItem) {
 			if (type !== "delete") return;
 			const targetItem = sourceItem && typeof sourceItem === "object" ? sourceItem : item;
 			if (currentStep !== "select-venue" && isVenueBookingCartItem(targetItem)) {
@@ -123,20 +124,14 @@ function Cart(props) {
 				});
 				return;
 			}
-			const productId = (_ref5 = (_targetItem$product_i = targetItem === null || targetItem === void 0 ? void 0 : targetItem.product_id) !== null && _targetItem$product_i !== void 0 ? _targetItem$product_i : targetItem === null || targetItem === void 0 ? void 0 : targetItem.id) !== null && _ref5 !== void 0 ? _ref5 : null;
-			const productVariantId = Number((_targetItem$product_v = targetItem === null || targetItem === void 0 ? void 0 : targetItem.product_variant_id) !== null && _targetItem$product_v !== void 0 ? _targetItem$product_v : 0);
-			const identityKey = targetItem === null || targetItem === void 0 ? void 0 : targetItem.identity_key;
-			if (productId === null && Number.isNaN(productVariantId)) return;
-			if (typeof identityKey !== "string" || identityKey.length === 0) {
-				console.error("[venueBooking] removeProductFromOrder skipped: missing identity_key", { item: targetItem });
+			const identity = require_orderProductIdentity.getVenueBookingProductIdentity(targetItem);
+			if (!identity) {
+				console.error("[venueBooking] removeProductFromOrder skipped: missing product UID", { item: targetItem });
 				return;
 			}
 			try {
-				yield runModuleAction("removeProductFromOrder", {
-					product_id: productId,
-					product_variant_id: Number.isNaN(productVariantId) ? 0 : productVariantId,
-					identity_key: identityKey
-				});
+				yield runModuleAction("removeProductFromOrder", identity);
+				refreshTimeSlotGrid();
 				yield refreshViewModel();
 			} catch (error) {
 				console.error("[venueBooking] removeProductFromOrder failed", {
@@ -146,7 +141,7 @@ function Cart(props) {
 			}
 		});
 		return function handleCartChange(_x, _x2, _x3) {
-			return _ref6.apply(this, arguments);
+			return _ref5.apply(this, arguments);
 		};
 	}();
 	(0, react.useEffect)(() => {

package/lib/components/venueBooking/hooks.js

@@ -1,8 +1,10 @@
 require("../../_virtual/_rolldown/runtime.js");
 const require_useEngineContext = require("../../hooks/useEngineContext.js");
+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_useSalesUserLogin = require("../../hooks/useSalesUserLogin.js");
 const require_toShoppingCartProducts = require("../scanOrder/utils/toShoppingCartProducts.js");
+const require_orderProductIdentity = require("./utils/orderProductIdentity.js");
 let react = require("react");
 //#region src/components/venueBooking/hooks.ts
 /**
@@ -200,12 +202,22 @@ function createVenueBookingViewModel(_x10) {
 function _createVenueBookingViewModel() {
 	_createVenueBookingViewModel = require_asyncToGenerator._asyncToGenerator(function* (module) {
 		const summaryByGetter = typeof (module === null || module === void 0 ? void 0 : module.getSummary) === "function" ? yield module.getSummary() : null;
-		const orderProducts = callModuleGetter(module, "getOrderProducts", []);
+		const rawOrderProducts = callModuleGetter(module, "getOrderProducts", []);
+		const orderProducts = Array.isArray(rawOrderProducts) ? rawOrderProducts : [];
 		const tempOrder = callModuleGetter(module, "getTempOrder", null);
-		const amountSymbol = (tempOrder === null || tempOrder === void 0 ? void 0 : tempOrder.currency_symbol) || "$";
 		const cartItems = require_toShoppingCartProducts.toShoppingCartProducts({
-			orderProducts: Array.isArray(orderProducts) ? orderProducts : [],
-			amountSymbol
+			orderProducts,
+			amountSymbol: (tempOrder === null || tempOrder === void 0 ? void 0 : tempOrder.currency_symbol) || "$"
+		}).map((item, index) => {
+			const product = orderProducts[index];
+			const uid = require_orderProductIdentity.getVenueBookingProductUid(product);
+			return require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, item), {}, {
+				metadata: product.metadata,
+				product_sku: product.product_sku,
+				unique_identification_number: uid,
+				_id: uid !== null && uid !== void 0 ? uid : item._id,
+				rowKey: uid !== null && uid !== void 0 ? uid : item.rowKey
+			});
 		});
 		const summary = (summaryByGetter && typeof summaryByGetter === "object" ? summaryByGetter : null) || (tempOrder === null || tempOrder === void 0 ? void 0 : tempOrder.summary) || {};
 		return {

package/lib/components/venueBooking/utils/orderProductIdentity.js

@@ -0,0 +1,16 @@
+const require_identity = require("../../../plus/salesSdk/utils/identity.js");
+//#region src/components/venueBooking/utils/orderProductIdentity.ts
+/** VenueBooking 删改必须定位具体订单行，不能退回只按商品/SKU 匹配。 */
+function getVenueBookingProductIdentity(line) {
+	if (!line || typeof line !== "object") return null;
+	const identity = require_identity.pickIdentity(line);
+	if (typeof identity.unique_identification_number !== "string" || identity.unique_identification_number.length === 0) return null;
+	return identity;
+}
+function getVenueBookingProductUid(line) {
+	var _getVenueBookingProdu;
+	return (_getVenueBookingProdu = getVenueBookingProductIdentity(line)) === null || _getVenueBookingProdu === void 0 ? void 0 : _getVenueBookingProdu.unique_identification_number;
+}
+//#endregion
+exports.getVenueBookingProductIdentity = getVenueBookingProductIdentity;
+exports.getVenueBookingProductUid = getVenueBookingProductUid;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.12.267",
+  "version": "6.12.268",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -72,10 +72,10 @@
     "styled-components": "^6.0.0-rc.3",
     "use-sync-external-store": "^1.6.0",
     "@pisell/pi-payment-sdk": "0.0.3",
-    "@pisell/materials": "6.12.74",
-    "@pisell/date-picker": "3.0.12",
     "@pisell/icon": "0.0.11",
-    "@pisell/utils": "3.0.7"
+    "@pisell/utils": "3.0.7",
+    "@pisell/materials": "6.12.74",
+    "@pisell/date-picker": "3.0.12"
   },
   "peerDependencies": {
     "react": "^18.0.0",