@pisell/pisellos 0.10.41 → 0.10.42

package/dist/solution/ShopDiscount/index.js

@@ -27,6 +27,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 import { BaseModule } from "../../modules/BaseModule";
 import { DiscountModule } from "../../modules/Discount";
 import { RulesModule } from "../../modules/Rules";
+import { isEntitlementPass } from "../../modules/Discount/entitlementPass";
 import { filterDiscountListByBookingTime as _filterDiscountListByBookingTime, isAllNormalProduct } from "./utils";
 import { UnavailableReason } from "../../modules/Rules/types";
 import Decimal from 'decimal.js';
@@ -203,7 +204,8 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
           customerId: customer.id,
           action: 'create',
           with_good_pass: 1,
-          with_discount_card: 1
+          with_discount_card: 1,
+          with_entitlement_pass: 1
         });
       });
     }
@@ -622,7 +624,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
           var _this3$hooks;
           var product = (_this3$hooks = _this3.hooks) === null || _this3$hooks === void 0 ? void 0 : _this3$hooks.getProduct(item);
           (item.discount_list || []).forEach(function (discount) {
-            if (discount.id && ['good_pass', 'discount_card'].includes(discount.type)) {
+            if (discount.id && ['entitlement_pass', 'good_pass', 'discount_card'].includes(discount.type)) {
               var index = editModeDiscountList.findIndex(function (n) {
                 var _discount$discount;
                 return n.id === (((_discount$discount = discount.discount) === null || _discount$discount === void 0 ? void 0 : _discount$discount.resource_id) || discount.id);
@@ -789,7 +791,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
     key: "loadPrepareConfig",
     value: function () {
       var _loadPrepareConfig = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(params) {
-        var _this$getCustomer2, _this$store$discount8, _this$getDiscountList, _this$store$discount9, _this$store$productLi2, orderId, customerId, prepareConfigResult, goodPassList, scanDiscount, scanDiscountIds, newGoodPassList, newDiscountList, filteredDiscountList, _result3;
+        var _this$getCustomer2, _this$store$discount8, _this$getDiscountList, _this$store$discount9, _this$store$productLi2, orderId, customerId, prepareConfigResult, goodPassList, scanDiscount, scanDiscountById, refreshedScanEntitlementIds, newGoodPassList, retainedScanDiscounts, newDiscountList, filteredDiscountList, _result3;
         return _regeneratorRuntime().wrap(function _callee10$(_context10) {
           while (1) switch (_context10.prev = _context10.next) {
             case 0:
@@ -805,6 +807,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                 with_good_pass: 1,
                 with_discount_card: 1,
                 with_wallet_pass_holder: 1,
+                with_entitlement_pass: 1,
                 request_timezone: Intl.DateTimeFormat().resolvedOptions().timeZone
               }, orderId ? {
                 order_id: orderId
@@ -814,44 +817,61 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
               goodPassList = (prepareConfigResult === null || prepareConfigResult === void 0 ? void 0 : prepareConfigResult.discountList) || [];
               scanDiscount = (_this$getDiscountList = this.getDiscountList()) === null || _this$getDiscountList === void 0 ? void 0 : _this$getDiscountList.filter(function (item) {
                 return item.isScan;
-              }); // goodPassList 里可能有 scanDiscount 重合的部分，goodPassList 需要剔除
-              scanDiscountIds = scanDiscount.map(function (n) {
-                return n.id;
+              }); // 扫码 Entitlement Pass 与客户列表重复时保留扫码选择状态，但刷新实时余额。
+              // 其他券继续沿用原来的“保留扫码结果、剔除列表重复项”行为。
+              scanDiscountById = new Map(scanDiscount.map(function (discount) {
+                return [String(discount.id), discount];
+              }));
+              refreshedScanEntitlementIds = new Set();
+              newGoodPassList = goodPassList.flatMap(function (discount) {
+                var key = String(discount.id);
+                var scannedDiscount = scanDiscountById.get(key);
+                if (!scannedDiscount) return [discount];
+                if (isEntitlementPass(scannedDiscount) && isEntitlementPass(discount)) {
+                  var _scannedDiscount$isSe, _scannedDiscount$isMa;
+                  refreshedScanEntitlementIds.add(key);
+                  return [_objectSpread(_objectSpread({}, discount), {}, {
+                    isScan: true,
+                    isSelected: (_scannedDiscount$isSe = scannedDiscount.isSelected) !== null && _scannedDiscount$isSe !== void 0 ? _scannedDiscount$isSe : discount.isSelected,
+                    isManualSelect: (_scannedDiscount$isMa = scannedDiscount.isManualSelect) !== null && _scannedDiscount$isMa !== void 0 ? _scannedDiscount$isMa : discount.isManualSelect
+                  })];
+                }
+                return [];
               });
-              newGoodPassList = goodPassList === null || goodPassList === void 0 ? void 0 : goodPassList.filter(function (n) {
-                return !scanDiscountIds.includes(n.id);
+              retainedScanDiscounts = scanDiscount.filter(function (discount) {
+                return !refreshedScanEntitlementIds.has(String(discount.id));
               });
-              newDiscountList = [].concat(_toConsumableArray(scanDiscount), _toConsumableArray(newGoodPassList || [])); // 存储原始优惠券列表
+              newDiscountList = [].concat(_toConsumableArray(retainedScanDiscounts), _toConsumableArray(newGoodPassList)); // 存储原始优惠券列表
               this.store.originalDiscountList = newDiscountList;
-              _context10.next = 14;
+              _context10.next = 16;
               return (_this$store$discount9 = this.store.discount) === null || _this$store$discount9 === void 0 ? void 0 : _this$store$discount9.setOriginalDiscountList(newDiscountList);
-            case 14:
+            case 16:
               // 根据当前预约时间过滤优惠券列表
               filteredDiscountList = this.filterDiscountListByBookingTime(newDiscountList, this.store.currentBookingTime);
               this.store.filteredDiscountList = filteredDiscountList;
               this.setDiscountList(filteredDiscountList || []);
               if (!((_this$store$productLi2 = this.store.productList) !== null && _this$store$productLi2 !== void 0 && _this$store$productLi2.length)) {
-                _context10.next = 21;
+                _context10.next = 23;
                 break;
               }
               _result3 = this.calcDiscount(this.store.productList);
-              _context10.next = 21;
-              return this.core.effects.emit("".concat(this.name, ":onLoadPrepareCalcResult"), _result3);
-            case 21:
               _context10.next = 23;
-              return this.core.effects.emit("".concat(this.name, ":onLoadDiscountList"), filteredDiscountList);
+              return this.core.effects.emit("".concat(this.name, ":onLoadPrepareCalcResult"), _result3);
             case 23:
-              _context10.next = 28;
-              break;
+              _context10.next = 25;
+              return this.core.effects.emit("".concat(this.name, ":onLoadDiscountList"), filteredDiscountList);
             case 25:
-              _context10.prev = 25;
+              _context10.next = 30;
+              break;
+            case 27:
+              _context10.prev = 27;
               _context10.t0 = _context10["catch"](0);
               console.error('[ShopDiscount] 加载准备配置出错:', _context10.t0);
-            case 28:
+            case 30:
             case "end":
               return _context10.stop();
           }
-        }, _callee10, this, [[0, 25]]);
+        }, _callee10, this, [[0, 27]]);
       }));
       function loadPrepareConfig(_x10) {
         return _loadPrepareConfig.apply(this, arguments);

package/dist/solution/ShopDiscount/utils.js

@@ -9,6 +9,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 import Decimal from "decimal.js";
 import dayjs from "dayjs";
+import { isFullCoveragePass } from "../../modules/Discount/entitlementPass";
 export var uniqueById = function uniqueById(arr) {
   var key = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'id';
   var seen = new Set();
@@ -41,8 +42,8 @@ export var isAllNormalProduct = function isAllNormalProduct(items) {
  */
 export var getDiscountAmount = function getDiscountAmount(discount, total, price) {
   var _discount$metadata;
-  // 商品券
-  if (discount.tag === 'good_pass') {
+  // 商品券和 Entitlement Pass 都是全额抵扣。
+  if (isFullCoveragePass(discount)) {
     return new Decimal(price).minus(new Decimal(price || 0)).toNumber();
   }
 

package/dist/solution/UnifiedBookingSales/index.js

@@ -142,7 +142,7 @@ export function buildPlannerDiscountResult(params) {
     productDiscounts.forEach(function (discount) {
       var _product$product_id, _product$metadata;
       var type = discount.tag || discount.type;
-      if (!['good_pass', 'discount_card', 'product_discount_card'].includes(type)) return;
+      if (!['entitlement_pass', 'good_pass', 'discount_card', 'product_discount_card'].includes(type)) return;
       var discountId = resolvePlannerDiscountId(discount);
       applications.push({
         discountId: discountId,
@@ -194,7 +194,7 @@ function isLocalOrderId(orderId) {
 function isCustomerBoundDiscount(discount) {
   var _discount$type;
   var type = (_discount$type = discount === null || discount === void 0 ? void 0 : discount.type) !== null && _discount$type !== void 0 ? _discount$type : discount === null || discount === void 0 ? void 0 : discount.tag;
-  return type === 'good_pass' || type === 'discount_card' || type === 'product_discount_card';
+  return type === 'entitlement_pass' || type === 'good_pass' || type === 'discount_card' || type === 'product_discount_card';
 }
 function filterCustomerBoundDiscounts(discountList) {
   if (!Array.isArray(discountList)) return [];
@@ -674,14 +674,9 @@ function normalizeResource(raw) {
   var id = (_ref5 = (_raw$resourceId = raw.resourceId) !== null && _raw$resourceId !== void 0 ? _raw$resourceId : raw.resource_id) !== null && _ref5 !== void 0 ? _ref5 : raw.id;
   if (id === undefined || id === null || id === '') return null;
   var rawWindows = raw.windows || raw.times || [];
-  return {
-    id: id,
-    formId: (_ref6 = (_raw$formId = raw.formId) !== null && _raw$formId !== void 0 ? _raw$formId : raw.form_id) !== null && _ref6 !== void 0 ? _ref6 : raw.resource_form_id,
-    name: raw.resourceName || raw.main_field || raw.name || raw.title,
-    code: raw.code,
-    resourceType: normalizeResourceType(raw.type || raw.resourceType),
-    capacity: Math.max(1, Number(raw.capacity || raw.max_capacity || 1) || 1),
-    windows: (Array.isArray(rawWindows) ? rawWindows : []).flatMap(function (window) {
+  var rawExcludedWindows = raw.excludedWindows || raw.excluded_windows || [];
+  var normalizeWindows = function normalizeWindows(windows) {
+    return (Array.isArray(windows) ? windows : []).flatMap(function (window) {
       var range = normalizeAvailabilityLocalDateTimeRange({
         startAt: window.startAt || window.start_at || window.start,
         endAt: window.endAt || window.end_at || window.end,
@@ -695,7 +690,17 @@ function normalizeResource(raw) {
         source: window.source,
         raw: window
       }];
-    }),
+    });
+  };
+  return {
+    id: id,
+    formId: (_ref6 = (_raw$formId = raw.formId) !== null && _raw$formId !== void 0 ? _raw$formId : raw.form_id) !== null && _ref6 !== void 0 ? _ref6 : raw.resource_form_id,
+    name: raw.resourceName || raw.main_field || raw.name || raw.title,
+    code: raw.code,
+    resourceType: normalizeResourceType(raw.type || raw.resourceType),
+    capacity: Math.max(1, Number(raw.capacity || raw.max_capacity || 1) || 1),
+    windows: normalizeWindows(rawWindows),
+    excludedWindows: normalizeWindows(rawExcludedWindows),
     raw: raw
   };
 }
@@ -719,6 +724,16 @@ function dateRangeDays(dateRange) {
   }
   return dates;
 }
+function getExcludedScheduleDateOverrideTimePoints(date, schedule) {
+  var _schedule$repeat_rule;
+  if (!((_schedule$repeat_rule = schedule.repeat_rule) !== null && _schedule$repeat_rule !== void 0 && (_schedule$repeat_rule = _schedule$repeat_rule.excluded_date) !== null && _schedule$repeat_rule !== void 0 && _schedule$repeat_rule.length)) return [];
+  if (getScheduleStartEndTimePoints(date, [schedule]).length > 0) return [];
+  return getScheduleStartEndTimePoints(date, [_objectSpread(_objectSpread({}, schedule), {}, {
+    repeat_rule: _objectSpread(_objectSpread({}, schedule.repeat_rule), {}, {
+      excluded_date: []
+    })
+  })]);
+}
 function normalizeResourceOccupancy(rawEvent, resourceId) {
   var _ref9, _ref10, _rawEvent$start_at, _ref11, _ref12, _rawEvent$end_at, _ref13, _ref14, _rawEvent$pax, _rawEvent$schedule_ev, _ref15, _rawEvent$schedule_ev2, _ref16, _rawEvent$booking_uid, _rawEvent$metadata, _ref17, _rawEvent$product_uid, _rawEvent$metadata2;
   var source = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'remote';
@@ -825,7 +840,30 @@ export function buildAvailabilityResourcesFromV2(params) {
         });
       });
     });
+    var excludedWindows = dates.flatMap(function (date) {
+      return schedules.flatMap(function (schedule) {
+        return getExcludedScheduleDateOverrideTimePoints(date, schedule).flatMap(function (slot) {
+          var range = normalizeAvailabilityLocalDateTimeRange({
+            startAt: slot.start_at,
+            endAt: slot.end_at,
+            fixedOffsetMinutes: fixedOffsetMinutes,
+            rollOverEnd: true
+          });
+          if (!range) return [];
+          return [{
+            startAt: range.startAt,
+            endAt: range.endAt,
+            source: "resource_schedule_excluded:".concat(schedule.id),
+            raw: {
+              scheduleId: schedule.id,
+              excludedDate: date
+            }
+          }];
+        });
+      });
+    });
     resource.windows = materializedWindows.length > 0 ? materializedWindows : explicitWindows;
+    resource.excludedWindows = [].concat(_toConsumableArray(resource.excludedWindows || []), _toConsumableArray(excludedWindows));
     if (resource.windows.length === 0 && missingScheduleIds.length > 0) {
       resource.windows = buildResourceWindowFallbackTimes({
         raw: raw,
@@ -1093,7 +1131,7 @@ function buildBookingFromAvailabilitySelection(params) {
     } : {})
   });
 }
-var POS_OVERRIDABLE_AVAILABILITY_CONFLICT_CODES = new Set(['past', 'booking_cutoff', 'resource_full', 'resource_unavailable', 'resource_capacity_exceeded',
+var POS_OVERRIDABLE_AVAILABILITY_CONFLICT_CODES = new Set(['past', 'booking_cutoff', 'schedule_excluded_date', 'resource_full', 'resource_unavailable', 'resource_capacity_exceeded',
 // A required group whose selected resource is outside its window is surfaced
 // as missing_resource at group level. Structural validation below still
 // rejects a genuinely missing selection.
@@ -3133,12 +3171,35 @@ export var UnifiedBookingSalesImpl = /*#__PURE__*/function (_BookingTicket) {
           }] : [];
         });
       });
-      return {
+      var excludedWindows = dateRangeDays(params.dateRange).flatMap(function (date) {
+        return schedules.flatMap(function (schedule) {
+          return getExcludedScheduleDateOverrideTimePoints(date, schedule).flatMap(function (slot) {
+            var range = normalizeAvailabilityLocalDateTimeRange({
+              startAt: slot.start_at,
+              endAt: slot.end_at,
+              fixedOffsetMinutes: _this3.getAvailabilityRuntimeOffsetMinutes(),
+              rollOverEnd: true
+            });
+            return range ? [{
+              startAt: range.startAt,
+              endAt: range.endAt,
+              source: "operating_schedule_excluded:".concat(schedule.id),
+              raw: {
+                scheduleId: schedule.id,
+                excludedDate: date
+              }
+            }] : [];
+          });
+        });
+      });
+      return _objectSpread({
         source: descriptor.source,
         scheduleIds: _toConsumableArray(descriptor.scheduleIds),
         missingScheduleIds: missingScheduleIds,
         windows: windows
-      };
+      }, excludedWindows.length > 0 ? {
+        excludedWindows: excludedWindows
+      } : {});
     }
   }, {
     key: "loadAvailabilityProducts",
@@ -4312,7 +4373,9 @@ export var UnifiedBookingSalesImpl = /*#__PURE__*/function (_BookingTicket) {
                 allowOutsideOperatingHoursForRequestedStartTimes: true
               } : {}), {
                 evaluatedAt: this.getAvailabilityRuntimeDateTime(),
-                allowSessionCustomRanges: isPosAvailabilityRequest
+                useExactDurationCandidateMinute: isPosAvailabilityRequest,
+                allowSessionCustomRanges: isPosAvailabilityRequest,
+                allowExcludedScheduleDateOverride: isPosAvailabilityRequest
               }).map(function (group) {
                 return _objectSpread(_objectSpread({}, group), {}, {
                   ranges: group.ranges.map(function (candidate) {
@@ -4335,7 +4398,8 @@ export var UnifiedBookingSalesImpl = /*#__PURE__*/function (_BookingTicket) {
     key: "queryBookingAvailability",
     value: (function () {
       var _queryBookingAvailability = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee38(contextId, request) {
-        var _yield$this$ensureAva2, context, projectionEntry, refreshed, result, contextVersion, contextualResult;
+        var _this$otherParams$pla3, _this$otherParams21;
+        var _yield$this$ensureAva2, context, projectionEntry, refreshed, isPosAvailabilityRequest, result, contextVersion, contextualResult;
         return _regeneratorRuntime().wrap(function _callee38$(_context38) {
           while (1) switch (_context38.prev = _context38.next) {
             case 0:
@@ -4347,7 +4411,11 @@ export var UnifiedBookingSalesImpl = /*#__PURE__*/function (_BookingTicket) {
               projectionEntry = _yield$this$ensureAva2.projectionEntry;
               refreshed = _yield$this$ensureAva2.refreshed;
               this.assertContextualQueryFreshness(context, request);
-              result = queryAvailabilityProjection(projectionEntry.projection, request);
+              isPosAvailabilityRequest = String((_this$otherParams$pla3 = (_this$otherParams21 = this.otherParams) === null || _this$otherParams21 === void 0 ? void 0 : _this$otherParams21.platform) !== null && _this$otherParams$pla3 !== void 0 ? _this$otherParams$pla3 : '').trim().toLowerCase() === 'pos';
+              result = queryAvailabilityProjection(projectionEntry.projection, request, {
+                useExactDurationCandidateMinute: isPosAvailabilityRequest,
+                allowExcludedScheduleDateOverride: isPosAvailabilityRequest
+              });
               contextVersion = context.activeVersion;
               contextualResult = result.target === 'time' ? _objectSpread(_objectSpread({}, result), {}, {
                 data: result.data.map(function (group) {
@@ -4379,7 +4447,7 @@ export var UnifiedBookingSalesImpl = /*#__PURE__*/function (_BookingTicket) {
                 contextVersion: contextVersion,
                 refreshed: refreshed
               }));
-            case 11:
+            case 12:
             case "end":
               return _context38.stop();
           }
@@ -4456,7 +4524,7 @@ export var UnifiedBookingSalesImpl = /*#__PURE__*/function (_BookingTicket) {
     key: "commitAvailabilitySelection",
     value: (function () {
       var _commitAvailabilitySelection = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee39(contextId, params) {
-        var normalizedContextId, _params$bookingCount, _ref46, _params$orderProduct$, _params$orderProduct, _params$orderProduct2, _params$orderProduct3, _params$orderProduct$2, _params$orderProduct4, _params$orderProduct5, _editingLine$product_, _baseProjection$meta$, _refreshedProjection$, _baseProjection$meta$2, _this$otherParams$pla3, _this$otherParams21, _ref47, _params$orderProduct$3, _params$orderProduct6, _existingBooking$meta, _ref48, _ref49, _params$orderProduct$4, _params$orderProduct7, _params$orderProduct8, _existingBooking$meta2, _existingBooking$hold, bookingCount, orderProductQuantity, partySize, _yield$this$ensureAva3, context, projectionEntry, refreshed, boundEditingUids, orderProductId, editingLine, _editingLine$product_2, baseProjection, commitWriteGuard, prepareParams, fallbackResources, commitSnapshot, refreshedProjection, _baseProjection$meta$3, latestContext, candidateDurationMinutes, candidateStartTime, allowPosAvailabilityOverride, refreshedRanges, refreshedCandidateBase, product, validation, forced, capacityConflict, revalidationEntry, revalidatedContext, refreshedCandidate, existingBooking, existingBookingUid, booking, transformed, productLineUid, bookingUid, productLineUids, bookingUids, _transformed$product_, _transformed$product_2, _transformed$product_3, _ref50, _transformed$product_4, _this$getTempOrder4, _this$getTempOrder5, _this$getTempOrder6, beforeProductLineUids, beforeBookingUids, products, addedLines, addedBookings, nextContext, result;
+        var normalizedContextId, _params$bookingCount, _ref46, _params$orderProduct$, _params$orderProduct, _params$orderProduct2, _params$orderProduct3, _params$orderProduct$2, _params$orderProduct4, _params$orderProduct5, _editingLine$product_, _baseProjection$meta$, _refreshedProjection$, _baseProjection$meta$2, _this$otherParams$pla4, _this$otherParams22, _ref47, _params$orderProduct$3, _params$orderProduct6, _existingBooking$meta, _ref48, _ref49, _params$orderProduct$4, _params$orderProduct7, _params$orderProduct8, _existingBooking$meta2, _existingBooking$hold, bookingCount, orderProductQuantity, partySize, _yield$this$ensureAva3, context, projectionEntry, refreshed, boundEditingUids, orderProductId, editingLine, _editingLine$product_2, baseProjection, commitWriteGuard, prepareParams, fallbackResources, commitSnapshot, refreshedProjection, _baseProjection$meta$3, latestContext, candidateDurationMinutes, candidateStartTime, allowPosAvailabilityOverride, refreshedRanges, refreshedCandidateBase, product, validation, forced, capacityConflict, revalidationEntry, revalidatedContext, refreshedCandidate, existingBooking, existingBookingUid, booking, transformed, productLineUid, bookingUid, productLineUids, bookingUids, _transformed$product_, _transformed$product_2, _transformed$product_3, _ref50, _transformed$product_4, _this$getTempOrder4, _this$getTempOrder5, _this$getTempOrder6, beforeProductLineUids, beforeBookingUids, products, addedLines, addedBookings, nextContext, result;
         return _regeneratorRuntime().wrap(function _callee39$(_context39) {
           while (1) switch (_context39.prev = _context39.next) {
             case 0:
@@ -4686,7 +4754,7 @@ export var UnifiedBookingSalesImpl = /*#__PURE__*/function (_BookingTicket) {
               this.assertAvailabilityCommitWriteCAS(commitWriteGuard);
               candidateDurationMinutes = getCandidateDurationMinutes(params.candidate);
               candidateStartTime = getCandidateStartTime(params.candidate);
-              allowPosAvailabilityOverride = String((_this$otherParams$pla3 = (_this$otherParams21 = this.otherParams) === null || _this$otherParams21 === void 0 ? void 0 : _this$otherParams21.platform) !== null && _this$otherParams$pla3 !== void 0 ? _this$otherParams$pla3 : '').trim().toLowerCase() === 'pos';
+              allowPosAvailabilityOverride = String((_this$otherParams$pla4 = (_this$otherParams22 = this.otherParams) === null || _this$otherParams22 === void 0 ? void 0 : _this$otherParams22.platform) !== null && _this$otherParams$pla4 !== void 0 ? _this$otherParams$pla4 : '').trim().toLowerCase() === 'pos';
               refreshedRanges = getProjectionProductTimeRanges(refreshedProjection, _objectSpread({
                 productIds: [params.candidate.productId],
                 dateRange: {
@@ -4700,7 +4768,9 @@ export var UnifiedBookingSalesImpl = /*#__PURE__*/function (_BookingTicket) {
               }, allowPosAvailabilityOverride ? {
                 allowOutsideOperatingHoursForRequestedStartTimes: true
               } : {}) : {}) : {}), {
-                allowSessionCustomRanges: allowPosAvailabilityOverride
+                useExactDurationCandidateMinute: allowPosAvailabilityOverride,
+                allowSessionCustomRanges: allowPosAvailabilityOverride,
+                allowExcludedScheduleDateOverride: allowPosAvailabilityOverride
               }).flatMap(function (group) {
                 return group.ranges;
               });
@@ -4733,6 +4803,9 @@ export var UnifiedBookingSalesImpl = /*#__PURE__*/function (_BookingTicket) {
                 requirementSelections: params.requirementSelections,
                 partySize: partySize,
                 bookingCount: bookingCount
+              }, {
+                useExactDurationCandidateMinute: allowPosAvailabilityOverride,
+                allowExcludedScheduleDateOverride: allowPosAvailabilityOverride
               });
               if (allowPosAvailabilityOverride && !validation.ok && validation.conflicts.every(function (conflict) {
                 return POS_OVERRIDABLE_AVAILABILITY_CONFLICT_CODES.has(conflict.code);

package/lib/modules/BookingContext/utils/buildCacheItemFromOrderLine.js

@@ -7,6 +7,7 @@ exports.buildCacheItemFromOrderLine = buildCacheItemFromOrderLine;
 var _dayjs = _interopRequireDefault(require("dayjs"));
 var _utils = require("../../Order/utils");
 var _manualProductDiscount = require("../../Order/utils/manualProductDiscount");
+var _entitlementPass = require("../../Discount/entitlementPass");
 var _orderLineDisplay = require("./orderLineDisplay");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function safeFormat(value, fmt) {
@@ -116,11 +117,38 @@ function resolveProductTitle(product, booking, sourceProduct) {
 function resolveProductCover(product, booking, sourceProduct) {
   return sourceProduct?.cover ?? product.product_cover ?? '';
 }
-function resolveMainProductPrice(product, fallback) {
-  const metadata = product.metadata || {};
-  const value = metadata.main_product_original_price ?? metadata.source_product_price;
+function toFinitePrice(value) {
+  if (value === undefined || value === null || value === '') return null;
   const parsed = Number(value);
-  return Number.isFinite(parsed) ? parsed : fallback;
+  return Number.isFinite(parsed) ? parsed : null;
+}
+function hasEntitlementPassDiscount(product) {
+  const hasEntitlementDiscount = discountList => Array.isArray(discountList) && discountList.some(_entitlementPass.isEntitlementPass);
+  return hasEntitlementDiscount(product.discount_list) || Array.isArray(product.product_bundle) && product.product_bundle.some(bundle => hasEntitlementDiscount(bundle?.discount_list));
+}
+function resolveMainProductPrice(product, fallback, sourceProduct, restoreEntitlementPrice = false) {
+  const metadata = product.metadata || {};
+  if (!restoreEntitlementPrice) {
+    const value = metadata.main_product_original_price ?? metadata.source_product_price;
+    const parsed = Number(value);
+    return Number.isFinite(parsed) ? parsed : fallback;
+  }
+  const sourcePrice = toFinitePrice(metadata.source_product_price);
+  if (sourcePrice !== null) return sourcePrice;
+  const variantId = Number(product.product_variant_id || 0);
+  const variantList = sourceProduct?.variant ?? metadata.origin?.variant;
+  if (variantId > 0 && Array.isArray(variantList)) {
+    const matched = variantList.find(variant => Number(variant?.id) === variantId);
+    const variantPrice = toFinitePrice(matched?.price ?? matched?.base_price);
+    if (variantPrice !== null) return variantPrice;
+  }
+  const catalogPrice = toFinitePrice(sourceProduct?.price ?? sourceProduct?.base_price ?? metadata.origin?.price ?? metadata.origin?.base_price);
+  if (catalogPrice !== null) return catalogPrice;
+
+  // legacy 数据没有 source_product_price 时，main_product_original_price
+  // 仍比已被月卡改写为 0 的 selling_price 更可靠。
+  const legacyMainPrice = toFinitePrice(metadata.main_product_original_price);
+  return legacyMainPrice ?? fallback;
 }
 function mapOrderBundleToOtherBundle(bundle) {
   return bundle.map(item => {
@@ -185,7 +213,8 @@ function buildCacheItemFromOrderLine(input) {
   const resolvedId = product.product_id ?? sourceProduct?.id;
   const selling = Number(product.selling_price ?? 0);
   const original = Number(product.original_price ?? selling);
-  const mainProductPrice = resolveMainProductPrice(product, selling);
+  const shouldRestoreEntitlementPrice = hasEntitlementPassDiscount(product);
+  const mainProductPrice = resolveMainProductPrice(product, selling, sourceProduct, shouldRestoreEntitlementPrice);
   const startDate = safeFormat(booking.start_date, 'YYYY-MM-DD');
   const endDate = safeFormat(booking.end_date, 'YYYY-MM-DD');
   const startTime = normalizeTimeString(booking.start_time);
@@ -240,7 +269,7 @@ function buildCacheItemFromOrderLine(input) {
     }
   }
   if (product.metadata?.price_override != null || manualDiscount) {
-    extend.priceOverride = selling;
+    extend.priceOverride = shouldRestoreEntitlementPrice ? product.metadata?.price_override ?? selling : selling;
   }
   if (booking.holder !== undefined) {
     extend.holder = booking.holder;

package/lib/modules/BookingContext/utils/buildNormalProductCacheItemFromOrderLine.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.buildNormalProductCacheItemFromOrderLine = buildNormalProductCacheItemFromOrderLine;
 var _utils = require("../../Order/utils");
+var _entitlementPass = require("../../Discount/entitlementPass");
 var _orderLineDisplay = require("./orderLineDisplay");
 /**
  * 从已加车的普通商品 order line 反查 SkuDetailModal edit 所需的 cacheItem。
@@ -44,12 +45,16 @@ function resolveSourceProductPrice(product, sourceProduct) {
   }
   return Number(product.selling_price ?? 0);
 }
+function hasEntitlementPassDiscount(product) {
+  const hasEntitlementDiscount = discountList => Array.isArray(discountList) && discountList.some(_entitlementPass.isEntitlementPass);
+  return hasEntitlementDiscount(product.discount_list) || Array.isArray(product.product_bundle) && product.product_bundle.some(bundle => hasEntitlementDiscount(bundle?.discount_list));
+}
 
 /** 订单行 bundle → booking other.bundle（保留 original_price 供 setProductPrice 按比例分摊） */
-function mapOrderBundleToOtherBundle(bundle) {
+function mapOrderBundleToOtherBundle(bundle, preferManualPrice = false) {
   return bundle.map(item => {
     const catalogOriginal = item.original_price ?? item.product_price ?? item.price ?? item.bundle_selling_price;
-    const selling = item.bundle_selling_price ?? item.price ?? catalogOriginal;
+    const selling = preferManualPrice ? item.price ?? item.bundle_selling_price ?? catalogOriginal : item.bundle_selling_price ?? item.price ?? catalogOriginal;
     const {
       bundle_selling_price: _omitBundleSelling,
       ...rest
@@ -78,9 +83,11 @@ function buildNormalProductCacheItemFromOrderLine(input) {
   const selling = Number(product.selling_price ?? 0);
   const original = Number(product.original_price ?? selling);
   const uid = product.metadata?.unique_identification_number;
-  const option = (0, _utils.getProductSkuOptions)(product);
-  const bundle = mapOrderBundleToOtherBundle(Array.isArray(product.product_bundle) ? product.product_bundle : []);
   const originExtend = product.metadata?.origin?._extend;
+  const shouldPreserveEntitlementPriceOverride = hasEntitlementPassDiscount(product) && (originExtend?.priceOverride !== undefined || product.metadata?.price_override != null);
+  const hasPriceOverride = originExtend?.priceOverride !== undefined || shouldPreserveEntitlementPriceOverride;
+  const option = (0, _utils.getProductSkuOptions)(product);
+  const bundle = mapOrderBundleToOtherBundle(Array.isArray(product.product_bundle) ? product.product_bundle : [], shouldPreserveEntitlementPriceOverride);
   const productOptionString = (0, _orderLineDisplay.buildProductOptionStringFromOrderLine)(product);
   const discountList = product.discount_list || [];
   const other = {
@@ -114,8 +121,8 @@ function buildNormalProductCacheItemFromOrderLine(input) {
     ...(productOptionString ? {
       product_option_string: productOptionString
     } : {}),
-    ...(originExtend?.priceOverride !== undefined ? {
-      priceOverride: originExtend.priceOverride
+    ...(hasPriceOverride ? {
+      priceOverride: shouldPreserveEntitlementPriceOverride ? originExtend?.priceOverride ?? product.metadata?.price_override : originExtend?.priceOverride
     } : {}),
     ...(originExtend?.bundle_edit !== undefined ? {
       bundle_edit: originExtend.bundle_edit

package/lib/modules/Discount/entitlementPass.d.ts

@@ -0,0 +1,34 @@
+export declare const ENTITLEMENT_PASS_TYPE = "entitlement_pass";
+export declare const GOOD_PASS_TYPE = "good_pass";
+type DiscountLike = {
+    id?: number | string | null;
+    tag?: unknown;
+    type?: unknown;
+    discount?: object | null;
+    metadata?: object | null;
+    extension_data?: unknown;
+    balance?: unknown;
+    expire_time?: unknown;
+};
+export type EntitlementQuota = {
+    type: 'limited';
+    value: number;
+    balance: number;
+} | {
+    type: 'unlimited';
+    value: null;
+    balance: null;
+};
+export declare function isEntitlementPass(discount: DiscountLike | null | undefined): boolean;
+export declare function isFullCoveragePass(discount: DiscountLike | null | undefined): boolean;
+/**
+ * Resolve the authoritative total-use contract for an Entitlement Pass.
+ * Invalid or missing configuration fails closed. Legacy mode/total_uses fields
+ * are intentionally unsupported.
+ */
+export declare function resolveEntitlementQuota(discount: DiscountLike | null | undefined): EntitlementQuota | null;
+export declare function getRemainingEntitlementUses(discount: DiscountLike | null | undefined, usedCount: number, requestedCount: number): number;
+export declare function hasAvailableEntitlementUses(discount: DiscountLike | null | undefined): boolean;
+/** Sort Entitlement Passes by expiry, finite balance, then card instance id. */
+export declare function compareEntitlementPassPriority(left: DiscountLike, right: DiscountLike): number;
+export {};