@pisell/pisellos 0.0.500 → 0.0.502

package/lib/solution/ScanOrder/utils.d.ts

@@ -1,6 +1,7 @@
 import { ScanOrderOrderProduct, ScanOrderOrderProductIdentity, ScanOrderSummary, ScanOrderTempOrder } from './types';
 import type { CartItemSummary, ItemRuleBusinessData, PaxInfo, QuantityLimitResult } from '../../model/strategy/adapter/itemRule';
 import type { StrategyConfig } from '../../model/strategy/type';
+import type { ProductData } from '../../modules/Product/types';
 /**
  * 构建金额全为 0 的空 summary。
  * 作为尚未计算金额时的兜底默认值，避免下游因 undefined 报错。
@@ -58,8 +59,15 @@ export declare function resolveSkuMatchedQuantityLimits(params: {
 export declare function aggregateItemRuleLimit(matchedLimits: QuantityLimitResult[]): {
     min: number | undefined;
     max: number | undefined;
+    remainingMax: number | undefined;
     exact: number | undefined;
     mustInclude: boolean;
+    validationMessage: string | undefined;
+    rawValidationMessage: string | Record<string, string> | undefined;
+    maxValidationMessage: string | undefined;
+    rawMaxValidationMessage: string | Record<string, string> | undefined;
+    minValidationMessage: string | undefined;
+    rawMinValidationMessage: string | Record<string, string> | undefined;
 } | null;
 export declare function buildItemRuleBusinessData(params: {
     tempOrder: ScanOrderTempOrder;
@@ -91,3 +99,21 @@ export declare function getProductIdentityIndex(products: ScanOrderOrderProduct[
  * - 保留 _origin 供后续业务流程（如促销规则）使用
  */
 export declare function normalizeOrderProduct(product: Partial<ScanOrderOrderProduct> & ScanOrderOrderProductIdentity): ScanOrderOrderProduct;
+/**
+ * 从 reservation.enabled_reservation_rules 中收集 type=link 的商品 id。
+ */
+export declare function collectLinkProductIdsFromReservationRules(rules: unknown): number[];
+/**
+ * 返回列表中第一个带有效 duration.value（分钟）的商品时长。
+ */
+export declare function pickFirstDurationMinutesFromProducts(products: ProductData[]): number | undefined;
+/** 是否存在 capacity.type === 'custom' 的商品 */
+export declare function hasCustomCapacityProduct(products: ProductData[]): boolean;
+/**
+ * 在商品列表中找到第一个 `capacity.type === 'custom'` 的商品，取其 `custom` 数组第一项的 min/max。
+ * 仅返回有限数字字段；若均无法解析则返回 `undefined`。
+ */
+export declare function pickFirstCustomCapacityPaxBounds(products: ProductData[]): {
+    min?: number;
+    max?: number;
+} | undefined;

package/lib/solution/ScanOrder/utils.js

@@ -24,16 +24,20 @@ __export(utils_exports, {
   buildItemRuleBusinessData: () => buildItemRuleBusinessData,
   buildProductKey: () => buildProductKey,
   buildQuantityLimitIndex: () => buildQuantityLimitIndex,
+  collectLinkProductIdsFromReservationRules: () => collectLinkProductIdsFromReservationRules,
   createEmptySummary: () => createEmptySummary,
   extractStrategyModelIdsFromTableConfig: () => extractStrategyModelIdsFromTableConfig,
   getProductIdentityIndex: () => getProductIdentityIndex,
   getSafeProductNum: () => getSafeProductNum,
   getTopLevelProductId: () => getTopLevelProductId,
   getTopLevelVariantId: () => getTopLevelVariantId,
+  hasCustomCapacityProduct: () => hasCustomCapacityProduct,
   isIdentityMatch: () => isIdentityMatch,
   normalizeEnabledItemRuleIds: () => normalizeEnabledItemRuleIds,
   normalizeItemRuleStrategies: () => normalizeItemRuleStrategies,
   normalizeOrderProduct: () => normalizeOrderProduct,
+  pickFirstCustomCapacityPaxBounds: () => pickFirstCustomCapacityPaxBounds,
+  pickFirstDurationMinutesFromProducts: () => pickFirstDurationMinutesFromProducts,
   resolveSkuMatchedQuantityLimits: () => resolveSkuMatchedQuantityLimits,
   toBoolean: () => toBoolean,
   toNonNegativeInt: () => toNonNegativeInt,
@@ -160,18 +164,20 @@ function buildQuantityLimitIndex(limits) {
   const exactLimitMap = /* @__PURE__ */ new Map();
   const productLimitMap = /* @__PURE__ */ new Map();
   for (const limit of limits) {
-    for (const target of limit.targets || []) {
-      const productId = Number(target.product_id);
-      if (!Number.isFinite(productId) || productId <= 0)
-        continue;
-      const variantId = Number(target.product_variant_id);
-      const hasVariant = Number.isFinite(variantId) && variantId > 0;
-      if (hasVariant) {
-        const exactKey = buildProductKey(productId, variantId);
-        const existed2 = exactLimitMap.get(exactKey) || [];
-        exactLimitMap.set(exactKey, [...existed2, limit]);
-        continue;
-      }
+    const targets = limit.targets || [];
+    if (targets.length !== 1)
+      continue;
+    const target = targets[0];
+    const productId = Number(target.product_id);
+    if (!Number.isFinite(productId) || productId <= 0)
+      continue;
+    const variantId = Number(target.product_variant_id);
+    const hasVariant = Number.isFinite(variantId) && variantId > 0;
+    if (hasVariant) {
+      const exactKey = buildProductKey(productId, variantId);
+      const existed = exactLimitMap.get(exactKey) || [];
+      exactLimitMap.set(exactKey, [...existed, limit]);
+    } else {
       const existed = productLimitMap.get(productId) || [];
       productLimitMap.set(productId, [...existed, limit]);
     }
@@ -192,29 +198,66 @@ function aggregateItemRuleLimit(matchedLimits) {
     return null;
   let min;
   let max;
+  let remainingMax;
   let exact;
   let mustInclude = false;
+  let maxSourceLimit;
+  let remainingMaxSourceLimit;
+  let exactSourceLimit;
+  let minSourceLimit;
+  let firstMessagedLimit;
   for (const limit of matchedLimits) {
     if (typeof limit.requiredMin === "number" && Number.isFinite(limit.requiredMin)) {
-      min = min === void 0 ? limit.requiredMin : Math.max(min, limit.requiredMin);
+      if (min === void 0 || limit.requiredMin > min) {
+        min = limit.requiredMin;
+        minSourceLimit = limit;
+      }
     }
     if (typeof limit.requiredMax === "number" && Number.isFinite(limit.requiredMax)) {
-      max = max === void 0 ? limit.requiredMax : Math.min(max, limit.requiredMax);
+      if (max === void 0 || limit.requiredMax < max) {
+        max = limit.requiredMax;
+        maxSourceLimit = limit;
+      }
+    }
+    if (typeof limit.remainingMax === "number" && Number.isFinite(limit.remainingMax)) {
+      if (remainingMax === void 0 || limit.remainingMax < remainingMax) {
+        remainingMax = limit.remainingMax;
+        remainingMaxSourceLimit = limit;
+      }
     }
     if (typeof limit.requiredExact === "number" && Number.isFinite(limit.requiredExact)) {
       exact = limit.requiredExact;
+      exactSourceLimit = limit;
     }
     mustInclude = mustInclude || Boolean(limit.mustInclude);
+    if (!firstMessagedLimit && limit.validationMessage) {
+      firstMessagedLimit = limit;
+    }
   }
   if (typeof exact === "number" && Number.isFinite(exact)) {
     min = exact;
     max = exact;
   }
+  const maxMessageSource = maxSourceLimit || remainingMaxSourceLimit || exactSourceLimit || firstMessagedLimit;
+  const minMessageSource = minSourceLimit || exactSourceLimit || firstMessagedLimit;
+  const maxValidationMessage = maxMessageSource == null ? void 0 : maxMessageSource.validationMessage;
+  const rawMaxValidationMessage = maxMessageSource == null ? void 0 : maxMessageSource.rawValidationMessage;
+  const minValidationMessage = minMessageSource == null ? void 0 : minMessageSource.validationMessage;
+  const rawMinValidationMessage = minMessageSource == null ? void 0 : minMessageSource.rawValidationMessage;
+  const validationMessage = maxValidationMessage ?? minValidationMessage;
+  const rawValidationMessage = rawMaxValidationMessage ?? rawMinValidationMessage;
   return {
     min,
     max,
+    remainingMax,
     exact,
-    mustInclude
+    mustInclude,
+    validationMessage,
+    rawValidationMessage,
+    maxValidationMessage,
+    rawMaxValidationMessage,
+    minValidationMessage,
+    rawMinValidationMessage
   };
 }
 function buildItemRuleBusinessData(params) {
@@ -294,13 +337,13 @@ function getProductIdentityIndex(products, identity) {
   return products.findIndex((item) => isIdentityMatch(item, identity));
 }
 function normalizeOrderProduct(product) {
-  var _a;
+  var _a, _b;
   const metadata = { ...product.metadata || {} };
   if (product.identity_key && !metadata.unique_identification_number) {
     metadata.unique_identification_number = product.identity_key;
   }
-  const resolvedOriginalPrice = product.original_price || "0.00";
   const resolvedSellingPrice = product.selling_price || "0.00";
+  const resolvedOriginalPrice = product.original_price || resolvedSellingPrice;
   if (metadata.main_product_original_price === void 0) {
     metadata.main_product_original_price = resolvedOriginalPrice;
   }
@@ -308,7 +351,7 @@ function normalizeOrderProduct(product) {
     metadata.main_product_selling_price = resolvedSellingPrice;
   }
   if (metadata.source_product_price === void 0) {
-    metadata.source_product_price = ((_a = product._origin) == null ? void 0 : _a.original_price) ?? resolvedOriginalPrice;
+    metadata.source_product_price = ((_a = product._origin) == null ? void 0 : _a.price) ?? ((_b = product._origin) == null ? void 0 : _b.base_price) ?? resolvedSellingPrice;
   }
   const normalizedBundle = (product.product_bundle || []).map((item) => ({
     ...item,
@@ -324,7 +367,6 @@ function normalizeOrderProduct(product) {
     product_option_item: product.product_option_item || [],
     selling_price: resolvedSellingPrice,
     original_price: resolvedOriginalPrice,
-    payment_price: product.payment_price || "0.00",
     tax_fee: product.tax_fee || "0.00",
     is_charge_tax: product.is_charge_tax ?? 0,
     discount_list: product.discount_list || [],
@@ -333,6 +375,69 @@ function normalizeOrderProduct(product) {
     _origin: product._origin
   };
 }
+function collectLinkProductIdsFromReservationRules(rules) {
+  if (!Array.isArray(rules))
+    return [];
+  const ids = [];
+  for (const entry of rules) {
+    if (!entry || typeof entry !== "object")
+      continue;
+    const rec = entry;
+    if (rec.type !== "link")
+      continue;
+    if (!Array.isArray(rec.value))
+      continue;
+    for (const v of rec.value) {
+      const n = Number(v);
+      if (Number.isFinite(n) && n > 0)
+        ids.push(Math.floor(n));
+    }
+  }
+  return [...new Set(ids)];
+}
+function pickFirstDurationMinutesFromProducts(products) {
+  var _a;
+  for (const product of products) {
+    const value = (_a = product == null ? void 0 : product.duration) == null ? void 0 : _a.value;
+    const n = Number(value);
+    if (Number.isFinite(n) && n > 0)
+      return Math.floor(n);
+  }
+  return void 0;
+}
+function hasCustomCapacityProduct(products) {
+  return products.some((p) => {
+    var _a;
+    return ((_a = p == null ? void 0 : p.capacity) == null ? void 0 : _a.type) === "custom";
+  });
+}
+function pickFirstCustomCapacityPaxBounds(products) {
+  for (const p of products) {
+    const cap = p == null ? void 0 : p.capacity;
+    if (!cap || cap.type !== "custom")
+      continue;
+    if (!Array.isArray(cap.custom) || cap.custom.length === 0)
+      continue;
+    const row = cap.custom[0];
+    if (!row || typeof row !== "object")
+      continue;
+    const raw = row;
+    const out = {};
+    if (raw.min !== null && raw.min !== void 0 && raw.min !== "") {
+      const min = Number(raw.min);
+      if (Number.isFinite(min))
+        out.min = min;
+    }
+    if (raw.max !== null && raw.max !== void 0 && raw.max !== "") {
+      const max = Number(raw.max);
+      if (Number.isFinite(max))
+        out.max = max;
+    }
+    if (out.min !== void 0 || out.max !== void 0)
+      return out;
+  }
+  return void 0;
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   aggregateItemRuleLimit,
@@ -340,16 +445,20 @@ function normalizeOrderProduct(product) {
   buildItemRuleBusinessData,
   buildProductKey,
   buildQuantityLimitIndex,
+  collectLinkProductIdsFromReservationRules,
   createEmptySummary,
   extractStrategyModelIdsFromTableConfig,
   getProductIdentityIndex,
   getSafeProductNum,
   getTopLevelProductId,
   getTopLevelVariantId,
+  hasCustomCapacityProduct,
   isIdentityMatch,
   normalizeEnabledItemRuleIds,
   normalizeItemRuleStrategies,
   normalizeOrderProduct,
+  pickFirstCustomCapacityPaxBounds,
+  pickFirstDurationMinutesFromProducts,
   resolveSkuMatchedQuantityLimits,
   toBoolean,
   toNonNegativeInt,

package/lib/solution/VenueBooking/index.d.ts

@@ -25,6 +25,7 @@ export declare class VenueBookingImpl extends BaseModule implements Module {
     private cacheId;
     private window;
     private request;
+    private baseSlotConfig;
     private itemRuleEvaluator;
     private itemRuleConfigs;
     private itemRuleConfigsPromise;
@@ -80,6 +81,9 @@ export declare class VenueBookingImpl extends BaseModule implements Module {
         startDate: string;
         endDate: string;
     }): Promise<void>;
+    private getOperatingHoursScheduleIds;
+    private resolveSlotConfigForDate;
+    private syncOperatingHoursToSlotConfig;
     getDateRangeSummary(params: {
         startDate: string;
         endDate: string;
@@ -88,25 +92,48 @@ export declare class VenueBookingImpl extends BaseModule implements Module {
     /**
      * 切换单个时段的选中状态（选中/取消）。
      * 内部自动处理连续时段的合并与拆分，订单是唯一真相源。
+     *
+     * slot.productId 指定当前操作针对的是该 resourceId 下的哪一个商品。
+     * 同一资源下不同 productId 之间互相隔离，不会相互合并。
      */
     toggleSlot(slot: VenueSlotSelection): Promise<ScanOrderOrderProduct[]>;
     /**
      * 获取某资源当前选中的所有独立时段（从订单中解析）。
+     * 不传 productId 时返回该资源下所有商品的选中时段；传了则精确匹配。
      */
-    getSelectedSlotsForResource(resourceId: number | string): VenueSlotSelection[];
+    getSelectedSlotsForResource(resourceId: number | string, productId?: number): VenueSlotSelection[];
+    /** getSelectedSlotsForResource 的 (resourceId, productId) 精确版，内部使用。 */
+    private getSelectedSlotsForResourceProduct;
     /**
      * 判断某个时段是否已选中。
+     * 不传 productId 时：只要该资源下任一商品在 startTime 被选中即返回 true；传了则精确匹配。
      */
-    isSlotSelected(resourceId: number | string, startTime: string): boolean;
+    isSlotSelected(resourceId: number | string, startTime: string, productId?: number): boolean;
     /**
-     * 获取所有已选时段（按资源分组）。
+     * 判断指定 (resourceId, productId, startTime) 格子是否应因其它已选项而被禁用。
+     * 规则：
+     * 1) 同一 resourceId 下若已选了另一个 productId 的同 startTime → 禁用
+     * 2) 当前 resource 是组合资源：若其任一 child resource 在 startTime 被选中 → 禁用
+     * 3) 当前 resource 是某些组合资源的 child：若该组合资源在 startTime 被选中 → 禁用
+     * 4) 两个组合资源的 child 集合有交集，且对方在该 startTime 被选中 → 禁用
+     */
+    isSlotDisabledBySelection(params: {
+        resourceId: number | string;
+        productId: number;
+        startTime: string;
+    }): boolean;
+    /**
+     * 获取所有已选时段（按资源分组）。每个 slot 上带 productId，便于 UI 做 per-product 判定。
      */
     getAllSelectedSlots(): Map<number | string, VenueSlotSelection[]>;
     /**
-     * 对指定资源的订单商品进行 reconcile：
+     * 对指定 (resourceId, productId) 的订单商品进行 reconcile：
      * 清除旧商品 → 合并连续时段 → 重新写入。
+     * 同一场地下不同商品互不干扰，各自单独 reconcile。
      */
-    private reconcileOrderForResource;
+    private reconcileOrderForResourceProduct;
+    /** 给定一个父 rawResource，返回其 combined_resource.resource_ids 对应的子 rawResource 列表。 */
+    private getCombinedChildRawResources;
     setSlotConfig(config: Partial<VenueBookingSlotConfig>): void;
     getSlotConfig(): VenueBookingSlotConfig;
     loadSchedules(): Promise<void>;
@@ -159,5 +186,15 @@ export declare class VenueBookingImpl extends BaseModule implements Module {
     private refreshCartValidationPassed;
     setItemRuleRuntimeConfig(config?: VenueBookingItemRuleRuntimeConfig): Promise<void>;
     getOtherParams(): Record<string, any>;
+    private static readonly UI_STATE_KEY_PREFIX;
+    private getUIStateBucketKey;
+    private readUIStateBucket;
+    private writeUIStateBucket;
+    setUIState(key: string, value: any): void;
+    getUIState<T = any>(key: string): T | undefined;
+    deleteUIState(key: string): void;
     checkOpenDataAvailability(): Promise<OpenDataAvailabilityResult>;
+    setOtherParams(params: Record<string, any>, { cover }?: {
+        cover?: boolean;
+    }): Promise<void>;
 }