@pisell/private-materials 6.11.674 → 6.11.676

package/es/pro/skuDetailModal/flow/modules/time/index.js

@@ -10,8 +10,8 @@ import { resolveSelectionFlowQueryPartySize } from "../../availabilityModel.js";
 import { buildDraftCacheItem, getModuleOptions, getUnsupportedBookingFlowReason, isSameCalendarDay, isSameDateValue } from "../shared/index.js";
 import TimeResourceSelector from "../../../../../components/eventBooking/components/timeResourceSelector/index.js";
 import { resolveAvailabilityStatus } from "../../../../../components/eventBooking/components/bookingAvailabilityCalendar/utils.js";
-import { validateAvailabilityTimeAutoResolution } from "../autoResolution.js";
-import { getAvailabilityCandidateDurationMinutes, getPosFlexibleDurationPresetCandidates, getSessionPresetCandidates, isFlexibleDurationValue, isSameAvailabilityCandidateRange, resolvePosCustomTimeBaseMinutes, resolvePosCustomTimeCandidate, resolvePosCustomTimeDefaultDurationMinutes, resolvePosCustomTimeDefaultStartTime, resolvePosFlexibleDurationInitialCandidate, resolvePosFlexibleDurationRequestIntent, shouldApplyPosFlexibleDurationOverride, shouldResetPosFlexibleTimeForDate, shouldShowPosCustomTimeCandidateCards } from "./posCustomTime.js";
+import { resolveFirstPosSessionAutoCandidate, validateAvailabilityTimeAutoResolution } from "../autoResolution.js";
+import { getAvailabilityCandidateDurationMinutes, getPosFlexibleDurationPresetCandidates, getSessionPresetCandidates, isFlexibleDurationValue, isSameAvailabilityCandidateRange, resolvePosCustomTimeBaseMinutes, resolvePosCustomTimeCandidate, resolvePosDurationFallbackDurationMinutes, resolvePosDurationFallbackStartTime, resolvePosFlexibleDurationInitialCandidate, resolvePosFlexibleDurationRequestIntent, shouldApplyPosFlexibleDurationOverride, shouldResetPosFlexibleTimeForDate, shouldShowPosCustomTimeCandidateCards } from "./posCustomTime.js";
 import dayjs from "dayjs";
 import React, { useEffect, useMemo } from "react";
 import { Alert, Space } from "antd";
@@ -95,7 +95,8 @@ const getProductDurationMinutes = (context) => {
 	const product = context.draft.productData;
 	if (isSessionProduct(product) || (product === null || product === void 0 || (_product$cartDetailVa = product.cartDetailValue) === null || _product$cartDetailVa === void 0 ? void 0 : _product$cartDetailVa.session) || (product === null || product === void 0 || (_product$_extend = product._extend) === null || _product$_extend === void 0 || (_product$_extend = _product$_extend.other) === null || _product$_extend === void 0 ? void 0 : _product$_extend.session)) return null;
 	const duration = (_normalizeDurationMin = normalizeDurationMinutesValue(product === null || product === void 0 ? void 0 : product.duration)) !== null && _normalizeDurationMin !== void 0 ? _normalizeDurationMin : normalizeDurationMinutesValue(product === null || product === void 0 ? void 0 : product.service_duration);
-	return duration ? Math.floor(duration) : null;
+	const normalizedDuration = duration ? Math.floor(duration) : 0;
+	return normalizedDuration > 0 ? normalizedDuration : null;
 };
 const isPosDurationAvailabilityContext = (context) => {
 	var _product$cartDetailVa2, _product$_extend2;
@@ -162,9 +163,29 @@ const finalizeCandidateWithoutResourceStep = function() {
 		return _ref3.apply(this, arguments);
 	};
 }();
+const clearPosSessionAutoResolutionSelection = (context, module) => {
+	if (context.draft.booking.startTime == null && context.draft.booking.endTime == null && context.draft.booking.duration == null && context.draft.booking.selectedCandidate == null && context.draft.booking.commitCandidate == null) return;
+	context.updateDraft({ booking: {
+		startTime: null,
+		endTime: null,
+		duration: null,
+		selectedCandidate: void 0,
+		commitCandidate: void 0
+	} }, {
+		changedFields: [
+			"booking.startTime",
+			"booking.endTime",
+			"booking.duration",
+			"booking.selectedCandidate",
+			"booking.commitCandidate"
+		],
+		sourceModuleKey: module.key,
+		sourceModuleType: "time"
+	});
+};
 const refreshAvailabilityTimes = function() {
 	var _ref5 = _asyncToGenerator(function* (context, module, options = {}) {
-		var _context$getModuleDat2, _ref4;
+		var _context$getModuleDat3, _ref4, _context$services$isP2, _context$services2;
 		const { durationOverride, startTimeOverride, selectionIntent = "restore" } = options;
 		const availability = context.services.availability;
 		const allowUnavailable = context.services.allowUnavailableBookingSelection === true;
@@ -178,6 +199,8 @@ const refreshAvailabilityTimes = function() {
 		const previousTimeData = context.getModuleData(module.key);
 		const posCustomTimeHydrationKey = posCustomTimeAvailability && draftRequestedDuration && draftRequestedStartTime ? `${selectedDate}|${draftRequestedStartTime}|${draftRequestedDuration}` : void 0;
 		const product = context.draft.productData;
+		const flexibleDuration = isFlexibleDurationValue(product === null || product === void 0 ? void 0 : product.duration);
+		const fixedDuration = getProductDurationMinutes(context);
 		const effectiveSelectionIntent = resolvePosFlexibleDurationRequestIntent({
 			selectionIntent,
 			previousSelectionIntent: previousTimeData === null || previousTimeData === void 0 ? void 0 : previousTimeData.posCustomTimeSelectionIntent,
@@ -188,8 +211,9 @@ const refreshAvailabilityTimes = function() {
 			selectionIntent: effectiveSelectionIntent,
 			isEditMode: context.services.selectionFlowMode === "edit"
 		});
-		const requestedDuration = suppressFlexiblePresetOverride ? void 0 : draftRequestedDuration;
-		const requestedStartTime = suppressFlexiblePresetOverride ? void 0 : draftRequestedStartTime;
+		const isPosDurationCreateRestore = posDurationAvailability && context.services.selectionFlowMode === "create" && effectiveSelectionIntent === "restore";
+		const requestedDuration = suppressFlexiblePresetOverride ? void 0 : isPosDurationCreateRestore && !flexibleDuration ? fixedDuration !== null && fixedDuration !== void 0 ? fixedDuration : void 0 : draftRequestedDuration;
+		const requestedStartTime = suppressFlexiblePresetOverride || isPosDurationCreateRestore ? void 0 : draftRequestedStartTime;
 		context.setModuleData(module.key, {
 			requestId,
 			timeSlots: [],
@@ -205,42 +229,55 @@ const refreshAvailabilityTimes = function() {
 			partySize: resolveSelectionFlowQueryPartySize(context.draft, availability.partySize)
 		}, requestedDuration ? _objectSpread2({ durationMinutesByProductId: { [String(availability.productId)]: requestedDuration } }, requestedStartTime ? { durationStartTimesByProductId: { [String(availability.productId)]: [requestedStartTime] } } : {}) : {}))).find((item) => String(item.productId) === String(availability.productId));
 		const candidates = (group === null || group === void 0 ? void 0 : group.ranges) || [];
-		if (posDurationAvailability && effectiveSelectionIntent === "restore" && isFlexibleDurationValue(product === null || product === void 0 ? void 0 : product.duration) && candidates.length === 0) {
-			var _context$hostContext, _moduleOptions$slice, _context$draft$bookin2, _normalizeDurationMin3;
+		const posDurationFallbackStartTime = posDurationAvailability ? resolvePosDurationFallbackStartTime({
+			presentationPlatform: context.services.presentationPlatform,
+			selectionFlowMode: context.services.selectionFlowMode,
+			allowUnavailableBookingSelection: allowUnavailable,
+			selectionIntent: effectiveSelectionIntent,
+			groupKind: group === null || group === void 0 ? void 0 : group.kind,
+			candidateCount: candidates.length,
+			hasValidDuration: flexibleDuration || fixedDuration !== null,
+			selectedDate,
+			selectionFlowOpenedAt: context.services.selectionFlowOpenedAt
+		}) : null;
+		if (posDurationFallbackStartTime) {
+			var _context$getModuleDat, _context$hostContext, _moduleOptions$slice, _context$draft$bookin2, _normalizeDurationMin3;
+			if (((_context$getModuleDat = context.getModuleData(module.key)) === null || _context$getModuleDat === void 0 ? void 0 : _context$getModuleDat.requestId) !== requestId) return;
 			const moduleOptions = getModuleOptions(module);
 			const configuredSlice = (_context$hostContext = context.hostContext) === null || _context$hostContext === void 0 || (_context$hostContext = _context$hostContext.bookingConfig) === null || _context$hostContext === void 0 || (_context$hostContext = _context$hostContext.config) === null || _context$hostContext === void 0 || (_context$hostContext = _context$hostContext.basic) === null || _context$hostContext === void 0 ? void 0 : _context$hostContext.service_time;
 			const fallbackSlice = (_moduleOptions$slice = moduleOptions.slice) !== null && _moduleOptions$slice !== void 0 ? _moduleOptions$slice : typeof configuredSlice === "object" ? configuredSlice === null || configuredSlice === void 0 ? void 0 : configuredSlice.value : configuredSlice;
 			const baseDurationMinutes = resolvePosCustomTimeBaseMinutes(getProductDurationMinutes(context), group === null || group === void 0 ? void 0 : group.slotStepMinutes, fallbackSlice);
-			const resetForSelectedDate = shouldResetPosFlexibleTimeForDate((_context$draft$bookin2 = context.draft.booking.selectedCandidate) !== null && _context$draft$bookin2 !== void 0 ? _context$draft$bookin2 : previousTimeData === null || previousTimeData === void 0 ? void 0 : previousTimeData.selectedCandidate, selectedDate);
-			const nextStartTime = resolvePosCustomTimeDefaultStartTime(resetForSelectedDate ? null : context.draft.booking.startTime, baseDurationMinutes);
-			const nextDuration = resolvePosCustomTimeDefaultDurationMinutes(resetForSelectedDate ? product === null || product === void 0 ? void 0 : product.duration : (_normalizeDurationMin3 = normalizeDurationMinutesValue(context.draft.booking.duration)) !== null && _normalizeDurationMin3 !== void 0 ? _normalizeDurationMin3 : context.draft.booking.duration, baseDurationMinutes);
+			const nextDuration = resolvePosDurationFallbackDurationMinutes({
+				isFlexibleDuration: flexibleDuration,
+				productDurationMinutes: fixedDuration,
+				durationValue: shouldResetPosFlexibleTimeForDate((_context$draft$bookin2 = context.draft.booking.selectedCandidate) !== null && _context$draft$bookin2 !== void 0 ? _context$draft$bookin2 : previousTimeData === null || previousTimeData === void 0 ? void 0 : previousTimeData.selectedCandidate, selectedDate) ? product === null || product === void 0 ? void 0 : product.duration : (_normalizeDurationMin3 = normalizeDurationMinutesValue(context.draft.booking.duration)) !== null && _normalizeDurationMin3 !== void 0 ? _normalizeDurationMin3 : context.draft.booking.duration,
+				baseDurationMinutes
+			});
 			const changedFields = [];
-			if (nextStartTime !== context.draft.booking.startTime) changedFields.push("booking.startTime");
+			if (posDurationFallbackStartTime !== context.draft.booking.startTime) changedFields.push("booking.startTime");
 			if (nextDuration !== context.draft.booking.duration) changedFields.push("booking.duration");
 			if (context.draft.booking.selectedCandidate) changedFields.push("booking.selectedCandidate");
 			if (context.draft.booking.commitCandidate) changedFields.push("booking.commitCandidate");
-			if (changedFields.length > 0 && nextStartTime) {
-				context.updateDraft({ booking: {
-					startTime: nextStartTime,
-					duration: nextDuration,
-					selectedCandidate: void 0,
-					commitCandidate: void 0
-				} }, {
-					changedFields,
-					sourceModuleKey: module.key,
-					sourceModuleType: "time"
-				});
-				yield refreshAvailabilityTimes(context, module, {
-					durationOverride: nextDuration,
-					startTimeOverride: nextStartTime,
-					selectionIntent: "fallback"
-				});
-				return;
-			}
+			if (changedFields.length > 0) context.updateDraft({ booking: {
+				startTime: posDurationFallbackStartTime,
+				duration: nextDuration,
+				selectedCandidate: void 0,
+				commitCandidate: void 0
+			} }, {
+				changedFields,
+				sourceModuleKey: module.key,
+				sourceModuleType: "time"
+			});
+			yield refreshAvailabilityTimes(context, module, {
+				durationOverride: nextDuration,
+				startTimeOverride: posDurationFallbackStartTime,
+				selectionIntent: "fallback"
+			});
+			return;
 		}
 		if (candidates.length === 0) {
-			var _context$getModuleDat;
-			if (((_context$getModuleDat = context.getModuleData(module.key)) === null || _context$getModuleDat === void 0 ? void 0 : _context$getModuleDat.requestId) !== requestId) return;
+			var _context$getModuleDat2, _context$services$isP, _context$services;
+			if (((_context$getModuleDat2 = context.getModuleData(module.key)) === null || _context$getModuleDat2 === void 0 ? void 0 : _context$getModuleDat2.requestId) !== requestId) return;
 			context.setModuleData(module.key, {
 				requestId,
 				timeSlots: [],
@@ -249,6 +286,7 @@ const refreshAvailabilityTimes = function() {
 				posCustomTimeHydrationKey,
 				posCustomTimeSelectionIntent: effectiveSelectionIntent === "restore" ? void 0 : effectiveSelectionIntent
 			});
+			if (posSessionAvailability && ((_context$services$isP = (_context$services = context.services).isPosAutoResolutionActive) === null || _context$services$isP === void 0 ? void 0 : _context$services$isP.call(_context$services)) === true) clearPosSessionAutoResolutionSelection(context, module);
 			return;
 		}
 		const result = yield availability.queryBookingAvailability(availability.contextId, {
@@ -257,7 +295,7 @@ const refreshAvailabilityTimes = function() {
 			candidates,
 			partySize: resolveSelectionFlowQueryPartySize(context.draft, availability.partySize)
 		});
-		if (((_context$getModuleDat2 = context.getModuleData(module.key)) === null || _context$getModuleDat2 === void 0 ? void 0 : _context$getModuleDat2.requestId) !== requestId) return;
+		if (((_context$getModuleDat3 = context.getModuleData(module.key)) === null || _context$getModuleDat3 === void 0 ? void 0 : _context$getModuleDat3.requestId) !== requestId) return;
 		const timeGroup = result.data.find((item) => String(item === null || item === void 0 ? void 0 : item.productId) === String(availability.productId));
 		const times = Array.isArray(timeGroup === null || timeGroup === void 0 ? void 0 : timeGroup.times) ? timeGroup.times : [];
 		const existingCandidate = context.draft.booking.selectedCandidate;
@@ -300,9 +338,10 @@ const refreshAvailabilityTimes = function() {
 		const selectableCandidates = normallySelectableCandidates.length > 0 || !allowUnavailable ? normallySelectableCandidates : times;
 		const shouldPreserveRequestedPosStart = posCustomTimeAvailability && Boolean(requestedPosStartTime && requestedPosDuration);
 		const displayCandidates = posSessionAvailability ? getSessionPresetCandidates(times) : posDurationAvailability && isFlexibleDurationValue(product === null || product === void 0 ? void 0 : product.duration) ? getPosFlexibleDurationPresetCandidates(times, requestedCustomRange, customSelectionIntent, Boolean(!customSelectionIntent && existingCandidate && existingCandidate.date === selectedDate && (previousTimeData === null || previousTimeData === void 0 ? void 0 : previousTimeData.timeSlots.some((slot) => String(slot.id) === String(existingCandidate.key))))) : times;
+		const restrictPosSessionAutoResolution = posSessionAvailability && ((_context$services$isP2 = (_context$services2 = context.services).isPosAutoResolutionActive) === null || _context$services$isP2 === void 0 ? void 0 : _context$services$isP2.call(_context$services2)) === true;
 		const fallbackCandidate = shouldPreserveRequestedPosStart ? void 0 : selectableCandidates[0];
 		const preferPosFlexiblePreset = posDurationAvailability && isFlexibleDurationValue(product === null || product === void 0 ? void 0 : product.duration) && !customSelectionIntent && context.services.selectionFlowMode !== "edit" && (selectionIntent === "fallback" || !existingCandidate || existingCandidate.date !== selectedDate);
-		const initialCandidate = posDurationAvailability && isFlexibleDurationValue(product === null || product === void 0 ? void 0 : product.duration) ? resolvePosFlexibleDurationInitialCandidate({
+		const initialCandidate = restrictPosSessionAutoResolution ? resolveFirstPosSessionAutoCandidate(displayCandidates) : posDurationAvailability && isFlexibleDurationValue(product === null || product === void 0 ? void 0 : product.duration) ? resolvePosFlexibleDurationInitialCandidate({
 			presetCandidates: displayCandidates,
 			restoredCandidate,
 			fallbackCandidate,
@@ -325,6 +364,7 @@ const refreshAvailabilityTimes = function() {
 			posCustomTimeHydrationKey,
 			posCustomTimeSelectionIntent: effectiveSelectionIntent === "restore" ? void 0 : effectiveSelectionIntent
 		});
+		if (restrictPosSessionAutoResolution && !initialCandidate) clearPosSessionAutoResolutionSelection(context, module);
 		const shouldWriteInitialCandidate = Boolean(initialCandidate) && (posCustomTimeAvailability || !existingCandidate || initialCandidate.key !== existingCandidate.key);
 		if (initialCandidate && shouldWriteInitialCandidate) {
 			const startAt = dayjs(initialCandidate.startAt);
@@ -376,9 +416,9 @@ const normalizeSelectionDuration = (duration) => {
 	return null;
 };
 const buildTimeCacheItem = (context, startTime, duration) => {
-	var _context$getModuleDat3;
+	var _context$getModuleDat4;
 	const resourceModule = context.steps.flatMap((step) => step.modules).find((item) => item.type === "resource");
-	const cacheItem = buildDraftCacheItem(context, resourceModule ? (_context$getModuleDat3 = context.getModuleData(resourceModule.key)) === null || _context$getModuleDat3 === void 0 ? void 0 : _context$getModuleDat3.cacheItem : void 0);
+	const cacheItem = buildDraftCacheItem(context, resourceModule ? (_context$getModuleDat4 = context.getModuleData(resourceModule.key)) === null || _context$getModuleDat4 === void 0 ? void 0 : _context$getModuleDat4.cacheItem : void 0);
 	return _objectSpread2(_objectSpread2({}, cacheItem), {}, { _extend: _objectSpread2(_objectSpread2({}, (cacheItem === null || cacheItem === void 0 ? void 0 : cacheItem._extend) || {}), {}, {
 		start_time: startTime,
 		duration
@@ -432,9 +472,9 @@ const getFlexibleDuration = (timeObj) => {
 	return (timeObj === null || timeObj === void 0 || (_timeObj$durationSlic = timeObj.durationSlicesBasedOnTime) === null || _timeObj$durationSlic === void 0 || (_timeObj$durationSlic = _timeObj$durationSlic.find((item) => typeof (item === null || item === void 0 ? void 0 : item.value) === "string" && item.value.startsWith("flexible_") && !item.disabled)) === null || _timeObj$durationSlic === void 0 ? void 0 : _timeObj$durationSlic.value) || (timeObj === null || timeObj === void 0 || (_timeObj$durationSlic2 = timeObj.durationSlicesBasedOnTime) === null || _timeObj$durationSlic2 === void 0 || (_timeObj$durationSlic2 = _timeObj$durationSlic2.find((item) => typeof (item === null || item === void 0 ? void 0 : item.value) === "string" && item.value.startsWith("flexible_"))) === null || _timeObj$durationSlic2 === void 0 ? void 0 : _timeObj$durationSlic2.value);
 };
 const resolveInitialDuration = (context) => {
-	var _context$services$get, _context$services, _serviceCacheItem$_ex, _serviceCacheItem$_ex2, _context$draft$produc, _context$draft$produc2, _timeObj$durationSlic3, _ref6, _configuredOption$val, _timeObj$durationSlic4;
+	var _context$services$get, _context$services3, _serviceCacheItem$_ex, _serviceCacheItem$_ex2, _context$draft$produc, _context$draft$produc2, _timeObj$durationSlic3, _ref6, _configuredOption$val, _timeObj$durationSlic4;
 	if (hasDurationValue(context.draft.booking.duration)) return context.draft.booking.duration;
-	const serviceCacheItem = (_context$services$get = (_context$services = context.services).getCurrentCacheItem) === null || _context$services$get === void 0 ? void 0 : _context$services$get.call(_context$services);
+	const serviceCacheItem = (_context$services$get = (_context$services3 = context.services).getCurrentCacheItem) === null || _context$services$get === void 0 ? void 0 : _context$services$get.call(_context$services3);
 	const existingDuration = normalizeSelectionDuration((_serviceCacheItem$_ex = serviceCacheItem === null || serviceCacheItem === void 0 || (_serviceCacheItem$_ex2 = serviceCacheItem._extend) === null || _serviceCacheItem$_ex2 === void 0 ? void 0 : _serviceCacheItem$_ex2.duration) !== null && _serviceCacheItem$_ex !== void 0 ? _serviceCacheItem$_ex : (_context$draft$produc = context.draft.productData) === null || _context$draft$produc === void 0 || (_context$draft$produc = _context$draft$produc._extend) === null || _context$draft$produc === void 0 ? void 0 : _context$draft$produc.duration);
 	if (hasDurationValue(existingDuration)) return existingDuration;
 	const { timeObj } = getTimeRuntime(context, context.draft.booking.startTime, null);

package/es/pro/skuDetailModal/flow/modules/time/posCustomTime.js

@@ -20,19 +20,23 @@ const resolvePosCustomTimeBaseMinutes = (...values) => {
 	}
 	return 30;
 };
-const resolvePosCustomTimeDefaultStartTime = (currentValue, sliceMinutes, now) => {
+const resolvePosCustomTimeDefaultStartTime = (currentValue, _sliceMinutes, now) => {
 	if (typeof currentValue === "string") {
 		const matched = currentValue.trim().match(/^([01]\d|2[0-3]):([0-5]\d)(?::[0-5]\d)?$/);
 		if (matched) return `${matched[1]}:${matched[2]}`;
 	}
 	const current = now === void 0 ? dayjs() : dayjs(now);
 	if (!current.isValid()) return null;
-	const step = Math.min(resolvePosCustomTimeBaseMinutes(sliceMinutes), 1440);
-	const minuteOfDay = current.hour() * 60 + current.minute();
-	const alignedMinute = Math.floor(minuteOfDay / step) * step;
-	const hours = Math.floor(alignedMinute / 60);
-	const minutes = alignedMinute % 60;
-	return `${String(hours).padStart(2, "0")}:${String(minutes).padStart(2, "0")}`;
+	return current.format("HH:mm");
+};
+const resolvePosDurationFallbackStartTime = (params) => {
+	if (params.presentationPlatform !== "pos" || params.selectionFlowMode !== "create" || params.allowUnavailableBookingSelection !== true || params.selectionIntent !== "restore" || params.groupKind !== "duration" || params.candidateCount !== 0 || !params.hasValidDuration || !params.selectionFlowOpenedAt) return null;
+	const openedAt = dayjs(params.selectionFlowOpenedAt);
+	const current = params.now === void 0 ? dayjs() : dayjs(params.now);
+	if (!openedAt.isValid() || !current.isValid()) return null;
+	const openedDate = openedAt.format("YYYY-MM-DD");
+	if (params.selectedDate !== openedDate || params.selectedDate !== current.format("YYYY-MM-DD")) return null;
+	return resolvePosCustomTimeDefaultStartTime(null, 1, params.selectionFlowOpenedAt);
 };
 const shouldResetPosFlexibleTimeForDate = (candidate, selectedDate) => Boolean(candidate && candidate.date !== selectedDate);
 const resolvePosCustomTimeDefaultDurationMinutes = (currentValue, baseDurationMinutes) => {
@@ -46,6 +50,11 @@ const resolvePosCustomTimeDefaultDurationMinutes = (currentValue, baseDurationMi
 	if (Number.isFinite(currentMinutes) && currentMinutes > 0) return Math.max(1, Math.floor(currentMinutes));
 	return resolvePosCustomTimeBaseMinutes(baseDurationMinutes);
 };
+const resolvePosDurationFallbackDurationMinutes = (params) => {
+	if (params.isFlexibleDuration) return resolvePosCustomTimeDefaultDurationMinutes(params.durationValue, params.baseDurationMinutes);
+	const productDurationMinutes = Math.floor(Number(params.productDurationMinutes));
+	return Number.isFinite(productDurationMinutes) && productDurationMinutes > 0 ? productDurationMinutes : null;
+};
 const shouldShowPosCustomTimeCandidateCards = (params) => params.isSessionAvailability || params.isDurationAvailability && params.candidateCount > 0;
 const getAvailabilityCandidateDurationMinutes = (candidate) => {
 	const startAt = dayjs(candidate.startAt);
@@ -77,4 +86,4 @@ const resolvePosFlexibleDurationInitialCandidate = (params) => {
 	return params.restoredCandidate || params.fallbackCandidate;
 };
 //#endregion
-export { getAvailabilityCandidateDurationMinutes, getPosFlexibleDurationPresetCandidates, getSessionPresetCandidates, isFlexibleDurationValue, isSameAvailabilityCandidateRange, resolvePosCustomTimeBaseMinutes, resolvePosCustomTimeCandidate, resolvePosCustomTimeDefaultDurationMinutes, resolvePosCustomTimeDefaultStartTime, resolvePosFlexibleDurationInitialCandidate, resolvePosFlexibleDurationRequestIntent, shouldApplyPosFlexibleDurationOverride, shouldResetPosFlexibleTimeForDate, shouldShowPosCustomTimeCandidateCards };
+export { getAvailabilityCandidateDurationMinutes, getPosFlexibleDurationPresetCandidates, getSessionPresetCandidates, isFlexibleDurationValue, isSameAvailabilityCandidateRange, resolvePosCustomTimeBaseMinutes, resolvePosCustomTimeCandidate, resolvePosDurationFallbackDurationMinutes, resolvePosDurationFallbackStartTime, resolvePosFlexibleDurationInitialCandidate, resolvePosFlexibleDurationRequestIntent, shouldApplyPosFlexibleDurationOverride, shouldResetPosFlexibleTimeForDate, shouldShowPosCustomTimeCandidateCards };

package/es/pro/skuDetailModal/flow/types.d.ts

@@ -189,6 +189,10 @@ interface SelectionFlowAvailabilityService {
 interface SelectionFlowServices {
   /** 当前 Host 打开 Flow 的业务模式；编辑专属 module 通过它决定是否参与。 */
   selectionFlowMode?: 'create' | 'edit';
+  /** 本次 POS create 首屏是否仍处于自动推导阶段；进入人工流程后立即关闭。 */
+  isPosAutoResolutionActive?: () => boolean;
+  /** 当前 SKU Detail 弹窗打开时的稳定时间锚点，供 POS 当天兜底使用。 */
+  selectionFlowOpenedAt?: string;
   /** POS 旧 Edit service 是否应在资源步骤展示可编辑 Price。 */
   showServicePrice?: boolean;
   /**

package/es/pro/skuDetailModal/index.js

@@ -208,6 +208,7 @@ const SkuDetailModal = ({ onConfirm, onRemove, onClose, variant }, ref) => {
 	});
 	const openParamsRef = useRef(null);
 	const openTaskIdRef = useRef(0);
+	const selectionFlowOpenedAtRef = useRef(null);
 	const flowDateHydrationVersionRef = useRef(0);
 	/**
 	* 左侧可滚动容器 ref
@@ -617,13 +618,30 @@ const SkuDetailModal = ({ onConfirm, onRemove, onClose, variant }, ref) => {
 		if (isSkuOnlyDraftChange(previousDraft, draft)) React.startTransition(projectDraftToModal);
 		else projectDraftToModal();
 	}, [productData]);
-	const selectionFlowServices = useMemo(() => {
+	const isPosCreateAutoResolutionEligible = useMemo(() => {
 		var _openParamsRef$curren6;
-		return _objectSpread2(_objectSpread2({}, ((_openParamsRef$curren6 = openParamsRef.current) === null || _openParamsRef$curren6 === void 0 ? void 0 : _openParamsRef$curren6.selectionFlowServices) || {}), {}, {
+		return isCustomSelectionFlow && isPosCreateAutoResolutionCandidate({
+			platform: actualSelectionFlowPlatform,
+			selectionFlowMode: (_openParamsRef$curren6 = openParamsRef.current) === null || _openParamsRef$curren6 === void 0 || (_openParamsRef$curren6 = _openParamsRef$curren6.selectionFlowServices) === null || _openParamsRef$curren6 === void 0 ? void 0 : _openParamsRef$curren6.selectionFlowMode,
+			steps: compiledSelectionFlowSteps
+		});
+	}, [
+		actualSelectionFlowPlatform,
+		compiledSelectionFlowSteps,
+		isCustomSelectionFlow
+	]);
+	const selectionFlowServices = useMemo(() => {
+		var _openParamsRef$curren7;
+		return _objectSpread2(_objectSpread2({}, ((_openParamsRef$curren7 = openParamsRef.current) === null || _openParamsRef$curren7 === void 0 ? void 0 : _openParamsRef$curren7.selectionFlowServices) || {}), {}, {
+			isPosAutoResolutionActive: () => {
+				var _selectionFlowRef$cur3;
+				return isPosCreateAutoResolutionEligible && !posAutoResolutionAbandonedRef.current && ((_selectionFlowRef$cur3 = selectionFlowRef.current) === null || _selectionFlowRef$cur3 === void 0 ? void 0 : _selectionFlowRef$cur3.getState().currentStepIndex) === 0;
+			},
+			selectionFlowOpenedAt: selectionFlowOpenedAtRef.current || void 0,
 			hydrateProductDataForDate: hydrateFlowProductDataForDate,
 			getCurrentCacheItem: () => {
-				var _selectionFlowRef$cur3;
-				return ((_selectionFlowRef$cur3 = selectionFlowRef.current) === null || _selectionFlowRef$cur3 === void 0 ? void 0 : _selectionFlowRef$cur3.getState().draft.productData) || productData;
+				var _selectionFlowRef$cur4;
+				return ((_selectionFlowRef$cur4 = selectionFlowRef.current) === null || _selectionFlowRef$cur4 === void 0 ? void 0 : _selectionFlowRef$cur4.getState().draft.productData) || productData;
 			},
 			skuSelectionConfig,
 			skuSelectionSkuCardConfig,
@@ -639,6 +657,7 @@ const SkuDetailModal = ({ onConfirm, onRemove, onClose, variant }, ref) => {
 		hydrateFlowProductDataForDate,
 		isKioskPlatform,
 		isMobile,
+		isPosCreateAutoResolutionEligible,
 		productData,
 		skuDetailConfig === null || skuDetailConfig === void 0 ? void 0 : skuDetailConfig.allowUnavailableBookingSelection,
 		skuDetailConfig === null || skuDetailConfig === void 0 ? void 0 : skuDetailConfig.allowNoResourceBookingSelection,
@@ -707,18 +726,6 @@ const SkuDetailModal = ({ onConfirm, onRemove, onClose, variant }, ref) => {
 		effectiveSelectionFlowSteps,
 		selectionFlowProcedureSteps
 	]);
-	const isPosCreateAutoResolutionEligible = useMemo(() => {
-		var _openParamsRef$curren7;
-		return isCustomSelectionFlow && isPosCreateAutoResolutionCandidate({
-			platform: actualSelectionFlowPlatform,
-			selectionFlowMode: (_openParamsRef$curren7 = openParamsRef.current) === null || _openParamsRef$curren7 === void 0 || (_openParamsRef$curren7 = _openParamsRef$curren7.selectionFlowServices) === null || _openParamsRef$curren7 === void 0 ? void 0 : _openParamsRef$curren7.selectionFlowMode,
-			steps: compiledSelectionFlowSteps
-		});
-	}, [
-		actualSelectionFlowPlatform,
-		compiledSelectionFlowSteps,
-		isCustomSelectionFlow
-	]);
 	const posAutoResolutionDraftKey = useMemo(() => getPosAutoResolutionDraftKey(latestSelectionFlowDraft), [latestSelectionFlowDraft]);
 	useEffect(() => {
 		const runId = posAutoResolutionRunRef.current + 1;
@@ -753,9 +760,9 @@ const SkuDetailModal = ({ onConfirm, onRemove, onClose, variant }, ref) => {
 	});
 	const maxStepIndex = useMemo(() => Math.max(0, procedureSteps.length - 1), [procedureSteps]);
 	useLayoutEffect(() => {
-		var _selectionFlowRef$cur4, _selectionFlowRef$cur5, _procedureRef$current, _procedureRef$current2;
+		var _selectionFlowRef$cur5, _selectionFlowRef$cur6, _procedureRef$current, _procedureRef$current2;
 		if (procedureSteps.length === 0) return;
-		const sourceStepIndex = isCustomSelectionFlow ? (_selectionFlowRef$cur4 = (_selectionFlowRef$cur5 = selectionFlowRef.current) === null || _selectionFlowRef$cur5 === void 0 ? void 0 : _selectionFlowRef$cur5.getState().currentStepIndex) !== null && _selectionFlowRef$cur4 !== void 0 ? _selectionFlowRef$cur4 : currentStep : currentStep;
+		const sourceStepIndex = isCustomSelectionFlow ? (_selectionFlowRef$cur5 = (_selectionFlowRef$cur6 = selectionFlowRef.current) === null || _selectionFlowRef$cur6 === void 0 ? void 0 : _selectionFlowRef$cur6.getState().currentStepIndex) !== null && _selectionFlowRef$cur5 !== void 0 ? _selectionFlowRef$cur5 : currentStep : currentStep;
 		const nextStepIndex = Math.min(Math.max(0, sourceStepIndex), procedureSteps.length - 1);
 		if (currentStep !== nextStepIndex) setCurrentStep(nextStepIndex);
 		(_procedureRef$current = procedureRef.current) === null || _procedureRef$current === void 0 || (_procedureRef$current2 = _procedureRef$current.goToStep) === null || _procedureRef$current2 === void 0 || _procedureRef$current2.call(_procedureRef$current, nextStepIndex);
@@ -793,6 +800,7 @@ const SkuDetailModal = ({ onConfirm, onRemove, onClose, variant }, ref) => {
 		open: function() {
 			var _ref16 = _asyncToGenerator(function* (data) {
 				var _skuDetailConfig$enab, _skuDetailConfig$isSh, _skuDetailConfig$isSh2, _skuDetailConfig$isSh3, _skuDetailConfig$isSh4, _skuDetailConfig$isSh5, _skuDetailConfig$hide, _skuDetailConfig$isSh6, _skuDetailConfig$isSh7, _skuDetailConfig$isSh8, _skuDetailConfig$exte, _skuDetailConfig$useC, _skuDetailConfig$cust, _skuDetailConfig$isCa, _skuDetailConfig, _skuDetailConfig2, _data$bundle_group, _data$_extend, _data$_extend2, _data$discount_list, _ref14, _data$_extend3, _data$_extend4, _data$_extend5, _data$discount_list$f, _data$discount_list2, _ref15, _data$_extend$priceOv, _data$_extend7;
+				selectionFlowOpenedAtRef.current = dayjs().toISOString();
 				const currentTaskId = openTaskIdRef.current + 1;
 				openTaskIdRef.current = currentTaskId;
 				flowDateHydrationVersionRef.current += 1;
@@ -1385,7 +1393,7 @@ const SkuDetailModal = ({ onConfirm, onRemove, onClose, variant }, ref) => {
 	};
 	const handleConfirm = function() {
 		var _ref17 = _asyncToGenerator(function* (flowDraft) {
-			var _bookingState$booking2, _selectionFlowRef$cur6, _selectionFlowService2;
+			var _bookingState$booking2, _selectionFlowRef$cur7, _selectionFlowService2;
 			if (isCustomSelectionFlow && !flowDraft) {
 				var _snapshot$currentStep;
 				const flow = selectionFlowRef.current;
@@ -1498,7 +1506,7 @@ const SkuDetailModal = ({ onConfirm, onRemove, onClose, variant }, ref) => {
 				console.log("sku_detail_modal_validate_error>>>>>", error);
 				return false;
 			}
-			const flowSnapshot = flowDraft ? (_selectionFlowRef$cur6 = selectionFlowRef.current) === null || _selectionFlowRef$cur6 === void 0 ? void 0 : _selectionFlowRef$cur6.getState() : void 0;
+			const flowSnapshot = flowDraft ? (_selectionFlowRef$cur7 = selectionFlowRef.current) === null || _selectionFlowRef$cur7 === void 0 ? void 0 : _selectionFlowRef$cur7.getState() : void 0;
 			const activeFlowModuleTypes = flowSnapshot === null || flowSnapshot === void 0 ? void 0 : flowSnapshot.steps.flatMap((step) => step.modules.map((module) => module.type));
 			const requiresBookingPrice = Boolean(flowDraft && (activeFlowModuleTypes === null || activeFlowModuleTypes === void 0 ? void 0 : activeFlowModuleTypes.includes("bookingPrice")));
 			const expectedBookingPriceRequestKey = flowDraft ? resolveSelectionFlowBookingPriceRequestKey(flowDraft, selectionFlowServices.bookingPrice) : void 0;
@@ -1652,8 +1660,8 @@ const SkuDetailModal = ({ onConfirm, onRemove, onClose, variant }, ref) => {
 		if (isWeighingProduct$1) return;
 		if (value && value > 0) {
 			if (value !== quantity && isCustomSelectionFlow && isKioskPlatform) {
-				var _selectionFlowRef$cur7;
-				const snapshot = (_selectionFlowRef$cur7 = selectionFlowRef.current) === null || _selectionFlowRef$cur7 === void 0 ? void 0 : _selectionFlowRef$cur7.getState();
+				var _selectionFlowRef$cur8;
+				const snapshot = (_selectionFlowRef$cur8 = selectionFlowRef.current) === null || _selectionFlowRef$cur8 === void 0 ? void 0 : _selectionFlowRef$cur8.getState();
 				const reviewStepIndex = snapshot ? getLateQuantityReviewStepIndex(snapshot.steps, snapshot.currentStepIndex) : null;
 				if (reviewStepIndex != null) lateQuantityReviewStepIndexRef.current = reviewStepIndex;
 			}
@@ -1929,9 +1937,9 @@ const SkuDetailModal = ({ onConfirm, onRemove, onClose, variant }, ref) => {
 					if (openTaskIdRef.current !== selectionFlowInstanceKey) return;
 					setCompiledSelectionFlowSteps(steps);
 					if (steps.length === 0 && typeof ((_openParamsRef$curren8 = openParamsRef.current) === null || _openParamsRef$curren8 === void 0 ? void 0 : _openParamsRef$curren8.onSelectionFlowNotApplicable) === "function") {
-						var _selectionFlowRef$cur8;
+						var _selectionFlowRef$cur9;
 						const onNotApplicable = openParamsRef.current.onSelectionFlowNotApplicable;
-						const latestProductData = ((_selectionFlowRef$cur8 = selectionFlowRef.current) === null || _selectionFlowRef$cur8 === void 0 ? void 0 : _selectionFlowRef$cur8.getState().draft.productData) || productData;
+						const latestProductData = ((_selectionFlowRef$cur9 = selectionFlowRef.current) === null || _selectionFlowRef$cur9 === void 0 ? void 0 : _selectionFlowRef$cur9.getState().draft.productData) || productData;
 						if (latestProductData) {
 							if (onNotApplicable({
 								productData: latestProductData,
@@ -2090,15 +2098,15 @@ const SkuDetailModal = ({ onConfirm, onRemove, onClose, variant }, ref) => {
 		defaultCurrent: currentStep,
 		layoutMode: "ratio",
 		onPrev: () => {
-			var _selectionFlowRef$cur9;
+			var _selectionFlowRef$cur10;
 			if (!isCustomSelectionFlow) return;
-			return ((_selectionFlowRef$cur9 = selectionFlowRef.current) === null || _selectionFlowRef$cur9 === void 0 ? void 0 : _selectionFlowRef$cur9.back()) ? void 0 : false;
+			return ((_selectionFlowRef$cur10 = selectionFlowRef.current) === null || _selectionFlowRef$cur10 === void 0 ? void 0 : _selectionFlowRef$cur10.back()) ? void 0 : false;
 		},
 		onStepsChange: (result) => {
 			const nextStep = Math.min(Number(result.currentStep || 0), maxStepIndex);
 			if (isCustomSelectionFlow) {
-				var _selectionFlowRef$cur10;
-				setCurrentStep(((_selectionFlowRef$cur10 = selectionFlowRef.current) === null || _selectionFlowRef$cur10 === void 0 ? void 0 : _selectionFlowRef$cur10.getState().currentStepIndex) || 0);
+				var _selectionFlowRef$cur11;
+				setCurrentStep(((_selectionFlowRef$cur11 = selectionFlowRef.current) === null || _selectionFlowRef$cur11 === void 0 ? void 0 : _selectionFlowRef$cur11.getState().currentStepIndex) || 0);
 				return;
 			}
 			setCurrentStep(nextStep);

package/lib/plus/piPaymentOld/ui/eftpos/amount.js

@@ -17,8 +17,11 @@ const decimal = (value) => {
 const readerSurcharge = (reader) => {
 	var _ref, _ref2, _ref3, _setting$surcharge_ra, _ref4, _ref5, _setting$surcharge_fi;
 	const setting = (reader === null || reader === void 0 ? void 0 : reader.setting) || {};
-	/** useOriginSurcharge 表示业务方自行计算，卡机默认费率不得叠加。 */
-	if (setting.useOriginSurcharge) return {
+	/**
+	* useOriginSurcharge 表示由卡机收取原始手续费；surcharge=false 表示商户已关闭
+	* Pisell 手续费。两种场景都不得继续使用 Reader 中可能残留的历史费率。
+	*/
+	if (setting.useOriginSurcharge || setting.surcharge === false) return {
 		rate: 0,
 		fixed: 0
 	};
@@ -63,4 +66,5 @@ const updateEftposDraftAmount = (draft, input) => {
 	});
 };
 //#endregion
+exports.buildPaymentAmountQuote = buildPaymentAmountQuote;
 exports.updateEftposDraftAmount = updateEftposDraftAmount;

package/lib/plus/piPaymentOld/ui/eftpos/pages/DevicePage.js

@@ -1,27 +1,18 @@
 const require_runtime = require("../../../../../_virtual/_rolldown/runtime.js");
 const require_index = require("../contracts/index.js");
+const require_amount = require("../amount.js");
 let react = require("react");
 react = require_runtime.__toESM(react);
 let _pisell_utils = require("@pisell/utils");
-let decimal_js = require("decimal.js");
-decimal_js = require_runtime.__toESM(decimal_js);
 let _pisell_icon_es_ChevronRight = require("@pisell/icon/es/ChevronRight");
 _pisell_icon_es_ChevronRight = require_runtime.__toESM(_pisell_icon_es_ChevronRight);
 //#region src/plus/piPaymentOld/ui/eftpos/pages/DevicePage.tsx
-/** 转成 Decimal。 */
-const toDecimal = (value) => {
-	try {
-		return new decimal_js.default(value === void 0 || value === null || value === "" ? 0 : value);
-	} catch (_error) {
-		return new decimal_js.default(0);
-	}
-};
 /** 从 reader setting 计算设备列表展示金额。 */
 const resolveReaderPay = (reader, options) => {
-	var _ref, _ref2, _ref3, _setting$surcharge_ra, _ref4, _ref5, _setting$surcharge_fi;
 	/** pay/setting 均来自不同版本后端，读取时需要保持兼容。 */
 	const pay = reader.pay;
-	if (pay) {
+	const setting = reader.setting || {};
+	if (pay && !setting.useOriginSurcharge && setting.surcharge !== false) {
 		var _pay$surRate, _pay$surMoney, _pay$surcharge;
 		return {
 			totalUnit: String(pay.totalUnit || pay.total || ""),
@@ -30,17 +21,13 @@ const resolveReaderPay = (reader, options) => {
 			surcharge: String((_pay$surcharge = pay.surcharge) !== null && _pay$surcharge !== void 0 ? _pay$surcharge : "")
 		};
 	}
-	const setting = reader.setting || {};
-	const amount = toDecimal(options === null || options === void 0 ? void 0 : options.amount);
-	const rate = setting.useOriginSurcharge ? new decimal_js.default(0) : toDecimal((_ref = (_ref2 = (_ref3 = (_setting$surcharge_ra = setting.surcharge_rate) !== null && _setting$surcharge_ra !== void 0 ? _setting$surcharge_ra : setting.surRate) !== null && _ref3 !== void 0 ? _ref3 : setting.constant_rate) !== null && _ref2 !== void 0 ? _ref2 : setting.surcharge) !== null && _ref !== void 0 ? _ref : 0);
-	const fixed = setting.useOriginSurcharge ? new decimal_js.default(0) : toDecimal((_ref4 = (_ref5 = (_setting$surcharge_fi = setting.surcharge_fixed) !== null && _setting$surcharge_fi !== void 0 ? _setting$surcharge_fi : setting.surMoney) !== null && _ref5 !== void 0 ? _ref5 : setting.constant_money) !== null && _ref4 !== void 0 ? _ref4 : 0);
-	/** 设备卡片展示的总手续费与最终扣款额，只用于选择前的预览。 */
-	const surcharge = amount.mul(rate.div(100)).add(fixed);
+	/** 设备预览与选择 Reader 后的实际支付报价必须使用同一套金额规则。 */
+	const quote = require_amount.buildPaymentAmountQuote(options === null || options === void 0 ? void 0 : options.amount, options === null || options === void 0 ? void 0 : options.surcharge, reader);
 	return {
-		totalUnit: amount.add(surcharge).toFixed(2, decimal_js.default.ROUND_HALF_UP),
-		surRate: rate.toString(),
-		surMoney: fixed.toFixed(2, decimal_js.default.ROUND_HALF_UP),
-		surcharge: surcharge.toFixed(2, decimal_js.default.ROUND_HALF_UP)
+		totalUnit: quote.total,
+		surRate: quote.surchargeRate,
+		surMoney: quote.surchargeFixed,
+		surcharge: quote.surchargeTotal
 	};
 };
 /** 获取 MX51 pairing id。 */

package/lib/plus/piPaymentUI/eftpos/amount.js

@@ -17,8 +17,11 @@ const decimal = (value) => {
 const readerSurcharge = (reader) => {
 	var _ref, _ref2, _ref3, _setting$surcharge_ra, _ref4, _ref5, _setting$surcharge_fi;
 	const setting = (reader === null || reader === void 0 ? void 0 : reader.setting) || {};
-	/** useOriginSurcharge 表示业务方自行计算，卡机默认费率不得叠加。 */
-	if (setting.useOriginSurcharge) return {
+	/**
+	* useOriginSurcharge 表示由卡机收取原始手续费；surcharge=false 表示商户已关闭
+	* Pisell 手续费。两种场景都不得继续使用 Reader 中可能残留的历史费率。
+	*/
+	if (setting.useOriginSurcharge || setting.surcharge === false) return {
 		rate: 0,
 		fixed: 0
 	};
@@ -63,4 +66,5 @@ const updateEftposDraftAmount = (draft, input) => {
 	});
 };
 //#endregion
+exports.buildPaymentAmountQuote = buildPaymentAmountQuote;
 exports.updateEftposDraftAmount = updateEftposDraftAmount;

package/lib/plus/piPaymentUI/eftpos/pages/DevicePage.js

@@ -1,27 +1,18 @@
 const require_runtime = require("../../../../_virtual/_rolldown/runtime.js");
 const require_index = require("../contracts/index.js");
+const require_amount = require("../amount.js");
 let react = require("react");
 react = require_runtime.__toESM(react);
 let _pisell_utils = require("@pisell/utils");
-let decimal_js = require("decimal.js");
-decimal_js = require_runtime.__toESM(decimal_js);
 let _pisell_icon_es_ChevronRight = require("@pisell/icon/es/ChevronRight");
 _pisell_icon_es_ChevronRight = require_runtime.__toESM(_pisell_icon_es_ChevronRight);
 //#region src/plus/piPaymentUI/eftpos/pages/DevicePage.tsx
-/** 转成 Decimal。 */
-const toDecimal = (value) => {
-	try {
-		return new decimal_js.default(value === void 0 || value === null || value === "" ? 0 : value);
-	} catch (_error) {
-		return new decimal_js.default(0);
-	}
-};
 /** 从 reader setting 计算设备列表展示金额。 */
 const resolveReaderPay = (reader, options) => {
-	var _ref, _ref2, _ref3, _setting$surcharge_ra, _ref4, _ref5, _setting$surcharge_fi;
 	/** pay/setting 均来自不同版本后端，读取时需要保持兼容。 */
 	const pay = reader.pay;
-	if (pay) {
+	const setting = reader.setting || {};
+	if (pay && !setting.useOriginSurcharge && setting.surcharge !== false) {
 		var _pay$surRate, _pay$surMoney, _pay$surcharge;
 		return {
 			totalUnit: String(pay.totalUnit || pay.total || ""),
@@ -30,17 +21,13 @@ const resolveReaderPay = (reader, options) => {
 			surcharge: String((_pay$surcharge = pay.surcharge) !== null && _pay$surcharge !== void 0 ? _pay$surcharge : "")
 		};
 	}
-	const setting = reader.setting || {};
-	const amount = toDecimal(options === null || options === void 0 ? void 0 : options.amount);
-	const rate = setting.useOriginSurcharge ? new decimal_js.default(0) : toDecimal((_ref = (_ref2 = (_ref3 = (_setting$surcharge_ra = setting.surcharge_rate) !== null && _setting$surcharge_ra !== void 0 ? _setting$surcharge_ra : setting.surRate) !== null && _ref3 !== void 0 ? _ref3 : setting.constant_rate) !== null && _ref2 !== void 0 ? _ref2 : setting.surcharge) !== null && _ref !== void 0 ? _ref : 0);
-	const fixed = setting.useOriginSurcharge ? new decimal_js.default(0) : toDecimal((_ref4 = (_ref5 = (_setting$surcharge_fi = setting.surcharge_fixed) !== null && _setting$surcharge_fi !== void 0 ? _setting$surcharge_fi : setting.surMoney) !== null && _ref5 !== void 0 ? _ref5 : setting.constant_money) !== null && _ref4 !== void 0 ? _ref4 : 0);
-	/** 设备卡片展示的总手续费与最终扣款额，只用于选择前的预览。 */
-	const surcharge = amount.mul(rate.div(100)).add(fixed);
+	/** 设备预览与选择 Reader 后的实际支付报价必须使用同一套金额规则。 */
+	const quote = require_amount.buildPaymentAmountQuote(options === null || options === void 0 ? void 0 : options.amount, options === null || options === void 0 ? void 0 : options.surcharge, reader);
 	return {
-		totalUnit: amount.add(surcharge).toFixed(2, decimal_js.default.ROUND_HALF_UP),
-		surRate: rate.toString(),
-		surMoney: fixed.toFixed(2, decimal_js.default.ROUND_HALF_UP),
-		surcharge: surcharge.toFixed(2, decimal_js.default.ROUND_HALF_UP)
+		totalUnit: quote.total,
+		surRate: quote.surchargeRate,
+		surMoney: quote.surchargeFixed,
+		surcharge: quote.surchargeTotal
 	};
 };
 /** 获取 MX51 pairing id。 */