@pisell/pisellos 2.3.143 → 2.3.145

package/dist/modules/Order/types.d.ts

@@ -445,6 +445,15 @@ export interface AddProductToOrderOptions {
     disableMerge?: boolean;
     /** 商品行 UID 落定后，由 OrderModule 原子绑定到该行的 Sales Notes 草稿。 */
     salesNotes?: SalesNoteDraftInput[];
+    /**
+     * 自动预约加购的同步提交门禁；抛错时不发布本次新增。
+     * 带门禁时先在私有草稿中准备全部商品/booking，异步等待后及原子发布前重新调用。
+     * 门禁须校验当前订单身份/版本和真实时间；发布前不会因本次拆行改变订单版本。
+     * 不传时保留原有人工加购行为。
+     */
+    availabilityCommitGuard?: () => void;
+    /** 发布后的订单/业务归属检查；只用于阻止旧异步收尾写入新单，不再校验截止或 revision。 */
+    availabilityCommitTargetGuard?: () => boolean;
 }
 /**
  * 删除商品后的可选位置保持策略。

package/dist/modules/Order/utils.d.ts

@@ -121,8 +121,9 @@ export declare function getBundleSellingMagnitude(bundle: Record<string, any> |
  *   = `metadata.main_product_original_price` + Σ(bundle 原价 × num)。
  * - `metadata.source_product_price`：主商品/variant 基础价（已应用报价单），不含 option、
  *   不含折扣。**权威源**。
- * - `metadata.main_product_original_price` = source + Σ(option.price × option.num)（含 option、不含折扣）。
- * - `metadata.main_product_selling_price` = main_original − 主商品券 per-unit amount（含 option、含折扣）。
+ * - `product_sku.option[].add_price` 保留单规格折前单价；Rules 的 option.price 只用于本次计算。
+ * - `metadata.main_product_original_price` = source + Σ(option.add_price × option.num)（含 option、不含折扣）。
+ * - `metadata.main_product_selling_price` = main_original − 行内 per-unit amount（含主商品及 option 优惠）。
  * - `payment_price`：出站 payload 中为行 composite 已减整单折扣均摊价（无折扣时与 `selling_price` 同义）。
  *
  * Rules 钩子契约（hook_adapt 方案，Rules 内部保持不变）：
@@ -131,8 +132,9 @@ export declare function getBundleSellingMagnitude(bundle: Record<string, any> |
  *   `getProductOriginTotalPrice` 会自行叠加 option + bundle，喂 source 可避免 option 双加。
  * - `getProduct.total` = `selling_price × num`（行 composite × num），与 Rules 内部产出的
  *   total（source + option + bundle）对齐。
+ * - `getProduct.options` 用单规格原价参与重算；主商品折后价从 main_selling 减去 option 折后合计反推。
  * - `setProduct` 反向流程：把 Rules 返回的 source-level `main_product_selling_price` / `price`
- *   加回 Σoptions，重新合成含 option 的 main_product_* 并派生 composite。
+ *   加回单规格原价合计，再减去 optionDiscountAmount；保留订单单规格原价供取消折扣及后续重算。
  *   优先级：
  *     1. `values.main_product_selling_price`（券应用分支，per-unit 券后 source-level 主价）
  *     2. `values.price`（还原分支 `restoredPrice`、good_pass 归零）

package/dist/modules/Order/utils.js

@@ -588,8 +588,9 @@ export function getBundleSellingMagnitude(bundle) {
  *   = `metadata.main_product_original_price` + Σ(bundle 原价 × num)。
  * - `metadata.source_product_price`：主商品/variant 基础价（已应用报价单），不含 option、
  *   不含折扣。**权威源**。
- * - `metadata.main_product_original_price` = source + Σ(option.price × option.num)（含 option、不含折扣）。
- * - `metadata.main_product_selling_price` = main_original − 主商品券 per-unit amount（含 option、含折扣）。
+ * - `product_sku.option[].add_price` 保留单规格折前单价；Rules 的 option.price 只用于本次计算。
+ * - `metadata.main_product_original_price` = source + Σ(option.add_price × option.num)（含 option、不含折扣）。
+ * - `metadata.main_product_selling_price` = main_original − 行内 per-unit amount（含主商品及 option 优惠）。
  * - `payment_price`：出站 payload 中为行 composite 已减整单折扣均摊价（无折扣时与 `selling_price` 同义）。
  *
  * Rules 钩子契约（hook_adapt 方案，Rules 内部保持不变）：
@@ -598,8 +599,9 @@ export function getBundleSellingMagnitude(bundle) {
  *   `getProductOriginTotalPrice` 会自行叠加 option + bundle，喂 source 可避免 option 双加。
  * - `getProduct.total` = `selling_price × num`（行 composite × num），与 Rules 内部产出的
  *   total（source + option + bundle）对齐。
+ * - `getProduct.options` 用单规格原价参与重算；主商品折后价从 main_selling 减去 option 折后合计反推。
  * - `setProduct` 反向流程：把 Rules 返回的 source-level `main_product_selling_price` / `price`
- *   加回 Σoptions，重新合成含 option 的 main_product_* 并派生 composite。
+ *   加回单规格原价合计，再减去 optionDiscountAmount；保留订单单规格原价供取消折扣及后续重算。
  *   优先级：
  *     1. `values.main_product_selling_price`（券应用分支，per-unit 券后 source-level 主价）
  *     2. `values.price`（还原分支 `restoredPrice`、good_pass 归零）
@@ -822,6 +824,15 @@ export function createDefaultOrderRulesHooks(getBookings) {
     var effectiveNum = Number(num) > 0 ? Number(num) : 1;
     return new Decimal(Number(totalLike) || 0).dividedBy(effectiveNum).toDecimalPlaces(2).toString();
   };
+
+  // optionDiscountAmount 已是每件主商品内的单规格优惠合计，不再乘商品数量。
+  var getOptionDiscountAmount = function getOptionDiscountAmount(discountList) {
+    return (discountList || []).reduce(function (total, discount) {
+      var _discount$metadata, _discount$metadata2;
+      if (discount !== null && discount !== void 0 && (_discount$metadata = discount.metadata) !== null && _discount$metadata !== void 0 && _discount$metadata.custom_product_bundle_map_id) return total;
+      return total.plus(Number(discount === null || discount === void 0 || (_discount$metadata2 = discount.metadata) === null || _discount$metadata2 === void 0 ? void 0 : _discount$metadata2.optionDiscountAmount) || 0);
+    }, new Decimal(0));
+  };
   var getBundleIdentity = function getBundleIdentity(bundle) {
     var _ref21, _bundle$bundle_id, _ref22, _ref23, _bundle$bundle_produc, _ref24, _ref25, _bundle$bundle_varian, _ref26, _bundle$bundle_group_;
     return [(_ref21 = (_bundle$bundle_id = bundle.bundle_id) !== null && _bundle$bundle_id !== void 0 ? _bundle$bundle_id : bundle.id) !== null && _ref21 !== void 0 ? _ref21 : '', (_ref22 = (_ref23 = (_bundle$bundle_produc = bundle.bundle_product_id) !== null && _bundle$bundle_produc !== void 0 ? _bundle$bundle_produc : bundle._bundle_product_id) !== null && _ref23 !== void 0 ? _ref23 : bundle.product_id) !== null && _ref22 !== void 0 ? _ref22 : '', (_ref24 = (_ref25 = (_bundle$bundle_varian = bundle.bundle_variant_id) !== null && _bundle$bundle_varian !== void 0 ? _bundle$bundle_varian : bundle.variant_id) !== null && _ref25 !== void 0 ? _ref25 : bundle.product_variant_id) !== null && _ref24 !== void 0 ? _ref24 : 0, (_ref26 = (_bundle$bundle_group_ = bundle.bundle_group_id) !== null && _bundle$bundle_group_ !== void 0 ? _bundle$bundle_group_ : bundle.group_id) !== null && _ref26 !== void 0 ? _ref26 : ''].join('|');
@@ -859,12 +870,14 @@ export function createDefaultOrderRulesHooks(getBookings) {
       var _product$metadata7, _product$metadata8, _product$metadata9, _metadataAny$_promoti;
       // source_product_price 是权威源；兜底链：source → mainSelling − options（反推）→ 行 selling_price
       var metadataAny = product.metadata || {};
-      var optionSum = sumOptionUnitPrice(getProductSkuOptions(product));
+      var productOptions = getProductSkuOptions(product);
+      var optionSum = sumOptionUnitPrice(productOptions);
+      var optionSellingSum = optionSum.minus(getOptionDiscountAmount(product.discount_list));
       var sourcePrice;
       if (metadataAny.source_product_price !== undefined) {
         sourcePrice = String(metadataAny.source_product_price);
       } else if (metadataAny.main_product_selling_price !== undefined) {
-        sourcePrice = new Decimal(Number(metadataAny.main_product_selling_price) || 0).minus(optionSum).toDecimalPlaces(2).toString();
+        sourcePrice = new Decimal(Number(metadataAny.main_product_selling_price) || 0).minus(optionSellingSum).toDecimalPlaces(2).toString();
       } else {
         var _product$selling_pric;
         sourcePrice = String((_product$selling_pric = product.selling_price) !== null && _product$selling_pric !== void 0 ? _product$selling_pric : 0);
@@ -895,6 +908,12 @@ export function createDefaultOrderRulesHooks(getBookings) {
         num: product.num || 1,
         discount_list: product.discount_list || [],
         bundle: product.product_bundle || [],
+        // 仅在 Rules 入参中映射 price，避免折后价污染订单的 add_price。
+        options: productOptions.map(function (option) {
+          return _objectSpread(_objectSpread({}, option), {}, {
+            price: option.add_price
+          });
+        }),
         booking_id: ((_product$metadata8 = product.metadata) === null || _product$metadata8 === void 0 ? void 0 : _product$metadata8.booking_id) || null,
         isClient: false,
         // 勿写死 false：否则 Rules 不会走 total≠origin_total 的手动价推断，
@@ -902,20 +921,22 @@ export function createDefaultOrderRulesHooks(getBookings) {
         isManualDiscount: resolveRulesManualDiscountFlag(metadataAny),
         holder_id: (_product$metadata9 = product.metadata) === null || _product$metadata9 === void 0 ? void 0 : _product$metadata9.holder_id,
         startDate: getProductStartDate(product),
-        main_product_selling_price: metadataAny.main_product_selling_price !== undefined ? new Decimal(Number(metadataAny.main_product_selling_price) || 0).minus(optionSum).toDecimalPlaces(2).toString() : undefined,
+        main_product_selling_price: metadataAny.main_product_selling_price !== undefined ? new Decimal(Number(metadataAny.main_product_selling_price) || 0).minus(optionSellingSum).toDecimalPlaces(2).toString() : undefined,
         inPromotion: ((_metadataAny$_promoti = metadataAny._promotion) === null || _metadataAny$_promoti === void 0 ? void 0 : _metadataAny$_promoti.inPromotion) === true,
         _promotion: metadataAny._promotion
       };
     },
     setProduct: function setProduct(product, values) {
-      var _ref32, _values$quantity, _ref33, _metadataAny$source_p, _product$product_sku, _values$discount_list, _values$quantity2;
+      var _ref32, _values$quantity, _ref33, _metadataAny$source_p, _values$discount_list, _product$product_sku, _values$quantity2;
       var nextNum = Number((_ref32 = (_values$quantity = values.quantity) !== null && _values$quantity !== void 0 ? _values$quantity : product.num) !== null && _ref32 !== void 0 ? _ref32 : 1) || 1;
       var metadataAny = product.metadata || {};
       var existedSource = (_ref33 = (_metadataAny$source_p = metadataAny.source_product_price) !== null && _metadataAny$source_p !== void 0 ? _metadataAny$source_p : product.selling_price) !== null && _ref33 !== void 0 ? _ref33 : '0';
       var nextOptions = getProductSkuOptions(product);
       var optionSum = sumOptionUnitPrice(nextOptions);
+      var nextDiscountList = (_values$discount_list = values.discount_list) !== null && _values$discount_list !== void 0 ? _values$discount_list : product.discount_list;
+      var optionSellingSum = optionSum.minus(getOptionDiscountAmount(nextDiscountList));
 
-      // Rules 返回的 main_product_selling_price / price / total 均为 source-level。
+      // Rules 返回的 main_product_selling_price / price 为不含 option 的主商品价。
       // 优先级：main_product_selling_price（per-unit 券后 source）> price（还原/good_pass 分支）>
       // total/num（仅当 Rules 只给 total 时的兜底）> 保留当前 source。
       var nextSourceSellingPrice = values.main_product_selling_price !== undefined ? String(values.main_product_selling_price) : values.price !== undefined ? String(values.price) : values.total !== undefined ? toUnitPriceString(values.total, nextNum) : String(existedSource);
@@ -924,8 +945,8 @@ export function createDefaultOrderRulesHooks(getBookings) {
       // 缺省时保留现有 source（券前 = 当前 source）。
       var nextSourceOriginalPrice = values.original_price !== undefined ? String(values.original_price) : String(existedSource);
 
-      // 含 option 的 main_product_*
-      var nextMainSellingPrice = new Decimal(Number(nextSourceSellingPrice) || 0).plus(optionSum).toDecimalPlaces(2).toFixed(2);
+      // 成交价只加回 option 折后合计；原价仍使用订单中保存的 option 原价。
+      var nextMainSellingPrice = new Decimal(Number(nextSourceSellingPrice) || 0).plus(optionSellingSum).toDecimalPlaces(2).toFixed(2);
       var nextMainOriginalPrice = new Decimal(Number(nextSourceOriginalPrice) || 0).plus(optionSum).toDecimalPlaces(2).toFixed(2);
       var nextBundle = values.bundle !== undefined ? mergeRulesBundlePrices(product.product_bundle, values.bundle) : product.product_bundle;
       var composedSellingPrice = composeLinePrice({
@@ -945,7 +966,7 @@ export function createDefaultOrderRulesHooks(getBookings) {
       return _objectSpread(_objectSpread({}, product), {}, {
         selling_price: composedSellingPrice,
         original_price: finalOriginalPrice,
-        discount_list: (_values$discount_list = values.discount_list) !== null && _values$discount_list !== void 0 ? _values$discount_list : product.discount_list,
+        discount_list: nextDiscountList,
         num: (_values$quantity2 = values.quantity) !== null && _values$quantity2 !== void 0 ? _values$quantity2 : product.num,
         product_bundle: nextBundle,
         metadata: _objectSpread(_objectSpread({}, metadataAny), {}, {

package/dist/modules/ResourcePlanner/planner.d.ts

@@ -1,5 +1,7 @@
 import type { AvailabilityProjection, AvailabilityProjectionInput, AvailabilityQuery, AvailabilityQueryResult, AvailabilitySelectionValidationParams, AvailabilitySelectionValidationResult, GetProductTimeRangesRequest, GetProductTimeRangesRuntimeOptions, ProductTimeRangeGroup } from './types';
 export declare function createAvailabilityProjection(input: AvailabilityProjectionInput): AvailabilityProjection;
+/** Resolve the label without changing the real calendar timestamp. */
+export declare function getDurationBusinessDate(projection: AvailabilityProjection, startAt: string): string;
 export declare function getProductTimeRanges(projection: AvailabilityProjection, request?: GetProductTimeRangesRequest, runtimeOptions?: GetProductTimeRangesRuntimeOptions): ProductTimeRangeGroup[];
 export declare function queryAvailabilityProjection(projection: AvailabilityProjection, request: AvailabilityQuery, runtimeOptions?: GetProductTimeRangesRuntimeOptions): AvailabilityQueryResult;
 export declare function validateAvailabilitySelection(projection: AvailabilityProjection, params: AvailabilitySelectionValidationParams, runtimeOptions?: GetProductTimeRangesRuntimeOptions): AvailabilitySelectionValidationResult;

package/dist/modules/ResourcePlanner/planner.js

@@ -1,4 +1,8 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -263,6 +267,18 @@ function evaluateCandidateTimeGate(params) {
     };
   }
   var policy = product.cutOffPolicy;
+  // Current duration items can be shown outside business hours. Their real
+  // interval must remain unavailable, including products with no resource groups.
+  if (evaluationContext.useDurationTimeGrid && product.kind === 'duration' && !projection.meta.defaults.operatingHours.windows.some(function (window) {
+    var range = normalizeAbsoluteRange(window);
+    return range && contains(range, candidateRange);
+  })) {
+    return {
+      status: 'unavailable',
+      reasonCodes: ['outside_operating_hours'],
+      conflictCode: 'booking_cutoff'
+    };
+  }
   if (!policy) return null;
   if (resolveCutOffPolicyIssue(policy)) {
     return {
@@ -299,8 +315,8 @@ function evaluateCandidateTimeGate(params) {
     // otherwise a minute refresh turns it into 0 capacity and incorrectly
     // advances a create flow to the next slot. The earlier `past` gate still
     // rejects the anchor once its booking range has ended.
-    var isActivePosDurationAnchor = evaluationContext.useExactDurationCandidateMinute && product.kind === 'duration' && !product.isFlexibleDuration && evaluationContext.durationCandidateAnchorAtMs === candidateRange.start;
-    var usesMinutePrecision = product.isFlexibleDuration || evaluationContext.useExactDurationCandidateMinute && product.kind === 'duration';
+    var isActivePosDurationAnchor = evaluationContext.useExactDurationCandidateMinute && !evaluationContext.enforceSaleCutoff && product.kind === 'duration' && !product.isFlexibleDuration && evaluationContext.durationCandidateAnchorAtMs === candidateRange.start;
+    var usesMinutePrecision = product.isFlexibleDuration || evaluationContext.useDurationTimeGrid || evaluationContext.useExactDurationCandidateMinute && product.kind === 'duration';
     var hasNotReachedStart = isActivePosDurationAnchor || (usesMinutePrecision ? floorToMinute(now) <= candidateRange.start : now < candidateRange.start);
     if (hasNotReachedStart) return null;
     return {
@@ -494,7 +510,7 @@ function normalizeResources(resources) {
   });
 }
 function normalizeOperatingHours(params) {
-  var _params$input, _params$input2, _params$input3, _params$input4;
+  var _params$input, _params$input2, _params$input3, _params$input4, _params$input5, _params$input6;
   var fallbackWindows = enumerateDates(params.dateRange.startDate, params.dateRange.endDate).map(function (date) {
     var start = toDateTimeInDate(date, params.businessHours.startTime, params.timezoneName);
     var end = toDateTimeInDate(date, params.businessHours.endTime, params.timezoneName);
@@ -530,11 +546,43 @@ function normalizeOperatingHours(params) {
   };
   var windows = normalizeWindows(sourceWindows);
   var excludedWindows = normalizeWindows(((_params$input = params.input) === null || _params$input === void 0 ? void 0 : _params$input.excludedWindows) || []);
+  // Keep original dates and opening anchors separately: the availability
+  // windows below may be clipped at midnight or merged without segment identity.
+  var periodMap = new Map();
+  var originalPeriods = ((_params$input2 = params.input) === null || _params$input2 === void 0 ? void 0 : _params$input2.businessPeriods) || [].concat(_toConsumableArray(sourceWindows), _toConsumableArray(((_params$input3 = params.input) === null || _params$input3 === void 0 ? void 0 : _params$input3.excludedWindows) || [])).map(function (window) {
+    return {
+      businessDate: window.businessDate || window.startAt.slice(0, 10),
+      startAt: window.openingAnchorAt || window.startAt,
+      endAt: window.endAt
+    };
+  });
+  originalPeriods.forEach(function (period) {
+    var range = normalizeAbsoluteRange(period);
+    if (!range) return;
+    var previous = periodMap.get(period.businessDate);
+    periodMap.set(period.businessDate, {
+      start: previous ? Math.min(previous.start, range.start) : range.start,
+      end: previous ? Math.max(previous.end, range.end) : range.end
+    });
+  });
+  var businessPeriods = Array.from(periodMap, function (_ref) {
+    var _ref2 = _slicedToArray(_ref, 2),
+      businessDate = _ref2[0],
+      range = _ref2[1];
+    return {
+      businessDate: businessDate,
+      startAt: formatDateTime(range.start, params.timezoneName, params.fixedOffsetMinutes),
+      endAt: formatDateTime(range.end, params.timezoneName, params.fixedOffsetMinutes)
+    };
+  }).sort(function (left, right) {
+    return left.startAt.localeCompare(right.startAt);
+  });
   return _objectSpread({
-    source: ((_params$input2 = params.input) === null || _params$input2 === void 0 ? void 0 : _params$input2.source) || params.fallbackSource,
-    scheduleIds: uniqById(((_params$input3 = params.input) === null || _params$input3 === void 0 ? void 0 : _params$input3.scheduleIds) || []),
-    missingScheduleIds: uniqById(((_params$input4 = params.input) === null || _params$input4 === void 0 ? void 0 : _params$input4.missingScheduleIds) || []),
-    windows: windows
+    source: ((_params$input4 = params.input) === null || _params$input4 === void 0 ? void 0 : _params$input4.source) || params.fallbackSource,
+    scheduleIds: uniqById(((_params$input5 = params.input) === null || _params$input5 === void 0 ? void 0 : _params$input5.scheduleIds) || []),
+    missingScheduleIds: uniqById(((_params$input6 = params.input) === null || _params$input6 === void 0 ? void 0 : _params$input6.missingScheduleIds) || []),
+    windows: windows,
+    businessPeriods: businessPeriods
   }, excludedWindows.length > 0 ? {
     excludedWindows: excludedWindows
   } : {});
@@ -553,8 +601,8 @@ function matchesRequirementGroup(requirementGroup, resource, product) {
   return resource.capacity >= resolveRequiredCapacity(requirementGroup, product, partySize);
 }
 function resolveRequiredCapacity(requirementGroup, product, partySize) {
-  var _ref, _ref2;
-  return Math.max(1, Number((_ref = (_ref2 = partySize !== null && partySize !== void 0 ? partySize : requirementGroup.capacityRequired) !== null && _ref2 !== void 0 ? _ref2 : product.capacityRequired) !== null && _ref !== void 0 ? _ref : 1) || 1);
+  var _ref3, _ref4;
+  return Math.max(1, Number((_ref3 = (_ref4 = partySize !== null && partySize !== void 0 ? partySize : requirementGroup.capacityRequired) !== null && _ref4 !== void 0 ? _ref4 : product.capacityRequired) !== null && _ref3 !== void 0 ? _ref3 : 1) || 1);
 }
 function buildCellKey(params) {
   return [String(params.productId), params.groupId, String(params.resourceId), params.start, params.end].join(':');
@@ -608,8 +656,8 @@ function buildCells(projection) {
           boundaries.add(window.start);
           boundaries.add(window.end);
         });
-        occupancies.forEach(function (_ref3) {
-          var range = _ref3.range;
+        occupancies.forEach(function (_ref5) {
+          var range = _ref5.range;
           boundaries.add(range.start);
           boundaries.add(range.end);
         });
@@ -627,11 +675,11 @@ function buildCells(projection) {
           var isInsideWorkingWindow = windows.some(function (window) {
             return contains(window, segment);
           });
-          var segmentOccupancies = isInsideWorkingWindow ? occupancies.filter(function (_ref4) {
-            var range = _ref4.range;
+          var segmentOccupancies = isInsideWorkingWindow ? occupancies.filter(function (_ref6) {
+            var range = _ref6.range;
             return overlaps(range, segment);
-          }).map(function (_ref5) {
-            var occupancy = _ref5.occupancy;
+          }).map(function (_ref7) {
+            var occupancy = _ref7.occupancy;
             return occupancy;
           }) : [];
           var usedCapacity = segmentOccupancies.reduce(function (sum, occupancy) {
@@ -1108,6 +1156,211 @@ function createDurationTimeRangeWithEnd(product, start, bookingEnd, projection,
     scheduleRefs: []
   };
 }
+
+/** Resolve the label without changing the real calendar timestamp. */
+export function getDurationBusinessDate(projection, startAt) {
+  var start = toDateTime(startAt);
+  var periods = projection.meta.defaults.operatingHours.businessPeriods || [];
+  var period = _toConsumableArray(periods).reverse().find(function (item) {
+    var range = normalizeAbsoluteRange(item);
+    return range && range.start <= start && start < range.end;
+  });
+  return (period === null || period === void 0 ? void 0 : period.businessDate) || startAt.slice(0, 10);
+}
+function getAlignedDurationRanges(params) {
+  var _request$rememberedSt, _request$editingStart;
+  var projection = params.projection,
+    product = params.product,
+    request = params.request,
+    runtimeOptions = params.runtimeOptions,
+    dateRange = params.dateRange,
+    operatingRanges = params.operatingRanges,
+    baseRanges = params.baseRanges,
+    resourceWindowIndex = params.resourceWindowIndex,
+    fixedOffsetMinutes = params.fixedOffsetMinutes;
+  var step = projection.meta.defaults.slotStepMinutes;
+  var now = floorToMinute(toDateTime(runtimeOptions.evaluatedAt || projection.meta.durationCandidateAnchorAt));
+  if (!Number.isFinite(now)) throw availabilityError('INVALID_TARGET_FILTER', 'evaluatedAt 必须是有效时间');
+  var nowAt = formatDateTime(now, projection.meta.timezone, fixedOffsetMinutes);
+  var currentBusinessDate = getDurationBusinessDate(projection, nowAt);
+  var inRequestedDays = function inRequestedDays(date) {
+    return date >= dateRange.startDate && date <= dateRange.endDate;
+  };
+  var periods = (projection.meta.defaults.operatingHours.businessPeriods || []).filter(function (period) {
+    return inRequestedDays(period.businessDate);
+  });
+  // A prepared month includes tomorrow's windows too; the single-day UI must
+  // receive the selected business cycle's end, not tomorrow's closing time.
+  var operatingEndAt = dateRange.startDate === dateRange.endDate && periods.length ? periods.reduce(function (latest, period) {
+    return period.endAt > latest ? period.endAt : latest;
+  }, periods[0].endAt) : undefined;
+  var ranges = [];
+  var duration = resolveRequestedDurationMinutes(product, request);
+  var addRange = function addRange(start, end, businessDate) {
+    if (end <= start) return;
+    var candidate = createDurationTimeRangeWithEnd(product, start, end, projection, fixedOffsetMinutes);
+    candidate.businessDate = businessDate || getDurationBusinessDate(projection, candidate.startAt);
+    if (inRequestedDays(candidate.businessDate)) ranges.push(candidate);
+  };
+  // A flexible end comes from resources that actually cover this exact start,
+  // never from the next future window. Keep alternative real ends separate.
+  var flexibleEnds = function flexibleEnds(start) {
+    var _projection$meta$defa;
+    var operating = operatingRanges.find(function (range) {
+      return range.start <= start && start < range.end;
+    });
+    if (!operating) return [];
+    var businessDate = getDurationBusinessDate(projection, formatDateTime(start, projection.meta.timezone, fixedOffsetMinutes));
+    var period = (_projection$meta$defa = projection.meta.defaults.operatingHours.businessPeriods) === null || _projection$meta$defa === void 0 ? void 0 : _projection$meta$defa.find(function (item) {
+      return item.businessDate === businessDate;
+    });
+    var operatingEnd = Math.min(operating.end, period ? toDateTime(period.endAt) : operating.end);
+    var requiredGroups = (product.requirementGroups || []).filter(function (group) {
+      return group.required !== false;
+    });
+    var groups = requiredGroups.map(function (group) {
+      return projection.resources.filter(function (resource) {
+        return matchesRequirementGroup(group, resource, product, request.partySize);
+      }).filter(function (resource) {
+        var _request$resourceIds;
+        return !((_request$resourceIds = request.resourceIds) !== null && _request$resourceIds !== void 0 && _request$resourceIds.length) || request.resourceIds.some(function (id) {
+          return sameId(id, resource.id);
+        });
+      }).flatMap(function (resource) {
+        return (resourceWindowIndex.get(String(resource.id)) || []).filter(function (range) {
+          return range.start <= start && start < range.end;
+        }).map(function (range) {
+          return Math.min(range.end, operatingEnd);
+        });
+      });
+    });
+    if (groups.some(function (ends) {
+      return ends.length === 0;
+    })) return [];
+    if (!groups.length) return [operatingEnd];
+    return Array.from(new Set(groups.flat())).filter(function (end) {
+      return groups.every(function (ends) {
+        return ends.some(function (availableEnd) {
+          return availableEnd >= end;
+        });
+      });
+    }).sort(function (left, right) {
+      return left - right;
+    });
+  };
+  if (product.isFlexibleDuration) {
+    // Preserve the existing continuous-window UI, with the business-day label.
+    periods.forEach(function (period) {
+      var periodRange = normalizeAbsoluteRange(period);
+      baseRanges.forEach(function (range) {
+        var start = Math.max(range.start, periodRange.start, now);
+        var end = Math.min(range.end, periodRange.end);
+        if (start < end) addRange(start, end, period.businessDate);
+      });
+    });
+  } else {
+    periods.forEach(function (period) {
+      var periodRange = normalizeAbsoluteRange(period);
+      var anchor = 60 % step === 0 ? toDateStart(period.businessDate) : periodRange.start;
+      baseRanges.forEach(function (range) {
+        var lower = Math.max(range.start, periodRange.start, now);
+        var upper = Math.min(range.end, periodRange.end);
+        var cursor = anchor + Math.ceil((lower - anchor) / (step * 60000)) * step * 60000;
+        for (; cursor + duration * 60000 <= upper; cursor += step * 60000) {
+          addRange(cursor, cursor + duration * 60000, period.businessDate);
+        }
+      });
+    });
+  }
+  var unavailableCurrentTime;
+  if (inRequestedDays(currentBusinessDate)) {
+    if (product.isFlexibleDuration) {
+      var ends = flexibleEnds(now);
+      ends.forEach(function (end) {
+        return addRange(now, end, currentBusinessDate);
+      });
+      if (!ends.length) {
+        unavailableCurrentTime = {
+          productId: product.id,
+          startAt: nowAt,
+          date: formatDate(now),
+          businessDate: currentBusinessDate,
+          startTime: formatTime(now),
+          status: 'unavailable',
+          reasonCodes: [operatingRanges.some(function (range) {
+            return range.start <= now && now < range.end;
+          }) ? 'outside_resource_window' : 'outside_operating_hours']
+        };
+      }
+    } else {
+      // Even outside a working window the fixed product has a real end. Query
+      // reports unavailable; POS manual capabilities remain a separate policy.
+      addRange(now, now + duration * 60000, currentBusinessDate);
+    }
+  }
+  var rememberedAt = (_request$rememberedSt = request.rememberedStartAtByProductId) === null || _request$rememberedSt === void 0 ? void 0 : _request$rememberedSt[String(product.id)];
+  if (rememberedAt !== undefined) {
+    var start = toDateTime(rememberedAt);
+    if (!Number.isFinite(start)) throw availabilityError('INVALID_TARGET_FILTER', '记忆开始时间必须是完整日期时间');
+    if (product.isFlexibleDuration) {
+      flexibleEnds(start).forEach(function (end) {
+        return addRange(start, end);
+      });
+    } else {
+      addRange(start, start + duration * 60000);
+    }
+  }
+  var editingAt = (_request$editingStart = request.editingStartAtByProductId) === null || _request$editingStart === void 0 ? void 0 : _request$editingStart[String(product.id)];
+  if (editingAt !== undefined) {
+    var _request$durationMinu3;
+    var _start = toDateTime(editingAt);
+    var editingDuration = Number((_request$durationMinu3 = request.durationMinutesByProductId) === null || _request$durationMinu3 === void 0 ? void 0 : _request$durationMinu3[String(product.id)]);
+    if (!Number.isFinite(_start) || !Number.isInteger(editingDuration) || editingDuration <= 0) {
+      throw availabilityError('INVALID_TARGET_FILTER', '编辑时间必须包含完整开始日期时间和明确的正整数时长');
+    }
+    // Editing restores the original interval, including its actual overnight
+    // date. It neither adopts the current grid nor recomputes a flexible end.
+    if (request.allowOutsideOperatingHoursForRequestedStartTimes || operatingRanges.some(function (range) {
+      return range.start <= _start && _start < range.end;
+    })) {
+      addRange(_start, addMinutesZoned(_start, editingDuration, projection.meta.timezone));
+    }
+  }
+
+  // Explicit custom input keeps its existing start + requested duration
+  // semantics. Remembered input above must never use this default-30 path.
+  if (dateRange.startDate === dateRange.endDate) {
+    resolveRequestedDurationStartTimes(product, request).forEach(function (startTime) {
+      var sameDayStart = toDateTimeInDate(dateRange.startDate, startTime);
+      var period = periods.find(function (item) {
+        return item.businessDate === dateRange.startDate;
+      });
+      var periodRange = period ? normalizeAbsoluteRange(period) : null;
+      var nextDayStart = addLocalCalendarDays(sameDayStart, 1);
+      // HH:mm is entered within a selected business day, whose early hours
+      // may belong to the next calendar day. Do not move other out-of-hours
+      // manual input to tomorrow merely because the business closes overnight.
+      var start = periodRange && !(periodRange.start <= sameDayStart && sameDayStart < periodRange.end) && periodRange.start <= nextDayStart && nextDayStart < periodRange.end ? nextDayStart : sameDayStart;
+      if (request.allowOutsideOperatingHoursForRequestedStartTimes || operatingRanges.some(function (range) {
+        return range.start <= start && start < range.end;
+      })) {
+        addRange(start, start + duration * 60000);
+      }
+    });
+  }
+  return _objectSpread(_objectSpread({
+    productId: product.id,
+    title: product.title,
+    kind: product.kind,
+    slotStepMinutes: step
+  }, operatingEndAt ? {
+    operatingEndAt: operatingEndAt
+  } : {}), {}, {
+    ranges: dedupeProductRanges(ranges)
+  }, unavailableCurrentTime ? {
+    unavailableCurrentTime: unavailableCurrentTime
+  } : {});
+}
 export function getProductTimeRanges(projection) {
   var _extractFixedOffsetMi3, _request$productIds;
   var request = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
@@ -1173,6 +1426,19 @@ export function getProductTimeRanges(projection) {
       return current === null ? ranges : intersectRangeLists(current, ranges);
     }, null) || [] : null;
     var baseRanges = resourceRanges === null ? operatingRanges : intersectRangeLists(resourceRanges, operatingRanges);
+    if (runtimeOptions.useDurationTimeGrid) {
+      return getAlignedDurationRanges({
+        projection: projection,
+        product: product,
+        request: request,
+        runtimeOptions: runtimeOptions,
+        dateRange: dateRange,
+        operatingRanges: operatingRanges,
+        baseRanges: baseRanges,
+        resourceWindowIndex: resourceWindowIndex,
+        fixedOffsetMinutes: fixedOffsetMinutes
+      });
+    }
     var durationMinutes = resolveRequestedDurationMinutes(product, request);
     var flexibleStartAt = function () {
       if (!product.isFlexibleDuration) return undefined;
@@ -1454,7 +1720,9 @@ function buildEvaluationContext(params) {
     selectionsByGroupKey: selectionsByGroupKey,
     useExactDurationCandidateMinute: params.useExactDurationCandidateMinute === true,
     durationCandidateAnchorAtMs: Number.isFinite(durationCandidateAnchorAt) ? floorToMinute(durationCandidateAnchorAt) : null,
-    allowExcludedScheduleDateOverride: params.allowExcludedScheduleDateOverride === true
+    allowExcludedScheduleDateOverride: params.allowExcludedScheduleDateOverride === true,
+    useDurationTimeGrid: params.useDurationTimeGrid === true,
+    enforceSaleCutoff: params.enforceSaleCutoff === true
   };
 }
 function summarizeStatuses(statuses) {
@@ -1504,7 +1772,7 @@ function summarizeStatusAggregate(aggregate) {
   return 'unavailable';
 }
 function evaluateMatchedResourceSummary(params) {
-  var _ref6, _params$matchedCell$m;
+  var _ref8, _params$matchedCell$m;
   var isPast = params.candidateRange.endMs <= params.evaluationContext.evaluatedAtMs;
   if (!params.matchedCell) {
     return {
@@ -1516,7 +1784,7 @@ function evaluateMatchedResourceSummary(params) {
     };
   }
   var remainingCapacity = Math.max(0, params.matchedCell.remainingCapacity || 0);
-  var maxCapacity = Math.max(0, (_ref6 = (_params$matchedCell$m = params.matchedCell.maxCapacity) !== null && _params$matchedCell$m !== void 0 ? _params$matchedCell$m : params.resourceCapacity) !== null && _ref6 !== void 0 ? _ref6 : 0);
+  var maxCapacity = Math.max(0, (_ref8 = (_params$matchedCell$m = params.matchedCell.maxCapacity) !== null && _params$matchedCell$m !== void 0 ? _params$matchedCell$m : params.resourceCapacity) !== null && _ref8 !== void 0 ? _ref8 : 0);
   var maxPartySize = isPast ? 0 : remainingCapacity;
   var status = function () {
     if (isPast) return 'past';
@@ -1942,6 +2210,8 @@ export function queryAvailabilityProjection(projection, request) {
     projection: projection,
     evaluatedAt: evaluatedAt,
     resourceIds: request.resourceIds,
+    useDurationTimeGrid: runtimeOptions.useDurationTimeGrid,
+    enforceSaleCutoff: runtimeOptions.enforceSaleCutoff,
     useExactDurationCandidateMinute: runtimeOptions.useExactDurationCandidateMinute,
     allowExcludedScheduleDateOverride: runtimeOptions.allowExcludedScheduleDateOverride
   });
@@ -2032,6 +2302,8 @@ export function queryAvailabilityProjection(projection, request) {
     partySize: normalizedPartySize
   }, {
     evaluatedAt: evaluatedAt,
+    useDurationTimeGrid: runtimeOptions.useDurationTimeGrid,
+    enforceSaleCutoff: runtimeOptions.enforceSaleCutoff,
     useExactDurationCandidateMinute: runtimeOptions.useExactDurationCandidateMinute,
     allowExcludedScheduleDateOverride: runtimeOptions.allowExcludedScheduleDateOverride
   });
@@ -2060,7 +2332,8 @@ export function queryAvailabilityProjection(projection, request) {
           candidateRangeCache: candidateRangeCache,
           evaluationContext: evaluationContext
         });
-        var aggregate = byDate.get(candidate.date) || {
+        var candidateDate = runtimeOptions.useDurationTimeGrid ? candidate.businessDate || candidate.date : candidate.date;
+        var aggregate = byDate.get(candidateDate) || {
           availableCount: 0,
           totalCount: 0,
           maxPartySize: 0,
@@ -2080,8 +2353,26 @@ export function queryAvailabilityProjection(projection, request) {
         evaluated.reasonCodes.forEach(function (reasonCode) {
           return aggregate.reasonCodeSet.add(reasonCode);
         });
-        byDate.set(candidate.date, aggregate);
+        byDate.set(candidateDate, aggregate);
       });
+      if (group.unavailableCurrentTime) {
+        var current = group.unavailableCurrentTime;
+        var aggregate = byDate.get(current.businessDate) || {
+          availableCount: 0,
+          totalCount: 0,
+          maxPartySize: 0,
+          remainingCapacity: 0,
+          maxCapacity: 0,
+          reasonCodeSet: new Set(),
+          statusAggregate: createStatusAggregate()
+        };
+        aggregate.totalCount += 1;
+        pushStatusAggregate(aggregate.statusAggregate, 'unavailable');
+        current.reasonCodes.forEach(function (reason) {
+          return aggregate.reasonCodeSet.add(reason);
+        });
+        byDate.set(current.businessDate, aggregate);
+      }
       var dates = enumerateDates(dateRange.startDate, dateRange.endDate).map(function (date) {
         var aggregate = byDate.get(date);
         return {
@@ -2143,10 +2434,22 @@ export function queryAvailabilityProjection(projection, request) {
       evaluated.reasonCodes.forEach(function (reasonCode) {
         return productReasonCodeSet.add(reasonCode);
       });
-      var dateAggregate = dateStatusMap.get(candidate.date) || createStatusAggregate();
+      var candidateDate = runtimeOptions.useDurationTimeGrid ? candidate.businessDate || candidate.date : candidate.date;
+      var dateAggregate = dateStatusMap.get(candidateDate) || createStatusAggregate();
       pushStatusAggregate(dateAggregate, evaluated.status);
-      dateStatusMap.set(candidate.date, dateAggregate);
+      dateStatusMap.set(candidateDate, dateAggregate);
     });
+    if (group.unavailableCurrentTime) {
+      var current = group.unavailableCurrentTime;
+      totalTimeCount += 1;
+      pushStatusAggregate(productStatusAggregate, 'unavailable');
+      current.reasonCodes.forEach(function (reason) {
+        return productReasonCodeSet.add(reason);
+      });
+      var dateAggregate = dateStatusMap.get(current.businessDate) || createStatusAggregate();
+      pushStatusAggregate(dateAggregate, 'unavailable');
+      dateStatusMap.set(current.businessDate, dateAggregate);
+    }
     var availableDateCount = Array.from(dateStatusMap.values()).filter(function (aggregate) {
       var status = summarizeStatusAggregate(aggregate);
       return status === 'available' || status === 'limited';
@@ -2233,6 +2536,8 @@ export function validateAvailabilitySelection(projection, params) {
       projection: projection,
       evaluatedAt: evaluatedAt,
       requirementSelections: params.requirementSelections,
+      useDurationTimeGrid: runtimeOptions.useDurationTimeGrid,
+      enforceSaleCutoff: runtimeOptions.enforceSaleCutoff,
       useExactDurationCandidateMinute: runtimeOptions.useExactDurationCandidateMinute,
       allowExcludedScheduleDateOverride: runtimeOptions.allowExcludedScheduleDateOverride
     })