@pisell/pisellos 2.1.128 → 2.1.130

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

@@ -1,4 +1,4 @@
-import { OrderModule, ProductList, SalesSummaryModule, ScanOrderLogInput, ScanOrderLoggerModule, ScanOrderLoggerProviderConfig, ScanOrderLoggerProviderType } from '../../modules';
+import { OrderModule, ProductList, SalesSummaryModule, ScanOrderLogInput, ScanOrderLoggerModule, ScanOrderLoggerProviderConfig, ScanOrderLoggerProviderType, ScheduleModule } from '../../modules';
 import type { QuantityCheckResult, QuantityLimitResult } from '../../model/strategy/adapter/itemRule';
 /**
  * 扫码下单流程 hook
@@ -114,6 +114,9 @@ export interface ScanOrderTempOrder {
     shop_discount: string;
     surcharge_fee: string;
     note: string;
+    buzzer?: string;
+    delivery_type?: string;
+    table_number?: Record<string, any>;
     schedule_date: string;
     created_at: string;
     products: ScanOrderOrderProduct[];
@@ -134,14 +137,15 @@ export interface ScanOrderSubmitPayload extends Omit<ScanOrderTempOrder, 'platfo
     request_unique_idempotency_token?: string;
     form_record_ids?: Array<{
         form_id: number | string;
-        form_record_ids: Array<number | string>;
+        form_record_id: number | string;
     }>;
     products: ScanOrderSubmitProduct[];
 }
-export type ScanOrderAvailabilityMode = 'idle' | 'shop_closed' | 'resource_block' | 'resource_busy' | 'additional_order_with_code' | 'additional_order';
+export type ScanOrderAvailabilityMode = 'idle' | 'shop_closed' | 'submit_disabled' | 'resource_busy' | 'additional_order_with_code' | 'additional_order';
 export interface ScanOrderTableFormRecord {
     policy?: string | null;
     partyroom_booking?: string | null;
+    capacity?: number | string | null;
     [key: string]: any;
 }
 export interface ScanOrderAvailabilityInfo {
@@ -151,7 +155,9 @@ export interface ScanOrderAvailabilityInfo {
     table_form_id?: string;
     deskmate_valid?: boolean;
     errorTips?: string;
-    /** `/order/dining/table/config` 返回的 `table_form_record` 原样透出 */
+    /** 透传 `availability.closed_behavior`，便于 UI 识别拦截类型（如 show_menu_disabled） */
+    closed_behavior?: string;
+    /** `/order/resource/occupy-detail` 返回的 `form_record` 原样透出 */
     table_form_record?: ScanOrderTableFormRecord | null;
     policy?: string | null;
     partyroom_booking?: string | null;
@@ -162,34 +168,36 @@ export interface ScanOrderAvailabilityInfo {
     /** 首个 `capacity.type === 'custom'` 商品里 `custom[0]` 的 max（人数上限） */
     requestPaxMax?: number;
 }
-export interface ScanOrderTableSnackConfig {
-    snack?: boolean | number | string;
-    table_validate?: boolean | number | string;
+/** `resource_capacity[i].capacity_list[j]` */
+export interface ScanOrderResourceCapacitySlot {
+    start_at?: string;
+    end_at?: string;
+    pax?: number | string;
 }
-export interface ScanOrderOrderNumberPrefixConfig {
-    table_order?: string;
-    pos?: string;
+export interface ScanOrderResourceCapacity {
+    capacity?: number | string;
+    capacity_list?: ScanOrderResourceCapacitySlot[];
 }
-export interface ScanOrderTableConfigApiData {
-    table_max_number?: number | string | null;
-    order_count?: number | string | null;
+/** `/order/resource/occupy-detail` 单条 `occupy_details[i]` */
+export interface ScanOrderResourceOccupyDetail {
+    form_record_id?: number | string | null;
+    form_id?: number | string | null;
     order_id?: number | string | null;
     last_order_id?: number | string | null;
-    relation_id?: number | string | null;
-    table_form_id?: number | string | null;
-    table_snack?: ScanOrderTableSnackConfig[] | null;
-    order_number_prefix?: ScanOrderOrderNumberPrefixConfig[] | null;
+    resource_capacity?: ScanOrderResourceCapacity[] | null;
+    form_record?: ScanOrderTableFormRecord | null;
     [key: string]: any;
 }
-export interface ScanOrderTableConfigApiResponse {
+export interface ScanOrderResourceOccupyDetailApiResponse {
     status?: boolean;
     code?: number;
     message?: string;
-    data?: ScanOrderTableConfigApiData | null;
+    data?: {
+        occupy_details?: ScanOrderResourceOccupyDetail[] | null;
+    } | null;
 }
+export type ScanOrderResourceSelectType = 'single' | 'multiple' | 'capacity';
 export interface ScanOrderResourceState extends ScanOrderAvailabilityInfo {
-    tableMaxNumber: number;
-    orderCount: number;
     relationId?: string;
     tableFormId?: string;
     currentOrderId?: string;
@@ -198,13 +206,14 @@ export interface ScanOrderResourceState extends ScanOrderAvailabilityInfo {
     deskmateValid: boolean;
     isExclusive: boolean;
     isFull: boolean;
-    orderNumberPrefix: ScanOrderOrderNumberPrefixConfig[];
-    raw: ScanOrderTableConfigApiData | null;
+    /** 来自首个预约规则商品 product_resource.resources 中与 form_id 匹配的 resource type */
+    resourceSelectType?: ScanOrderResourceSelectType;
+    raw: ScanOrderResourceOccupyDetail | null;
 }
 export interface ScanOrderState {
     entryContext: ScanOrderEntryContext | null;
     status: ScanOrderStatus;
-    config: ScanOrderTableConfigApiData | null;
+    config: Record<string, any> | null;
     resource: ScanOrderResourceState | null;
     flow: Record<string, any>;
     error: string | null;
@@ -212,6 +221,7 @@ export interface ScanOrderState {
     order?: OrderModule;
     salesSummary?: SalesSummaryModule;
     scanOrderLogger?: ScanOrderLoggerModule;
+    schedule?: ScheduleModule;
     itemRuleQuantityLimits: QuantityLimitResult[];
     cartValidation: {
         passed: boolean | null;

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

@@ -1,4 +1,4 @@
-import { ScanOrderOrderProduct, ScanOrderOrderProductIdentity, ScanOrderSummary, ScanOrderTempOrder } from './types';
+import { ScanOrderOrderProduct, ScanOrderOrderProductIdentity, ScanOrderResourceCapacitySlot, ScanOrderResourceSelectType, 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';
@@ -109,6 +109,18 @@ export declare function collectLinkProductIdsFromReservationRules(rules: unknown
 export declare function pickFirstDurationMinutesFromProducts(products: ProductData[]): number | undefined;
 /** 是否存在 capacity.type === 'custom' 的商品 */
 export declare function hasCustomCapacityProduct(products: ProductData[]): boolean;
+/**
+ * 根据预约规则商品的 resource.type 计算桌台是否已被"占满"。
+ * - single：只要有 `lastOrderId` 即视为占用
+ * - multiple：当前时间落在 `capacity_list[i]` 的 `[start_at, end_at]`（inclusive）内的 pax 之和 > 总容量
+ * - 其他（'capacity' / undefined）：返回 false，不施加限制
+ */
+export declare function computeResourceIsFull(params: {
+    resourceSelectType?: ScanOrderResourceSelectType;
+    lastOrderId?: string;
+    capacityList?: ScanOrderResourceCapacitySlot[];
+    capacity?: number | string | null;
+}): boolean;
 /**
  * 在商品列表中找到第一个 `capacity.type === 'custom'` 的商品，取其 `custom` 数组第一项的 min/max。
  * 仅返回有限数字字段；若均无法解析则返回 `undefined`。

package/lib/solution/ScanOrder/utils.js

@@ -1,6 +1,8 @@
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -14,6 +16,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/solution/ScanOrder/utils.ts
@@ -25,6 +35,7 @@ __export(utils_exports, {
   buildProductKey: () => buildProductKey,
   buildQuantityLimitIndex: () => buildQuantityLimitIndex,
   collectLinkProductIdsFromReservationRules: () => collectLinkProductIdsFromReservationRules,
+  computeResourceIsFull: () => computeResourceIsFull,
   createEmptySummary: () => createEmptySummary,
   extractStrategyModelIdsFromTableConfig: () => extractStrategyModelIdsFromTableConfig,
   getProductIdentityIndex: () => getProductIdentityIndex,
@@ -46,6 +57,7 @@ __export(utils_exports, {
   toPriceString: () => toPriceString
 });
 module.exports = __toCommonJS(utils_exports);
+var import_dayjs = __toESM(require("dayjs"));
 function createEmptySummary() {
   return {
     product_quantity: 0,
@@ -411,6 +423,30 @@ function hasCustomCapacityProduct(products) {
     return ((_a = p == null ? void 0 : p.capacity) == null ? void 0 : _a.type) === "custom";
   });
 }
+function computeResourceIsFull(params) {
+  const { resourceSelectType, lastOrderId, capacityList, capacity } = params;
+  if (resourceSelectType === "single")
+    return Boolean(lastOrderId);
+  if (resourceSelectType !== "multiple")
+    return false;
+  const totalCapacity = Number(capacity);
+  if (!Number.isFinite(totalCapacity) || totalCapacity <= 0)
+    return false;
+  const now = (0, import_dayjs.default)();
+  let occupied = 0;
+  for (const slot of capacityList || []) {
+    const start = (0, import_dayjs.default)(slot == null ? void 0 : slot.start_at);
+    const end = (0, import_dayjs.default)(slot == null ? void 0 : slot.end_at);
+    if (!start.isValid() || !end.isValid())
+      continue;
+    if ((now.isAfter(start) || now.isSame(start)) && (now.isBefore(end) || now.isSame(end))) {
+      const pax = Number(slot == null ? void 0 : slot.pax);
+      if (Number.isFinite(pax) && pax > 0)
+        occupied += pax;
+    }
+  }
+  return occupied > totalCapacity;
+}
 function pickFirstCustomCapacityPaxBounds(products) {
   for (const p of products) {
     const cap = p == null ? void 0 : p.capacity;
@@ -446,6 +482,7 @@ function pickFirstCustomCapacityPaxBounds(products) {
   buildProductKey,
   buildQuantityLimitIndex,
   collectLinkProductIdsFromReservationRules,
+  computeResourceIsFull,
   createEmptySummary,
   extractStrategyModelIdsFromTableConfig,
   getProductIdentityIndex,

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

@@ -92,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>;