@pisell/private-materials 6.12.160 → 6.12.162

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

@@ -29,6 +29,7 @@ const require_bookingDate = require("../utils/bookingDate.js");
 const require_assignHolderToCartLine = require("../utils/assignHolderToCartLine.js");
 const require_holderSubmitValidation = require("../utils/holderSubmitValidation.js");
 const require_removeOrderProducts = require("../utils/removeOrderProducts.js");
+const require_resolvePreviousService = require("../utils/resolvePreviousService.js");
 const require_locales = require("../../../components/ticketBooking/locales.js");
 const require_editCartLine = require("../utils/editCartLine.js");
 const require_syncBookingLineQuantityByRows = require("../utils/syncBookingLineQuantityByRows.js");
@@ -796,6 +797,7 @@ const SalesSdkCartProvider = ({ children, shouldMergeProductLines, mergeBookingL
 		const customerId = require_buildBookingEditDrawerState.resolveAddFlowCustomerId(liveTempOrder, void 0, bookingTicket === null || bookingTicket === void 0 || (_bookingTicket$getOrd2 = bookingTicket.getOrderCustomerSnapshot) === null || _bookingTicket$getOrd2 === void 0 || (_bookingTicket$getOrd2 = _bookingTicket$getOrd2.call(bookingTicket)) === null || _bookingTicket$getOrd2 === void 0 ? void 0 : _bookingTicket$getOrd2.id);
 		return {
 			bookingConfig: (_bookingTicket$getBoo5 = bookingTicket === null || bookingTicket === void 0 || (_bookingTicket$getBoo6 = bookingTicket.getBookingConfig) === null || _bookingTicket$getBoo6 === void 0 ? void 0 : _bookingTicket$getBoo6.call(bookingTicket)) !== null && _bookingTicket$getBoo5 !== void 0 ? _bookingTicket$getBoo5 : null,
+			previousService: require_resolvePreviousService.resolvePreviousService(liveTempOrder),
 			customerId,
 			tempOrder: liveTempOrder,
 			isFranchisee: Boolean(bookingTicket === null || bookingTicket === void 0 || (_bookingTicket$getOth = bookingTicket.getOtherParams) === null || _bookingTicket$getOth === void 0 || (_bookingTicket$getOth = _bookingTicket$getOth.call(bookingTicket)) === null || _bookingTicket$getOth === void 0 ? void 0 : _bookingTicket$getOth.isFranchisee),
@@ -858,7 +860,7 @@ const SalesSdkCartProvider = ({ children, shouldMergeProductLines, mergeBookingL
 	});
 	const addProductToOrderFromCacheImpl = (0, ahooks.useMemoizedFn)(function() {
 		var _ref9 = require_asyncToGenerator._asyncToGenerator(function* (item, cacheItem, options) {
-			var _flowCtx$date, _ref8, _cacheItemForTransfor, _cacheItemForTransfor2;
+			var _flowCtx$date, _flowCtx$bookingConfi, _ref8, _cacheItemForTransfor, _cacheItemForTransfor2;
 			if (!bookingTicket) throw new Error("[SalesSdk] Cart: bookingTicket 未初始化");
 			if (typeof bookingTicket.transformDetailToProductAndBooking !== "function") throw new Error("[SalesSdk] Cart: bookingTicket.transformDetailToProductAndBooking 不可用");
 			const flowCtx = getAddFlowContext();
@@ -868,7 +870,9 @@ const SalesSdkCartProvider = ({ children, shouldMergeProductLines, mergeBookingL
 				cacheItem: cacheItemForTransform,
 				options: {
 					quantity: options === null || options === void 0 ? void 0 : options.quantity,
-					date: (_flowCtx$date = flowCtx.date) !== null && _flowCtx$date !== void 0 ? _flowCtx$date : void 0
+					date: (_flowCtx$date = flowCtx.date) !== null && _flowCtx$date !== void 0 ? _flowCtx$date : void 0,
+					bookingConfig: (_flowCtx$bookingConfi = flowCtx.bookingConfig) !== null && _flowCtx$bookingConfi !== void 0 ? _flowCtx$bookingConfi : void 0,
+					previousService: flowCtx.previousService
 				}
 			});
 			orderLine.note = (_ref8 = (_cacheItemForTransfor = cacheItemForTransform === null || cacheItemForTransform === void 0 || (_cacheItemForTransfor2 = cacheItemForTransform._extend) === null || _cacheItemForTransfor2 === void 0 ? void 0 : _cacheItemForTransfor2.note) !== null && _cacheItemForTransfor !== void 0 ? _cacheItemForTransfor : orderLine.note) !== null && _ref8 !== void 0 ? _ref8 : "";
@@ -920,7 +924,7 @@ const SalesSdkCartProvider = ({ children, shouldMergeProductLines, mergeBookingL
 	*/
 	const addProduct = (0, ahooks.useMemoizedFn)(function() {
 		var _ref13 = require_asyncToGenerator._asyncToGenerator(function* (product, options) {
-			var _flowCtx$date2;
+			var _flowCtx$date2, _flowCtx$bookingConfi2;
 			if (!bookingTicket) throw new Error("[SalesSdk] Cart: bookingTicket 未初始化");
 			if (typeof bookingTicket.decideAddProduct !== "function") throw new Error("[SalesSdk] Cart: bookingTicket.decideAddProduct 不可用，请升级 pisellos");
 			const flowCtx = getAddFlowContext();
@@ -969,7 +973,9 @@ const SalesSdkCartProvider = ({ children, shouldMergeProductLines, mergeBookingL
 				type: (options === null || options === void 0 ? void 0 : options.type) || "select",
 				quantity: options === null || options === void 0 ? void 0 : options.quantity,
 				date: (_flowCtx$date2 = flowCtx.date) !== null && _flowCtx$date2 !== void 0 ? _flowCtx$date2 : void 0,
-				customerId: flowCtx.customerId
+				customerId: flowCtx.customerId,
+				bookingConfig: (_flowCtx$bookingConfi2 = flowCtx.bookingConfig) !== null && _flowCtx$bookingConfi2 !== void 0 ? _flowCtx$bookingConfi2 : void 0,
+				previousService: flowCtx.previousService
 			});
 			if (decision.action === "reloadCatalog") {
 				yield reloadProductCatalogForStaleSession();
@@ -989,14 +995,16 @@ const SalesSdkCartProvider = ({ children, shouldMergeProductLines, mergeBookingL
 				};
 			}
 			if (decision.action === "requiresDetail") {
-				var _decision$payload, _bookingTicket$buildR, _flowCtx$date4;
+				var _decision$payload, _bookingTicket$buildR, _flowCtx$date4, _flowCtx$bookingConfi3;
 				return {
 					status: "requiresDetail",
 					payload: (_decision$payload = decision.payload) !== null && _decision$payload !== void 0 ? _decision$payload : (_bookingTicket$buildR = bookingTicket.buildRequiresDetailPayload) === null || _bookingTicket$buildR === void 0 ? void 0 : _bookingTicket$buildR.call(bookingTicket, product, {
 						type: (options === null || options === void 0 ? void 0 : options.type) || "select",
 						quantity: options === null || options === void 0 ? void 0 : options.quantity,
 						date: (_flowCtx$date4 = flowCtx.date) !== null && _flowCtx$date4 !== void 0 ? _flowCtx$date4 : void 0,
-						customerId: flowCtx.customerId
+						customerId: flowCtx.customerId,
+						bookingConfig: (_flowCtx$bookingConfi3 = flowCtx.bookingConfig) !== null && _flowCtx$bookingConfi3 !== void 0 ? _flowCtx$bookingConfi3 : void 0,
+						previousService: flowCtx.previousService
 					})
 				};
 			}
@@ -1022,7 +1030,7 @@ const SalesSdkCartProvider = ({ children, shouldMergeProductLines, mergeBookingL
 	*/
 	const confirmDetail = (0, ahooks.useMemoizedFn)(function() {
 		var _ref15 = require_asyncToGenerator._asyncToGenerator(function* (input) {
-			var _flowCtx$date7, _input$options, _input$options3;
+			var _flowCtx$date7, _flowCtx$bookingConfi4, _input$options, _input$options3;
 			if (!bookingTicket) throw new Error("[SalesSdk] Cart: bookingTicket 未初始化");
 			if (typeof bookingTicket.transformDetailToProductAndBooking !== "function") throw new Error("[SalesSdk] Cart: bookingTicket.transformDetailToProductAndBooking 不可用");
 			const confirmQuantity = require_resolveConfirmDetailQuantity.resolveConfirmDetailQuantity(input);
@@ -1033,7 +1041,9 @@ const SalesSdkCartProvider = ({ children, shouldMergeProductLines, mergeBookingL
 				options: {
 					quantity: confirmQuantity,
 					date: (_flowCtx$date7 = flowCtx.date) !== null && _flowCtx$date7 !== void 0 ? _flowCtx$date7 : void 0,
-					customerId: flowCtx.customerId
+					customerId: flowCtx.customerId,
+					bookingConfig: (_flowCtx$bookingConfi4 = flowCtx.bookingConfig) !== null && _flowCtx$bookingConfi4 !== void 0 ? _flowCtx$bookingConfi4 : void 0,
+					previousService: flowCtx.previousService
 				}
 			});
 			const catalogItem = input.item;
@@ -1041,12 +1051,13 @@ const SalesSdkCartProvider = ({ children, shouldMergeProductLines, mergeBookingL
 			if ((_input$options = input.options) === null || _input$options === void 0 ? void 0 : _input$options.multiDayRange) cacheItem = require_patchCacheItemDateRange.patchCacheItemDateRange(cacheItem, input.options.multiDayRange);
 			else cacheItem = require_patchCacheItemDateRange.applyDefaultMultiDayRangeIfNeeded(cacheItem, catalogItem, flowCtx.date);
 			if (typeof bookingTicket.decideAfterDetail === "function") {
-				var _flowCtx$date8, _flowCtx$bookingConfi, _input$options2;
+				var _flowCtx$date8, _flowCtx$bookingConfi5, _input$options2;
 				const decision = bookingTicket.decideAfterDetail(cacheItem, {
 					quantity: confirmQuantity,
 					customerId: flowCtx.customerId,
 					date: (_flowCtx$date8 = flowCtx.date) !== null && _flowCtx$date8 !== void 0 ? _flowCtx$date8 : void 0,
-					bookingConfig: (_flowCtx$bookingConfi = flowCtx.bookingConfig) !== null && _flowCtx$bookingConfi !== void 0 ? _flowCtx$bookingConfi : void 0
+					bookingConfig: (_flowCtx$bookingConfi5 = flowCtx.bookingConfig) !== null && _flowCtx$bookingConfi5 !== void 0 ? _flowCtx$bookingConfi5 : void 0,
+					previousService: flowCtx.previousService
 				});
 				if (decision.action === "requiresBookingEdit") {
 					var _decision$payload5, _ref14, _flowCtx$date9, _decision$payload6, _flowCtx$customerId2, _decision$payload7;
@@ -1165,13 +1176,15 @@ const SalesSdkCartProvider = ({ children, shouldMergeProductLines, mergeBookingL
 			};
 		}(),
 		decideAddProduct: (product, opts) => {
-			var _flowCtx$date11;
+			var _flowCtx$date11, _flowCtx$bookingConfi6;
 			const ticket = bookingTicketRef.current;
 			if (!ticket || typeof ticket.decideAddProduct !== "function") return { action: "requiresDetail" };
 			const flowCtx = getAddFlowContextRef.current();
 			return ticket.decideAddProduct(product, require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, opts), {}, {
 				date: (_flowCtx$date11 = flowCtx.date) !== null && _flowCtx$date11 !== void 0 ? _flowCtx$date11 : void 0,
-				customerId: flowCtx.customerId
+				customerId: flowCtx.customerId,
+				bookingConfig: (_flowCtx$bookingConfi6 = flowCtx.bookingConfig) !== null && _flowCtx$bookingConfi6 !== void 0 ? _flowCtx$bookingConfi6 : void 0,
+				previousService: flowCtx.previousService
 			}));
 		},
 		runAddProductFlow: (product, opts) => runFlowRef.current(product, opts),

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

@@ -151,7 +151,7 @@ function runAfterNextPaint(task) {
 * - 新建态：按 OS persist 开关走 createNew 或 restore → initBookingContext
 * 须位于 SalesSdkSummaryProvider 内，以便 summaryProviderRef 已通过 useImperativeHandle 注入。
 */
-function SalesSdkBootstrap({ solution, autoRestoreOnInit, autoBootstrap, autoInitBookingContext, orderId, preloadedSalesDetail, initBookingContext, prepareModule, prepareCatalog, catalogKey, lifecycleOwner }) {
+function SalesSdkBootstrap({ 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)(() => {
@@ -185,7 +185,7 @@ function SalesSdkBootstrap({ solution, autoRestoreOnInit, autoBootstrap, autoIni
 							}
 						}
 					}
-					if (cancelled || !autoInitBookingContext || solution === "unifiedBookingSales") return;
+					if (cancelled || !autoInitBookingContext) return;
 					const bookingIds = require_buildDefaultLoadProductsParams.collectBookingIdsFromTempOrder((_sales$bookingTicket$2 = (_sales$bookingTicket2 = sales.bookingTicket) === null || _sales$bookingTicket2 === void 0 || (_sales$bookingTicket3 = _sales$bookingTicket2.getTempOrder) === null || _sales$bookingTicket3 === void 0 ? void 0 : _sales$bookingTicket3.call(_sales$bookingTicket2)) !== null && _sales$bookingTicket$2 !== void 0 ? _sales$bookingTicket$2 : null);
 					yield initBookingContext(bookingIds.length ? bookingIds : void 0, { loadResources: !(autoBootstrap && orderId) });
 				} catch (e) {
@@ -212,7 +212,6 @@ function SalesSdkBootstrap({ solution, autoRestoreOnInit, autoBootstrap, autoIni
 		autoRestoreOnInit,
 		autoBootstrap,
 		autoInitBookingContext,
-		solution,
 		orderId,
 		preloadedSalesDetail,
 		initBookingContext,
@@ -651,7 +650,13 @@ const SalesSdkProvider = ({ osKey, solution = "bookingTicket", moduleAccess = "e
 	*/
 	const initBookingContext = (0, ahooks.useMemoizedFn)(function() {
 		var _ref2 = require_asyncToGenerator._asyncToGenerator(function* (bookingIds, options) {
-			if (!(bookingTicket === null || bookingTicket === void 0 ? void 0 : bookingTicket.initBookingContext)) return;
+			if (!bookingTicket) return;
+			if (String((otherParams === null || otherParams === void 0 ? void 0 : otherParams.platform) || "").trim().toLowerCase() === "h5") {
+				var _bookingTicket$loadBo;
+				yield (_bookingTicket$loadBo = bookingTicket.loadBookingConfig) === null || _bookingTicket$loadBo === void 0 ? void 0 : _bookingTicket$loadBo.call(bookingTicket, bookingConfigParams);
+				return;
+			}
+			if (!bookingTicket.initBookingContext) return;
 			yield bookingTicket.initBookingContext(require_buildDefaultLoadProductsParams.buildInitBookingContextParams(bookingConfigParams, {
 				bookingIds,
 				loadResources: options === null || options === void 0 ? void 0 : options.loadResources
@@ -1343,7 +1348,6 @@ const SalesSdkProvider = ({ osKey, solution = "bookingTicket", moduleAccess = "e
 		onPromotionScanComplete: handlePromotionScanComplete,
 		promotionScanSuccessMessageKey: promotionItemIncreaseMessageKey ? void 0 : promotionScanSuccessMessageKey
 	}), /* @__PURE__ */ react.default.createElement(SalesSdkBootstrap, {
-		solution,
 		autoRestoreOnInit,
 		autoBootstrap,
 		autoInitBookingContext,

package/lib/plus/salesSdk/hosts/BookingEditHostRenderer.js

@@ -6,6 +6,7 @@ const require_buildDefaultLoadProductsParams = require("../utils/buildDefaultLoa
 const require_buildBookingEditDrawerState = require("../bookingEditService/buildBookingEditDrawerState.js");
 const require_resolveIsMultiDayProduct = require("../utils/resolveIsMultiDayProduct.js");
 const require_multiDayPriceCache = require("../utils/multiDayPriceCache.js");
+const require_resolvePreviousService = require("../utils/resolvePreviousService.js");
 const require_prepareCacheItemForBookingEdit = require("../bookingEditService/prepareCacheItemForBookingEdit.js");
 const require_useSalesSdk = require("../hooks/useSalesSdk.js");
 const require_useSyncExternalStoreCompat = require("../hooks/useSyncExternalStoreCompat.js");
@@ -20,11 +21,15 @@ let _pisell_utils = require("@pisell/utils");
 /**
 * 将 Host payload 的 cacheItem 补齐展示字段并写入 state。
 */
-function normalizeCacheItemForDrawer(rawItem, bookingTicket, forceOpen) {
+function normalizeCacheItemForDrawer(rawItem, bookingTicket, tempOrder, forceOpen) {
 	let item = rawItem;
 	if (require_multiDayPriceCache.isMultiDayQuotationExpanded(item)) item = require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, item), {}, { new: 0 });
 	if (typeof bookingTicket.getProductExtend === "function") try {
-		item = bookingTicket.getProductExtend(item);
+		var _bookingTicket$getBoo, _bookingTicket$getBoo2;
+		item = bookingTicket.getProductExtend(item, {
+			bookingConfig: (_bookingTicket$getBoo = (_bookingTicket$getBoo2 = bookingTicket.getBookingConfig) === null || _bookingTicket$getBoo2 === void 0 ? void 0 : _bookingTicket$getBoo2.call(bookingTicket)) !== null && _bookingTicket$getBoo !== void 0 ? _bookingTicket$getBoo : void 0,
+			previousService: require_resolvePreviousService.resolvePreviousService(tempOrder)
+		});
 	} catch (e) {
 		console.warn("[SalesSdk] getProductExtend 失败，使用原始 cacheItem", e);
 	}
@@ -81,7 +86,7 @@ const BookingEditHostRenderer = () => {
 			var _ref = require_asyncToGenerator._asyncToGenerator(function* () {
 				yield ensureBookingContextForDrawer(bookingTicket, payload, tempOrder, bookingConfigParams);
 				if (cancelled) return;
-				const item = normalizeCacheItemForDrawer(payload.cacheItem, bookingTicket, payload.forceOpen);
+				const item = normalizeCacheItemForDrawer(payload.cacheItem, bookingTicket, tempOrder, payload.forceOpen);
 				if (item.autoClose && !payload.forceOpen) {
 					bridge.complete(item);
 					return;
@@ -93,7 +98,7 @@ const BookingEditHostRenderer = () => {
 			};
 		})()().catch((err) => {
 			console.warn("[SalesSdk] openBookingEdit 初始化资源上下文失败", err);
-			if (!cancelled) setCacheItem(normalizeCacheItemForDrawer(payload.cacheItem, bookingTicket, payload.forceOpen));
+			if (!cancelled) setCacheItem(normalizeCacheItemForDrawer(payload.cacheItem, bookingTicket, tempOrder, payload.forceOpen));
 		});
 		return () => {
 			cancelled = true;
@@ -179,10 +184,10 @@ const BookingEditHostRenderer = () => {
 		cacheItem === null || cacheItem === void 0 || (_cacheItem$_data = cacheItem._data) === null || _cacheItem$_data === void 0 || (_cacheItem$_data = _cacheItem$_data.resources) === null || _cacheItem$_data === void 0 ? void 0 : _cacheItem$_data.length
 	]);
 	const bookingState = (0, react.useMemo)(() => {
-		var _bookingTicket$getBoo, _bookingTicket$getBoo2, _ref3, _payload$date2, _bookingTicket$getBoo3, _bookingTicket$getTem3, _bookingTicket$getTem4, _bookingTicket$getOrd, _bookingTicket$getOth;
+		var _bookingTicket$getBoo3, _bookingTicket$getBoo4, _ref3, _payload$date2, _bookingTicket$getBoo5, _bookingTicket$getTem3, _bookingTicket$getTem4, _bookingTicket$getOrd, _bookingTicket$getOth;
 		if (!cacheItem) return null;
-		const bookingConfig = (_bookingTicket$getBoo = bookingTicket === null || bookingTicket === void 0 || (_bookingTicket$getBoo2 = bookingTicket.getBookingConfig) === null || _bookingTicket$getBoo2 === void 0 ? void 0 : _bookingTicket$getBoo2.call(bookingTicket)) !== null && _bookingTicket$getBoo !== void 0 ? _bookingTicket$getBoo : null;
-		const date = (_ref3 = (_payload$date2 = payload === null || payload === void 0 ? void 0 : payload.date) !== null && _payload$date2 !== void 0 ? _payload$date2 : bookingTicket === null || bookingTicket === void 0 || (_bookingTicket$getBoo3 = bookingTicket.getBookingDate) === null || _bookingTicket$getBoo3 === void 0 ? void 0 : _bookingTicket$getBoo3.call(bookingTicket)) !== null && _ref3 !== void 0 ? _ref3 : (0, dayjs.default)().format("YYYY-MM-DD");
+		const bookingConfig = (_bookingTicket$getBoo3 = bookingTicket === null || bookingTicket === void 0 || (_bookingTicket$getBoo4 = bookingTicket.getBookingConfig) === null || _bookingTicket$getBoo4 === void 0 ? void 0 : _bookingTicket$getBoo4.call(bookingTicket)) !== null && _bookingTicket$getBoo3 !== void 0 ? _bookingTicket$getBoo3 : null;
+		const date = (_ref3 = (_payload$date2 = payload === null || payload === void 0 ? void 0 : payload.date) !== null && _payload$date2 !== void 0 ? _payload$date2 : bookingTicket === null || bookingTicket === void 0 || (_bookingTicket$getBoo5 = bookingTicket.getBookingDate) === null || _bookingTicket$getBoo5 === void 0 ? void 0 : _bookingTicket$getBoo5.call(bookingTicket)) !== null && _ref3 !== void 0 ? _ref3 : (0, dayjs.default)().format("YYYY-MM-DD");
 		const liveTempOrder = (_bookingTicket$getTem3 = bookingTicket === null || bookingTicket === void 0 || (_bookingTicket$getTem4 = bookingTicket.getTempOrder) === null || _bookingTicket$getTem4 === void 0 ? void 0 : _bookingTicket$getTem4.call(bookingTicket)) !== null && _bookingTicket$getTem3 !== void 0 ? _bookingTicket$getTem3 : tempOrder;
 		return require_buildBookingEditDrawerState.buildBookingEditDrawerState({
 			cacheItem,

package/lib/plus/salesSdk/utils/resolvePreviousService.js

@@ -0,0 +1,30 @@
+const require_runtime = require("../../../_virtual/_rolldown/runtime.js");
+let dayjs = require("dayjs");
+dayjs = require_runtime.__toESM(dayjs);
+//#region src/plus/salesSdk/utils/resolvePreviousService.ts
+/**
+* 取得下一预约计算开始时间时所需的“上一服务”。
+*
+* 对齐 info2：它会过滤自定义/普通商品后，通过 getLastServer 取 service.value[0]。
+* SalesSdk 的 tempOrder.bookings 按加入顺序追加，因此从后向前取最后一条
+* 时间完整的商品预约，转换为 OS BookingCalcContext 所需结构。
+* `parent_id === 0` 是订单级 root booking，不对应商品行，需要跳过；
+* 新建本地预约的 parent_id 可能尚未生成（null/undefined），仍属于有效候选。
+*/
+function resolvePreviousService(tempOrder) {
+	const bookings = Array.isArray(tempOrder === null || tempOrder === void 0 ? void 0 : tempOrder.bookings) ? tempOrder.bookings : [];
+	for (let index = bookings.length - 1; index >= 0; index -= 1) {
+		const booking = bookings[index];
+		if ((booking === null || booking === void 0 ? void 0 : booking.parent_id) != null && Number(booking.parent_id) === 0) continue;
+		if (!(booking === null || booking === void 0 ? void 0 : booking.start_date) || !(booking === null || booking === void 0 ? void 0 : booking.start_time) || !(booking === null || booking === void 0 ? void 0 : booking.end_date) || !(booking === null || booking === void 0 ? void 0 : booking.end_time)) continue;
+		const startDate = (0, dayjs.default)(`${booking.start_date} ${booking.start_time}`);
+		const endDate = (0, dayjs.default)(`${booking.end_date} ${booking.end_time}`);
+		if (!startDate.isValid() || !endDate.isValid()) continue;
+		return { _extend: {
+			startDate,
+			endDate
+		} };
+	}
+}
+//#endregion
+exports.resolvePreviousService = resolvePreviousService;

package/lib/plus/salesSdk/utils/runAddProductFlow.js

@@ -154,10 +154,14 @@ function _runAddProductFlow() {
 				initialHolderIds: (_flowOptions$initialH = flowOptions.initialHolderIds) !== null && _flowOptions$initialH !== void 0 ? _flowOptions$initialH : result.payload.initialHolderIds
 			}));
 			if (!detailResult) return { status: "cancelled" };
-			if (detailResult._committedProducts) return {
-				status: "added",
-				products: detailResult._committedProducts
-			};
+			if (detailResult._committedProducts) {
+				var _flowOptions$onBookin2;
+				yield (_flowOptions$onBookin2 = flowOptions.onBookingSelectionCommitted) === null || _flowOptions$onBookin2 === void 0 ? void 0 : _flowOptions$onBookin2.call(flowOptions);
+				return {
+					status: "added",
+					products: detailResult._committedProducts
+				};
+			}
 			const catalog = (_result$payload$produ = (_result$payload = result.payload) === null || _result$payload === void 0 ? void 0 : _result$payload.productData) !== null && _result$payload$produ !== void 0 ? _result$payload$produ : product;
 			const detailExtend = (_detailResult$detail = detailResult.detail) === null || _detailResult$detail === void 0 ? void 0 : _detailResult$detail._extend;
 			const hasFlowSelectedMultiDayRange = require_resolveIsMultiDayProduct.resolveIsMultiDayProduct(detailResult.detail, catalog, product) && (detailExtend === null || detailExtend === void 0 ? void 0 : detailExtend.start_date) && (detailExtend === null || detailExtend === void 0 ? void 0 : detailExtend.end_date);

package/lib/plus/skuOptionsSelection/components/NormalCard/index.js

@@ -9,7 +9,7 @@ let decimal_js = require("decimal.js");
 decimal_js = require_runtime.__toESM(decimal_js);
 //#region src/plus/skuOptionsSelection/components/NormalCard/index.tsx
 const NormalCard = (props) => {
-	var _props$dataSource;
+	var _props$dataSource2;
 	const { _key: uniqueKey, ruleConfig, _original, disabled, selected } = (props === null || props === void 0 ? void 0 : props.dataSource) || {};
 	const { cover, title, name, product_subtitle, price, price_type, add_price } = _original || {};
 	const symbol = require_useStore.default((s) => s.symbol);
@@ -25,20 +25,25 @@ const NormalCard = (props) => {
 	};
 	const renderNumberSelector = () => {
 		if (!(props === null || props === void 0 ? void 0 : props.numberSelector) || typeof (props === null || props === void 0 ? void 0 : props.numberSelector) !== "object") return null;
-		return react.default.cloneElement(props === null || props === void 0 ? void 0 : props.numberSelector, { onChange: (v) => {
-			var _props$actions;
+		return react.default.cloneElement(props === null || props === void 0 ? void 0 : props.numberSelector, { onChange: (v, meta) => {
+			var _props$dataSource, _props$actions;
+			const itemMin = Math.max(1, Number((ruleConfig === null || ruleConfig === void 0 ? void 0 : ruleConfig.min) || 0));
+			const currentQuantity = Number((props === null || props === void 0 || (_props$dataSource = props.dataSource) === null || _props$dataSource === void 0 ? void 0 : _props$dataSource.quantity) || 0);
+			let nextQuantity = v;
+			if ((meta === null || meta === void 0 ? void 0 : meta.action) === "increase" && currentQuantity <= 0) nextQuantity = itemMin;
+			else if ((meta === null || meta === void 0 ? void 0 : meta.action) === "decrease" && itemMin > 1 && currentQuantity === itemMin && v < itemMin) nextQuantity = 0;
 			const _price = add_price !== void 0 && add_price !== null ? add_price : price;
 			const priceType = price_type === "markdown" ? -1 : 1;
-			const totalPrice = new decimal_js.default(_price).times(new decimal_js.default(v)).times(priceType).toNumber();
+			const totalPrice = new decimal_js.default(_price).times(new decimal_js.default(nextQuantity)).times(priceType).toNumber();
 			const newOriginal = require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, _original), {}, {
-				quantity: v,
-				num: v,
+				quantity: nextQuantity,
+				num: nextQuantity,
 				price: _price,
 				original_price: _price,
 				original_total: _price
 			});
 			props === null || props === void 0 || (_props$actions = props.actions) === null || _props$actions === void 0 || _props$actions.update(uniqueKey, {
-				quantity: v,
+				quantity: nextQuantity,
 				data: newOriginal,
 				totalPrice
 			});
@@ -65,17 +70,18 @@ const NormalCard = (props) => {
 			var _props$actions3;
 			const _price = add_price !== void 0 && add_price !== null ? add_price : price;
 			const priceType = price_type === "markdown" ? -1 : 1;
+			const initialQuantity = Math.max(1, Number((ruleConfig === null || ruleConfig === void 0 ? void 0 : ruleConfig.min) || 0));
 			const newOriginal = require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, _original), {}, {
-				quantity: 1,
-				num: 1,
+				quantity: initialQuantity,
+				num: initialQuantity,
 				price: _price,
 				original_price: _price,
 				original_total: _price
 			});
 			props === null || props === void 0 || (_props$actions3 = props.actions) === null || _props$actions3 === void 0 || _props$actions3.update(uniqueKey, {
-				quantity: 1,
+				quantity: initialQuantity,
 				data: newOriginal,
-				totalPrice: new decimal_js.default(_price).times(priceType).toNumber()
+				totalPrice: new decimal_js.default(_price).times(initialQuantity).times(priceType).toNumber()
 			});
 		}
 	};
@@ -102,7 +108,7 @@ const NormalCard = (props) => {
 		} }))),
 		onClick: handleChange,
 		skuCardConfig,
-		skuDisabled: (props === null || props === void 0 || (_props$dataSource = props.dataSource) === null || _props$dataSource === void 0 || (_props$dataSource = _props$dataSource._extra) === null || _props$dataSource === void 0 ? void 0 : _props$dataSource.disabled) === true
+		skuDisabled: (props === null || props === void 0 || (_props$dataSource2 = props.dataSource) === null || _props$dataSource2 === void 0 || (_props$dataSource2 = _props$dataSource2._extra) === null || _props$dataSource2 === void 0 ? void 0 : _props$dataSource2.disabled) === true
 	});
 };
 //#endregion

package/lib/plus/skuOptionsSelection/docs/skuOptionsSelection.$tab-dev.md

@@ -15,7 +15,7 @@ category: plus
 ## 2. 版本
 
 **当前版本**: `1.0.0`  
-**最后更新**: 2025-11-19
+**最后更新**: 2026-08-12
 
 ## 3. 相关文档
 
@@ -51,6 +51,10 @@ SKUOptionsSelection
 
 ```typescript
 export interface DataSource {
+  /** 商品id */
+  id?: number;
+  /** 生产编码 */
+  production_code?: string;
   /** 单规格组数据 */
   option_group?: Array<OptionGroupItem>;
   /** 组合规格组装后的数据 */
@@ -58,7 +62,17 @@ export interface DataSource {
   /** 组合规格组数据 */
   variant_group?: Array<VariantGroupItem>;
   /** 套餐商品组数据 */
-  bundle_group?: Array<BundleItem>;
+  bundle_group?: Array<BundleGroupItem>;
+}
+
+export interface OptionGroupMetadata {
+  advanced_settings_enabled?: 0 | 1;
+  option_types_config?: {
+    min?: number;
+    max?: number;
+    [key: string]: unknown;
+  };
+  [key: string]: unknown;
 }
 
 /**
@@ -88,6 +102,8 @@ export interface OptionGroupItem {
   max_quantity?: number;
   /** 最小选择数量 */
   min_quantity?: number;
+  /** 高级设置元数据 */
+  metadata?: OptionGroupMetadata;
   /** 单规格组名称 */
   name?: string;
   /** 单规格组下规格数据 */
@@ -133,6 +149,8 @@ export interface OptionItem {
   is_enabled?: 0 | 1;
   /** 最大选择数量 */
   max_quantity?: number;
+  /** 最小选择数量 */
+  min_quantity?: number;
   /** 规格名称 */
   name?: string;
   /** 规格组id */
@@ -141,6 +159,8 @@ export interface OptionItem {
   original_price?: string;
   /** 商品id */
   product_id?: number;
+  /** 生产编码 */
+  production_code?: string;
   /** 店铺id */
   shop_id?: number;
   /** 排序 */
@@ -268,6 +288,8 @@ export interface VariantProductItem {
   price?: string;
   /** 商品id */
   product_id?: number;
+  /** 生产编码 */
+  production_code?: string;
   /** 折扣类型 */
   rebate_type?: string;
   /** 折扣值 */
@@ -350,6 +372,8 @@ export interface BundleItem {
   price_type_ext?: '' | 'product_price';
   /** 商品id */
   product_id?: number;
+  /** 生产编码 */
+  production_code?: string;
   /** 商品价格 */
   product_price?: string;
   /** 商品副标题 */
@@ -370,6 +394,8 @@ export interface SkuValue {
   product_variant_id: number;
   /** 多规格商品选项字符串 */
   product_option_string?: string;
+  /** 当前商品或组合规格商品的生产编码 */
+  production_code?: string;
   /** 套餐商品组数据 */
   bundle: Array<any>;
   /** 单规格组数据 */
@@ -666,6 +692,44 @@ const App = () => {
 />
 ```
 
+### 6.7 Option 高级限制与 Production Code
+
+多选 Option Group 在 `metadata.advanced_settings_enabled=1` 时支持种类数限制：
+
+```typescript
+{
+  is_multiple: 1,
+  min_quantity: 1, // 总份数下限
+  max_quantity: 4, // 总份数上限，0 表示不限
+  metadata: {
+    advanced_settings_enabled: 1,
+    option_types_config: {
+      min: 1, // 最少种类数，0 表示不限
+      max: 2, // 最多种类数，0 表示不限
+    },
+  },
+  option_item: [
+    {
+      id: 1,
+      min_quantity: 2, // 选择该项后的最少份数
+      max_quantity: 0, // 单项份数不限
+      production_code: 'OPTION-1',
+    },
+  ],
+}
+```
+
+达到最多种类数后，组件只禁用尚未选择的 Option Item；已选项仍可在总份数和单项规则允许的范围内调整。Item `min_quantity` 仅对已选项生效，首次选择会从该最小数量开始。
+
+`getTransformValues()` 和 `onChange` 输出会明确携带以下编码：
+
+- `production_code`：Product 或当前 Variant 编码。
+- `option[*].production_code`：Option Item 编码。
+- `bundle[*].production_code`：Bundle Item 编码。
+- `bundle[*].option[*].production_code`：套餐嵌套 Option Item 编码。
+
+显式空字符串表示“无编码”，不会回退到 Product 或其他节点编码。
+
 ## 7. 注意事项
 
 1. **数据格式**：确保传入的 `dataSource` 和 `value` 格式正确，否则可能导致组件渲染异常

package/lib/plus/skuOptionsSelection/types.d.ts

@@ -90,6 +90,10 @@ interface IProps {
   };
 }
 interface DataSource {
+  /** 商品id */
+  id?: number;
+  /** 生产编码 */
+  production_code?: string;
   /** 单规格组数据 */
   option_group?: Array<OptionGroupItem>;
   /** 组合规格组装后的数据 */
@@ -97,7 +101,19 @@ interface DataSource {
   /** 组合规格组数据 */
   variant_group?: Array<VariantGroupItem>;
   /** 套餐商品组数据 */
-  bundle_group?: Array<BundleItem>;
+  bundle_group?: Array<BundleGroupItem>;
+}
+interface OptionGroupMetadata {
+  /** 是否启用高级设置 */
+  advanced_settings_enabled?: 0 | 1;
+  /** Option 种类数限制 */
+  option_types_config?: {
+    min?: number;
+    max?: number;
+    [key: string]: unknown;
+  };
+  /** 保留后端返回的其他元数据 */
+  [key: string]: unknown;
 }
 /**
  * 单规格组数据
@@ -125,6 +141,8 @@ interface OptionGroupItem {
   max_quantity?: number;
   /** 最小选择数量 */
   min_quantity?: number;
+  /** 高级设置元数据 */
+  metadata?: OptionGroupMetadata;
   /** 单规格组名称 */
   name?: string;
   /** 单规格组下规格数据 */
@@ -168,6 +186,8 @@ interface OptionItem {
   is_enabled?: 0 | 1;
   /** 最大选择数量 */
   max_quantity?: number;
+  /** 最小选择数量 */
+  min_quantity?: number;
   /** 规格名称 */
   name?: string;
   /** 规格组id */
@@ -176,6 +196,8 @@ interface OptionItem {
   original_price?: string;
   /** 商品id */
   product_id?: number;
+  /** 生产编码 */
+  production_code?: string;
   /** 店铺id */
   shop_id?: number;
   /** 排序 */
@@ -297,6 +319,8 @@ interface VariantProductItem {
   price?: string;
   /** 商品id */
   product_id?: number;
+  /** 生产编码 */
+  production_code?: string;
   /** 折扣类型 */
   rebate_type?: string;
   /** 折扣值 */
@@ -312,6 +336,27 @@ interface VariantProductItem {
   /** 重量值 */
   weight_value?: string;
 }
+/**
+ * 套餐商品组数据
+ */
+interface BundleGroupItem {
+  /** 店铺id */
+  shop_id?: number;
+  /** 排序 */
+  sort?: number;
+  /** 套餐id */
+  id?: number;
+  /** 最大选择数量 */
+  max_quantity?: number;
+  /** 最小选择数量 */
+  min_quantity?: number;
+  /** 套餐名称 */
+  name?: string;
+  /** 商品id */
+  product_id?: number;
+  /** 套餐商品组数据 */
+  bundle_item?: Array<BundleItem>;
+}
 /**
  * 套餐商品组下选项数据
  */
@@ -354,6 +399,8 @@ interface BundleItem {
   price_type_ext?: '' | 'product_price';
   /** 商品id */
   product_id?: number;
+  /** 生产编码 */
+  production_code?: string;
   /** 商品价格 */
   product_price?: string;
   /** 商品副标题 */
@@ -373,6 +420,8 @@ interface SkuValue {
   product_variant_id: number;
   /** 多规格商品选项字符串 */
   product_option_string?: string;
+  /** 当前商品或组合规格商品的生产编码 */
+  production_code?: string;
   /** 套餐商品组数据 */
   bundle: Array<any>;
   /** 价格 */

package/lib/plus/skuOptionsSelection/utils/normalizers.js

@@ -0,0 +1,19 @@
+//#region src/plus/skuOptionsSelection/utils/normalizers.ts
+const normalizeNonNegativeInteger = (value, fallback = 0) => {
+	const normalizedFallback = Math.max(0, Math.trunc(Number(fallback) || 0));
+	if (value === null || value === void 0 || typeof value === "string" && value.trim() === "") return normalizedFallback;
+	const normalizedValue = Number(value);
+	if (!Number.isFinite(normalizedValue)) return normalizedFallback;
+	return Math.max(0, Math.trunc(normalizedValue));
+};
+const hasOwnProductionCode = (value) => !!value && typeof value === "object" && Object.prototype.hasOwnProperty.call(value, "production_code");
+const normalizeProductionCode = (value) => value === null || value === void 0 ? "" : String(value).trim();
+const resolveProductionCode = (snapshotValue, currentValue) => {
+	if (hasOwnProductionCode(snapshotValue)) return normalizeProductionCode(snapshotValue.production_code);
+	if (hasOwnProductionCode(currentValue)) return normalizeProductionCode(currentValue.production_code);
+	return "";
+};
+//#endregion
+exports.hasOwnProductionCode = hasOwnProductionCode;
+exports.normalizeNonNegativeInteger = normalizeNonNegativeInteger;
+exports.resolveProductionCode = resolveProductionCode;