@pisell/pisellos 0.0.501 → 0.0.502

package/lib/modules/Order/utils.js

@@ -172,6 +172,9 @@ function normalizeSubmitProduct(product) {
   if (rawMetadata.price_breakdown) {
     cleanMetadata.price_breakdown = rawMetadata.price_breakdown;
   }
+  if (rawMetadata.is_rule !== void 0) {
+    cleanMetadata.is_rule = rawMetadata.is_rule;
+  }
   return {
     ...submitProduct,
     ...bookingUid ? { booking_uid: bookingUid } : {},
@@ -286,7 +289,8 @@ function buildSubmitPayload(params) {
     platform,
     businessCode,
     channel,
-    type
+    type,
+    enhance
   } = params;
   const scheduleDate = tempOrder.schedule_date || tempOrder.created_at || formatDateTime(now);
   const summary = tempOrder.summary || (0, import_utils.createEmptySummary)();
@@ -297,8 +301,8 @@ function buildSubmitPayload(params) {
   const bookingDuration = resolveTableOccupancyDuration(tempOrder);
   const bookingEnd = bookingStart.add(bookingDuration, "minute");
   const bookings = relationId && tableFormId ? [{
-    relation_id: relationId,
-    form_id: tableFormId,
+    relation_id: 0,
+    form_id: 0,
     start_time: bookingStart.format("HH:mm"),
     start_date: bookingStart.format("YYYY-MM-DD"),
     end_time: bookingEnd.format("HH:mm"),
@@ -310,17 +314,17 @@ function buildSubmitPayload(params) {
     },
     select_date: bookingStart.format("YYYY-MM-DD"),
     is_all: false,
-    "like_status": "common",
-    "schedule_id": 0,
-    "relation_type": "form",
-    "number": 1
+    like_status: "common",
+    schedule_id: 0,
+    relation_type: "",
+    number: 1
   }] : tempOrder.bookings || [];
   const formRecordIds = relationId && tableFormId ? [{
     form_id: tableFormId,
-    form_record_ids: [relationId]
+    form_record_id: relationId
   }] : void 0;
   const { created_at: _createdAt, summary: _summary, surcharges: _surcharges, ...tempOrderRest } = tempOrder;
-  return {
+  const payload = {
     ...tempOrderRest,
     platform: normalizeSubmitPlatform(platform ?? tempOrder.platform),
     request_unique_idempotency_token: cacheId,
@@ -348,13 +352,19 @@ function buildSubmitPayload(params) {
     contacts_info: tempOrder.contacts_info || [],
     // holder: tempOrder.holder || null,
     // summary,
-    metadata: {
-      ...tempOrder.metadata
-    },
+    metadata: (() => {
+      const {
+        collect_pax: _collectPax,
+        table_occupancy_duration: _tableOccupancyDuration,
+        ...rest
+      } = tempOrder.metadata || {};
+      return { ...rest };
+    })(),
     products: (tempOrder.products || []).map(
       (product) => normalizeSubmitProduct(product)
     )
   };
+  return enhance ? enhance(payload, { tempOrder, bookingUuid, now }) : payload;
 }
 function formatV1Product(products) {
   return products.map((product) => {
@@ -364,7 +374,7 @@ function formatV1Product(products) {
       option: product.product_option_item,
       product_id: product.product_id,
       product_variant_id: product.product_variant_id,
-      quantity: product.num,
+      num: product.num,
       rowKey: product.product_id,
       session: null,
       unique: createUuidV4()

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

@@ -311,7 +311,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 5 | 1 | 4 | 2 | 3 | 6;
+        weekNum: 0 | 1 | 2 | 3 | 4 | 5 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;
@@ -330,7 +330,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         count: number;
         left: number;
         summaryCount: number;
-        status: "sold_out" | "lots_of_space" | "filling_up_fast";
+        status: "lots_of_space" | "filling_up_fast" | "sold_out";
     }[];
     /**
      * 找到多个资源的公共可用时间段

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

@@ -52,10 +52,17 @@ export declare class ScanOrderImpl extends BaseModule implements Module {
     };
     getTempOrder(): import("./types").ScanOrderTempOrder | null;
     updateTempOrderNote(note: string): string;
+    setPickupReferenceMode(mode: 'counter_pickup' | 'table_service'): {
+        service_type: 'dine_in';
+        pickup_reference_mode: 'counter_pickup' | 'table_service';
+    };
+    setPickupRef(buzzer: string): string;
     private ensureTempOrder;
     addNewOrder(): Promise<import("./types").ScanOrderTempOrder>;
+    restoreOrder(): Promise<import("./types").ScanOrderTempOrder>;
     getOrderProducts(): ScanOrderOrderProduct[];
     getSummary(): Promise<import("./types").ScanOrderSummary>;
+    private buildReservationRuleEnhancer;
     submitScanOrder<T = any>(): Promise<T>;
     addProductToOrder(product: Partial<ScanOrderOrderProduct> & ScanOrderOrderProductIdentity): Promise<ScanOrderOrderProduct[]>;
     updateProductInOrder(params: {
@@ -94,4 +101,12 @@ export declare class ScanOrderImpl extends BaseModule implements Module {
     }): Promise<void>;
     setEntryPaxNumber(number: number): Promise<void>;
     getEntryPaxNumber(): number | null;
+    getFulfillmentModes(): {
+        enablePickup: boolean;
+        enableTableService: boolean;
+    };
+    checkManualPickupRef(): {
+        enabled: boolean;
+        manualInputType?: string;
+    };
 }

package/lib/solution/ScanOrder/index.js

@@ -38,6 +38,8 @@ var import_types = require("./types");
 var import_utils = require("./utils");
 var import_types2 = require("../BookingByStep/types");
 var import_ProductList = require("../../modules/ProductList");
+var import_Schedule = require("../../modules/Schedule");
+var import_getDateIsInSchedule = require("../../modules/Schedule/getDateIsInSchedule");
 var import_utils2 = require("../../modules/Order/utils");
 var import_dayjs = __toESM(require("dayjs"));
 var import_itemRule = require("../../model/strategy/adapter/itemRule");
@@ -226,11 +228,26 @@ var ScanOrderImpl = class extends import_BaseModule.BaseModule {
     if (this.store.scanOrderLogger) {
       this.store.scanOrderLogger.setContext(this.getScanOrderLoggerContext());
     }
+    const scheduleModule = new import_Schedule.ScheduleModule(`${this.name}_schedule`);
+    this.store.schedule = scheduleModule;
+    this.core.registerModule(scheduleModule, {
+      otherParams: {
+        ...this.otherParams,
+        fatherModule: this.name
+      }
+    });
     console.log("[ScanOrder] 初始化开始");
     try {
       await ((_e = this.store.order) == null ? void 0 : _e.recalculateSummary({ createIfMissing: false }));
       (_f = this.store.order) == null ? void 0 : _f.persistTempOrder();
       await this.loadRuntimeConfigs();
+      if (this.store.schedule) {
+        try {
+          await this.store.schedule.loadAllSchedule();
+        } catch (scheduleError) {
+          console.warn("[ScanOrder] loadAllSchedule 失败，operating_hours 判定将跳过", scheduleError);
+        }
+      }
       await this.refreshItemRuleQuantityLimits();
       this.store.status = "ready";
       console.log("[ScanOrder] 初始化完成");
@@ -368,6 +385,50 @@ var ScanOrderImpl = class extends import_BaseModule.BaseModule {
       throw error;
     }
   }
+  // 存储 UI 层选择的取餐方式到 tempOrder.metadata.shop_service_data
+  // service_type 在扫码点餐场景固定为 dine_in
+  setPickupReferenceMode(mode) {
+    this.logMethodStart("setPickupReferenceMode", { mode });
+    try {
+      if (!this.store.order)
+        throw new Error("order 模块未初始化");
+      const tempOrder = this.store.order.ensureTempOrder();
+      tempOrder.metadata = {
+        ...tempOrder.metadata || {},
+        shop_service_data: {
+          ...(tempOrder.metadata || {}).shop_service_data || {},
+          service_type: "dine_in",
+          pickup_reference_mode: mode
+        }
+      };
+      this.store.order.persistTempOrder();
+      this.logMethodSuccess("setPickupReferenceMode", {
+        mode
+      });
+      return tempOrder.metadata.shop_service_data;
+    } catch (error) {
+      this.logMethodError("setPickupReferenceMode", error, { mode });
+      throw error;
+    }
+  }
+  // 存储用户自定义取餐标识到 tempOrder.buzzer
+  setPickupRef(buzzer) {
+    this.logMethodStart("setPickupRef", {
+      buzzerLength: String(buzzer || "").length
+    });
+    try {
+      if (!this.store.order)
+        throw new Error("order 模块未初始化");
+      const result = this.store.order.updateTempOrderBuzzer(buzzer);
+      this.logMethodSuccess("setPickupRef", {
+        buzzerLength: result.length
+      });
+      return result;
+    } catch (error) {
+      this.logMethodError("setPickupRef", error);
+      throw error;
+    }
+  }
   ensureTempOrder() {
     if (!this.store.order)
       throw new Error("order 模块未初始化");
@@ -389,6 +450,25 @@ var ScanOrderImpl = class extends import_BaseModule.BaseModule {
       throw error;
     }
   }
+  // 重置 tempOrder 与与上一单强相关的运行态（resource/entryPaxNumber/enabledReservationRuleProducts），
+  // 适用于从支付页通过 react-router 跳回继续下单时清理残留数据
+  async restoreOrder() {
+    this.logMethodStart("restoreOrder");
+    try {
+      if (!this.store.order) {
+        throw new Error("scanOrder 解决方案需要 order 模块支持");
+      }
+      this.store.resource = null;
+      this.store.entryPaxNumber = 1;
+      this.enabledReservationRuleProducts = [];
+      const tempOrder = this.store.order.restoreOrder();
+      this.logMethodSuccess("restoreOrder");
+      return tempOrder;
+    } catch (error) {
+      this.logMethodError("restoreOrder", error);
+      throw error;
+    }
+  }
   getOrderProducts() {
     this.logMethodStart("getOrderProducts");
     if (!this.store.order)
@@ -414,8 +494,74 @@ var ScanOrderImpl = class extends import_BaseModule.BaseModule {
       throw error;
     }
   }
+  // 根据 enabledReservationRuleProducts / store.resource 构造 submit payload enhancer：
+  // - 给第一条 booking 补 resources 与 product_uid
+  // - 追加一条 is_rule=true 的 rule product，与 booking 互相关联
+  // 无 rule product 也无 resource 时返回 undefined，跳过增强
+  buildReservationRuleEnhancer() {
+    const ruleProduct = this.enabledReservationRuleProducts[0];
+    const resourceState = this.store.resource;
+    if (!ruleProduct && !resourceState)
+      return void 0;
+    return (payload, { bookingUuid, tempOrder }) => {
+      var _a;
+      const resourceId = tempOrder.resource_id ?? (resourceState == null ? void 0 : resourceState.relationId);
+      const pickOriginal = (value) => {
+        if (value && typeof value === "object" && !Array.isArray(value)) {
+          const original = value.original;
+          return typeof original === "string" && original.length > 0 ? original : void 0;
+        }
+        return void 0;
+      };
+      const mainField = pickOriginal(tempOrder.table_number) ?? pickOriginal((_a = resourceState == null ? void 0 : resourceState.table_form_record) == null ? void 0 : _a.name) ?? "";
+      const resourceEntry = resourceState && resourceId ? {
+        relation_type: "form",
+        like_status: "common",
+        id: Number(resourceId),
+        main_field: mainField,
+        form_id: resourceState.tableFormId,
+        relation_id: resourceState.relationId ?? resourceId,
+        capacity: 1,
+        metadata: {}
+      } : void 0;
+      const ruleProductUid = ruleProduct ? (0, import_utils2.createUuidV4)() : void 0;
+      const nextBookings = (payload.bookings || []).map(
+        (booking, idx) => idx === 0 ? {
+          ...booking,
+          ...resourceEntry ? { resources: [resourceEntry] } : {},
+          ...ruleProductUid ? { product_uid: ruleProductUid } : {}
+        } : booking
+      );
+      const nextProducts = [...payload.products || []];
+      if (ruleProduct && ruleProductUid) {
+        const sellingPrice = String(ruleProduct.price ?? "0.00");
+        const originalPrice = String(
+          ruleProduct.original_price ?? ruleProduct.price ?? "0.00"
+        );
+        nextProducts.push({
+          product_id: ruleProduct.id,
+          product_variant_id: 0,
+          num: 1,
+          selling_price: sellingPrice,
+          original_price: originalPrice,
+          payment_price: sellingPrice,
+          is_charge_tax: ruleProduct.is_gst ?? 0,
+          product_option_item: [],
+          discount_list: [],
+          product_bundle: [],
+          booking_uid: bookingUuid,
+          metadata: {
+            is_rule: true,
+            unique_identification_number: ruleProductUid,
+            booking_uid: bookingUuid
+          }
+        });
+      }
+      return { ...payload, bookings: nextBookings, products: nextProducts };
+    };
+  }
   async submitScanOrder() {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d, _e, _f, _g;
     this.logMethodStart("submitScanOrder");
     try {
       await this.validateBeforeSubmitByItemRule();
@@ -426,17 +572,26 @@ var ScanOrderImpl = class extends import_BaseModule.BaseModule {
       this.store.entryPaxNumber = pax;
       const tempOrderForSubmit = this.store.order.ensureTempOrder();
       tempOrderForSubmit.metadata = { ...tempOrderForSubmit.metadata, collect_pax: pax };
+      tempOrderForSubmit.delivery_type = "shop_service";
+      const resourceTableName = (_b = (_a = this.store.resource) == null ? void 0 : _a.table_form_record) == null ? void 0 : _b.name;
+      if (resourceTableName && typeof resourceTableName === "object") {
+        tempOrderForSubmit.table_number = resourceTableName;
+      } else {
+        delete tempOrderForSubmit.table_number;
+      }
       this.store.order.persistTempOrder();
+      const enhancePayload = this.buildReservationRuleEnhancer();
       const result = await this.store.order.submitTempOrder({
         cacheId: this.cacheId,
-        platform: (_a = this.otherParams) == null ? void 0 : _a.platform,
-        businessCode: (_b = this.otherParams) == null ? void 0 : _b.businessCode,
-        channel: (_c = this.otherParams) == null ? void 0 : _c.channel,
-        type: (_d = this.otherParams) == null ? void 0 : _d.type
+        platform: (_c = this.otherParams) == null ? void 0 : _c.platform,
+        businessCode: (_d = this.otherParams) == null ? void 0 : _d.businessCode,
+        channel: (_e = this.otherParams) == null ? void 0 : _e.channel,
+        type: (_f = this.otherParams) == null ? void 0 : _f.type,
+        enhancePayload
       });
       const tempOrder = this.store.order.getTempOrder();
       this.logMethodSuccess("submitScanOrder", {
-        productCount: ((_e = tempOrder == null ? void 0 : tempOrder.products) == null ? void 0 : _e.length) || 0
+        productCount: ((_g = tempOrder == null ? void 0 : tempOrder.products) == null ? void 0 : _g.length) || 0
       });
       return result;
     } catch (error) {
@@ -707,6 +862,7 @@ var ScanOrderImpl = class extends import_BaseModule.BaseModule {
         );
         tempOrder.products.push(
           (0, import_utils.normalizeOrderProduct)({
+            ...sourceItem,
             product_id: productId,
             product_variant_id: productVariantId,
             num: targetQuantity,
@@ -752,6 +908,7 @@ var ScanOrderImpl = class extends import_BaseModule.BaseModule {
       }
     }
     if (hasChanges) {
+      this.store.order.applyDiscount();
       await this.store.order.recalculateSummary({ createIfMissing: true });
       this.store.order.persistTempOrder();
     }
@@ -969,19 +1126,39 @@ var ScanOrderImpl = class extends import_BaseModule.BaseModule {
       const dineInConfig = (openData == null ? void 0 : openData.data) || {};
       this.otherParams.dineInConfig = dineInConfig;
       await this.syncItemRuleConfigsFromDineInConfig(dineInConfig);
-      const shopClosedInfo = () => ({
+      const closedBehaviorValue = dineInConfig == null ? void 0 : dineInConfig["availability.closed_behavior"];
+      const closedMessage = (dineInConfig == null ? void 0 : dineInConfig["availability.closed_message"]) || (dineInConfig == null ? void 0 : dineInConfig["availability.message"]) || (dineInConfig == null ? void 0 : dineInConfig["basic.closed_message"]);
+      const basicUnavailableMessage = (dineInConfig == null ? void 0 : dineInConfig["basic.unavailable_message"]) || closedMessage;
+      const pauseMessage = (dineInConfig == null ? void 0 : dineInConfig["availability.pause_message"]) || closedMessage;
+      const makeShopClosed = (errorTips, closed_behavior) => ({
         mode: "shop_closed",
         order_id: void 0,
         relation_id: void 0,
         table_form_id: void 0,
         deskmate_valid: false,
-        errorTips: (dineInConfig == null ? void 0 : dineInConfig["availability.pause_message"]) || (dineInConfig == null ? void 0 : dineInConfig["availability.closed_message"]) || (dineInConfig == null ? void 0 : dineInConfig["availability.message"]) || (dineInConfig == null ? void 0 : dineInConfig["basic.closed_message"])
+        errorTips,
+        closed_behavior
       });
+      if ((dineInConfig == null ? void 0 : dineInConfig["basic.enable"]) === false) {
+        return makeShopClosed(basicUnavailableMessage);
+      }
       if ((0, import_utils.toBoolean)(dineInConfig == null ? void 0 : dineInConfig["availability.paused"])) {
         if ((dineInConfig == null ? void 0 : dineInConfig["availability.pause_behavior"]) === "hide_all") {
-          return shopClosedInfo();
+          return makeShopClosed(pauseMessage);
+        }
+      }
+      const operatingHourIds = Array.isArray(dineInConfig == null ? void 0 : dineInConfig["availability.operating_hours"]) ? dineInConfig["availability.operating_hours"].map((id) => Number(id)).filter((id) => Number.isFinite(id) && id > 0) : [];
+      let outsideOperatingHours = false;
+      if (operatingHourIds.length && this.store.schedule) {
+        const scheduleList = this.store.schedule.getScheduleListByIds(operatingHourIds);
+        if (scheduleList.length) {
+          const now = (0, import_dayjs.default)().format("YYYY-MM-DD HH:mm:ss");
+          outsideOperatingHours = !(0, import_getDateIsInSchedule.getDateIsInSchedule)(now, scheduleList);
         }
       }
+      if (outsideOperatingHours && closedBehaviorValue !== "show_menu_disabled") {
+        return makeShopClosed(closedMessage, closedBehaviorValue);
+      }
       const config = await this.fetchTableConfigByResourceId(resourceId);
       const resourceState = this.normalizeResourceState(config, hasOrderId);
       this.store.resource = resourceState;
@@ -1000,7 +1177,7 @@ var ScanOrderImpl = class extends import_BaseModule.BaseModule {
       tempOrder.table_form_id = resourceState.tableFormId;
       tempOrder.resource_id = resourceId;
       const reservationLinkIds = (0, import_utils.collectLinkProductIdsFromReservationRules)(
-        dineInConfig["reservation.enabled_reservation_rules"]
+        dineInConfig["fulfillment.enabled_resource_rules"]
       );
       if (reservationLinkIds.length === 0) {
         this.enabledReservationRuleProducts = [];
@@ -1115,6 +1292,11 @@ var ScanOrderImpl = class extends import_BaseModule.BaseModule {
         submissionIndex: hasOrderId ? 1 : 0,
         historicalItems
       });
+      if (outsideOperatingHours && closedBehaviorValue === "show_menu_disabled") {
+        availabilityInfo.mode = "submit_disabled";
+        availabilityInfo.errorTips = closedMessage;
+        availabilityInfo.closed_behavior = closedBehaviorValue;
+      }
       this.logMethodSuccess("checkResourceAvailable", {
         resourceId,
         mode: availabilityInfo.mode,
@@ -1207,6 +1389,35 @@ var ScanOrderImpl = class extends import_BaseModule.BaseModule {
   getEntryPaxNumber() {
     return this.store.entryPaxNumber;
   }
+  // 读取取餐/送餐开关
+  // 依赖 checkResourceAvailable 已缓存的 dineInConfig
+  getFulfillmentModes() {
+    var _a;
+    this.logMethodStart("getFulfillmentModes");
+    const dineInConfig = ((_a = this.otherParams) == null ? void 0 : _a.dineInConfig) || {};
+    const result = {
+      enablePickup: Boolean(dineInConfig["fulfillment.enable_pickup"]),
+      enableTableService: Boolean(dineInConfig["fulfillment.enable_table_service"])
+    };
+    this.logMethodSuccess("getFulfillmentModes", result);
+    return result;
+  }
+  // 判定后台是否开启客户自定义取餐标识
+  // 依赖 checkResourceAvailable 已缓存的 dineInConfig
+  checkManualPickupRef() {
+    var _a;
+    this.logMethodStart("checkManualPickupRef");
+    const dineInConfig = ((_a = this.otherParams) == null ? void 0 : _a.dineInConfig) || {};
+    const refMode = dineInConfig["fulfillment.fulfillment_ref_mode"];
+    const manualInputType = dineInConfig["fulfillment.manual_input_type"];
+    const enabled = refMode === "manual_input";
+    const result = enabled ? { enabled: true, manualInputType } : { enabled: false };
+    this.logMethodSuccess("checkManualPickupRef", {
+      enabled,
+      manualInputType: enabled ? manualInputType : void 0
+    });
+    return result;
+  }
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

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,11 +137,11 @@ 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_block' | 'resource_busy' | 'additional_order_with_code' | 'additional_order';
 export interface ScanOrderTableFormRecord {
     policy?: string | null;
     partyroom_booking?: string | null;
@@ -151,6 +154,8 @@ export interface ScanOrderAvailabilityInfo {
     table_form_id?: string;
     deskmate_valid?: boolean;
     errorTips?: string;
+    /** 透传 `availability.closed_behavior`，便于 UI 识别拦截类型（如 show_menu_disabled） */
+    closed_behavior?: string;
     /** `/order/dining/table/config` 返回的 `table_form_record` 原样透出 */
     table_form_record?: ScanOrderTableFormRecord | null;
     policy?: string | null;
@@ -212,6 +217,7 @@ export interface ScanOrderState {
     order?: OrderModule;
     salesSummary?: SalesSummaryModule;
     scanOrderLogger?: ScanOrderLoggerModule;
+    schedule?: ScheduleModule;
     itemRuleQuantityLimits: QuantityLimitResult[];
     cartValidation: {
         passed: boolean | null;

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>;