@pisell/pisellos 2.1.129 → 2.1.131

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

@@ -2,6 +2,7 @@ import { Module, ModuleOptions, PisellCore } from '../../types';
 import { BaseModule } from '../../modules/BaseModule';
 import { VenueBookingAddLogParams, VenueBookingSlotConfig, VenueDateSummaryItem, VenueSlotSelection, VenueTimeSlotGrid } from './types';
 import type { ScanOrderOrderProduct, ScanOrderOrderProductIdentity } from '../ScanOrder/types';
+import type { UpdateProductInOrderParams } from '../../modules/Order/types';
 import type { OpenDataAvailabilityResult } from '../../modules/OpenData';
 import type { ProductData } from '../../modules/Product/types';
 import { type CartItemSummary, type PaxInfo, type QuantityCheckResult, type QuantityLimitResult } from '../../model/strategy/adapter/itemRule';
@@ -92,25 +93,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>;
@@ -142,11 +166,7 @@ export declare class VenueBookingImpl extends BaseModule implements Module {
     getSummary(): Promise<import("./types").ScanOrderSummary>;
     submitOrder<T = any>(): Promise<T>;
     addProductToOrder(product: Partial<ScanOrderOrderProduct> & ScanOrderOrderProductIdentity): Promise<ScanOrderOrderProduct[]>;
-    updateProductInOrder(params: {
-        product_id: number | null;
-        product_variant_id: number;
-        updates: Partial<ScanOrderOrderProduct>;
-    }): Promise<ScanOrderOrderProduct[]>;
+    updateProductInOrder(params: UpdateProductInOrderParams): Promise<ScanOrderOrderProduct[]>;
     removeProductFromOrder(identity: ScanOrderOrderProductIdentity): Promise<ScanOrderOrderProduct[]>;
     getProductList(): Promise<ProductData[]>;
     private loadOpenDataConfig;

package/lib/solution/VenueBooking/index.js

@@ -629,12 +629,14 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
       }
       this.store.rawResourceData = rawData;
       for (const item of rawData) {
-        const mapping = this.resourceProductMap.get(item.resourceId);
-        if (mapping && item.main_field) {
-          mapping.resourceName = item.main_field;
-        }
-        if (mapping && item.resource_form_id) {
-          mapping.formId = item.resource_form_id;
+        const mappings = this.resourceProductMap.get(item.resourceId);
+        if (!mappings)
+          continue;
+        for (const mapping of mappings) {
+          if (item.main_field)
+            mapping.resourceName = item.main_field;
+          if (item.resource_form_id)
+            mapping.formId = item.resource_form_id;
         }
       }
       this.logMethodSuccess("fetchResourceAvailability", {
@@ -721,7 +723,11 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
     const resolvedSlotConfig = this.syncOperatingHoursToSlotConfig(date);
     let quotationPriceMap;
     if (this.store.quotation) {
-      const productIds = [...new Set([...this.resourceProductMap.values()].map((m) => m.productId))];
+      const productIds = [
+        ...new Set(
+          [...this.resourceProductMap.values()].flat().map((m) => m.productId)
+        )
+      ];
       const timeLabels = (0, import_timeSlot.generateTimeLabels)(resolvedSlotConfig);
       const timePoints = timeLabels.map((label) => `${date} ${label}`);
       quotationPriceMap = this.store.quotation.buildProductPriceMap({ productIds, timePoints });
@@ -738,19 +744,31 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
   /**
    * 切换单个时段的选中状态（选中/取消）。
    * 内部自动处理连续时段的合并与拆分，订单是唯一真相源。
+   *
+   * slot.productId 指定当前操作针对的是该 resourceId 下的哪一个商品。
+   * 同一资源下不同 productId 之间互相隔离，不会相互合并。
    */
   async toggleSlot(slot) {
     this.logMethodStart("toggleSlot", {
       resourceId: slot.resourceId,
+      productId: slot.productId,
       startTime: slot.startTime
     });
     try {
-      const mapping = this.resourceProductMap.get(slot.resourceId);
-      if (!mapping)
+      const mappings = this.resourceProductMap.get(slot.resourceId);
+      if (!mappings || !mappings.length) {
         throw new Error(`未找到资源 ${slot.resourceId} 的商品映射`);
+      }
+      const mapping = mappings.find((m) => m.productId === slot.productId);
+      if (!mapping) {
+        throw new Error(`资源 ${slot.resourceId} 未关联商品 ${slot.productId}`);
+      }
       if (!this.store.order)
         throw new Error("order 模块未初始化");
-      const currentSlots = this.getSelectedSlotsForResource(slot.resourceId);
+      const currentSlots = this.getSelectedSlotsForResourceProduct(
+        slot.resourceId,
+        slot.productId
+      );
       const existIndex = currentSlots.findIndex((s) => s.startTime === slot.startTime);
       let nextSlots;
       if (existIndex !== -1) {
@@ -758,13 +776,18 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
       } else {
         nextSlots = [...currentSlots, slot];
       }
-      await this.reconcileOrderForResource(slot.resourceId, nextSlots);
+      await this.reconcileOrderForResourceProduct(
+        slot.resourceId,
+        slot.productId,
+        nextSlots
+      );
       const products = this.store.order.getOrderProducts();
       await this.refreshItemRuleQuantityLimits();
       await this.refreshCartValidationPassed();
       this.logMethodSuccess("toggleSlot", {
         action: existIndex !== -1 ? "remove" : "add",
         resourceId: slot.resourceId,
+        productId: slot.productId,
         slotCount: nextSlots.length
       });
       return products;
@@ -775,33 +798,106 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
   }
   /**
    * 获取某资源当前选中的所有独立时段（从订单中解析）。
+   * 不传 productId 时返回该资源下所有商品的选中时段；传了则精确匹配。
    */
-  getSelectedSlotsForResource(resourceId) {
+  getSelectedSlotsForResource(resourceId, productId) {
     var _a;
     const tempOrder = (_a = this.store.order) == null ? void 0 : _a.getTempOrder();
     if (!tempOrder)
       return [];
-    const venueProducts = tempOrder.products.filter(
-      (p) => {
-        var _a2, _b;
-        return ((_a2 = p.metadata) == null ? void 0 : _a2.venue_booking) && String((_b = p.metadata) == null ? void 0 : _b.resource_id) === String(resourceId);
-      }
-    );
+    const venueProducts = tempOrder.products.filter((p) => {
+      var _a2, _b;
+      if (!((_a2 = p.metadata) == null ? void 0 : _a2.venue_booking))
+        return false;
+      if (String((_b = p.metadata) == null ? void 0 : _b.resource_id) !== String(resourceId))
+        return false;
+      if (productId != null && Number(p.product_id) !== Number(productId))
+        return false;
+      return true;
+    });
     const slotDuration = this.store.slotConfig.slotDurationMinutes;
     const slots = [];
     for (const product of venueProducts) {
-      slots.push(...(0, import_slotMerge.expandMergedSlotToIndividual)(product, slotDuration));
+      slots.push(
+        ...(0, import_slotMerge.expandMergedSlotToIndividual)(product, slotDuration).map((s) => ({
+          ...s,
+          productId: Number(product.product_id)
+        }))
+      );
     }
     return slots.sort((a, b) => a.startTime.localeCompare(b.startTime));
   }
+  /** getSelectedSlotsForResource 的 (resourceId, productId) 精确版，内部使用。 */
+  getSelectedSlotsForResourceProduct(resourceId, productId) {
+    return this.getSelectedSlotsForResource(resourceId, productId);
+  }
   /**
    * 判断某个时段是否已选中。
+   * 不传 productId 时：只要该资源下任一商品在 startTime 被选中即返回 true；传了则精确匹配。
    */
-  isSlotSelected(resourceId, startTime) {
-    return this.getSelectedSlotsForResource(resourceId).some((s) => s.startTime === startTime);
+  isSlotSelected(resourceId, startTime, productId) {
+    return this.getSelectedSlotsForResource(resourceId, productId).some((s) => s.startTime === startTime);
   }
   /**
-   * 获取所有已选时段（按资源分组）。
+   * 判断指定 (resourceId, productId, startTime) 格子是否应因其它已选项而被禁用。
+   * 规则：
+   * 1) 同一 resourceId 下若已选了另一个 productId 的同 startTime → 禁用
+   * 2) 当前 resource 是组合资源：若其任一 child resource 在 startTime 被选中 → 禁用
+   * 3) 当前 resource 是某些组合资源的 child：若该组合资源在 startTime 被选中 → 禁用
+   * 4) 两个组合资源的 child 集合有交集，且对方在该 startTime 被选中 → 禁用
+   */
+  isSlotDisabledBySelection(params) {
+    const { resourceId, productId, startTime } = params;
+    const allSelected = this.getAllSelectedSlots();
+    const getSelectedAt = (resId) => {
+      const list = allSelected.get(resId) || [];
+      return list.filter((s) => s.startTime === startTime);
+    };
+    const sameResourceSelections = getSelectedAt(resourceId);
+    if (sameResourceSelections.some((s) => Number(s.productId) !== Number(productId))) {
+      return true;
+    }
+    const getCombinedChildIds = (resId) => {
+      const raw = this.store.rawResourceData.find(
+        (r) => String(r.resourceId) === String(resId)
+      );
+      const combined = raw == null ? void 0 : raw.combined_resource;
+      if (combined && combined.status === 1 && Array.isArray(combined.resource_ids)) {
+        return combined.resource_ids;
+      }
+      return [];
+    };
+    const currentChildIds = getCombinedChildIds(resourceId);
+    const currentIsCombined = currentChildIds.length > 0;
+    if (currentIsCombined) {
+      for (const childId of currentChildIds) {
+        if (getSelectedAt(childId).length > 0)
+          return true;
+      }
+    }
+    for (const [selectedResId, slots] of allSelected) {
+      if (!slots.some((s) => s.startTime === startTime))
+        continue;
+      if (String(selectedResId) === String(resourceId))
+        continue;
+      const selectedChildIds = getCombinedChildIds(selectedResId);
+      if (selectedChildIds.length === 0)
+        continue;
+      if (selectedChildIds.some((id) => String(id) === String(resourceId))) {
+        return true;
+      }
+      if (currentIsCombined) {
+        const intersect = selectedChildIds.some(
+          (id) => currentChildIds.some((cid) => String(cid) === String(id))
+        );
+        if (intersect)
+          return true;
+      }
+    }
+    return false;
+  }
+  /**
+   * 获取所有已选时段（按资源分组）。每个 slot 上带 productId，便于 UI 做 per-product 判定。
    */
   getAllSelectedSlots() {
     var _a, _b;
@@ -818,8 +914,14 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
       const resourceId = (_b = product.metadata) == null ? void 0 : _b.resource_id;
       if (resourceId == null)
         continue;
+      const productId = Number(product.product_id);
       const existing = result.get(resourceId) || [];
-      existing.push(...(0, import_slotMerge.expandMergedSlotToIndividual)(product, slotDuration));
+      existing.push(
+        ...(0, import_slotMerge.expandMergedSlotToIndividual)(product, slotDuration).map((s) => ({
+          ...s,
+          productId
+        }))
+      );
       result.set(resourceId, existing);
     }
     for (const [key, slots] of result) {
@@ -828,24 +930,33 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
     return result;
   }
   /**
-   * 对指定资源的订单商品进行 reconcile：
+   * 对指定 (resourceId, productId) 的订单商品进行 reconcile：
    * 清除旧商品 → 合并连续时段 → 重新写入。
+   * 同一场地下不同商品互不干扰，各自单独 reconcile。
    */
-  async reconcileOrderForResource(resourceId, slots) {
-    const mapping = this.resourceProductMap.get(resourceId);
-    if (!mapping || !this.store.order)
+  async reconcileOrderForResourceProduct(resourceId, productId, slots) {
+    const mappings = this.resourceProductMap.get(resourceId);
+    if (!mappings || !mappings.length || !this.store.order)
+      return;
+    const mapping = mappings.find((m) => m.productId === productId);
+    if (!mapping)
       return;
     const tempOrder = this.store.order.ensureTempOrder();
+    const matchesCurrent = (meta, pid) => !!(meta == null ? void 0 : meta.venue_booking) && String(meta == null ? void 0 : meta.resource_id) === String(resourceId) && Number(pid) === Number(productId);
     tempOrder.products = tempOrder.products.filter(
-      (p) => {
-        var _a, _b;
-        return !(((_a = p.metadata) == null ? void 0 : _a.venue_booking) && String((_b = p.metadata) == null ? void 0 : _b.resource_id) === String(resourceId));
-      }
+      (p) => !matchesCurrent(p.metadata, p.product_id)
     );
     tempOrder.bookings = (tempOrder.bookings || []).filter(
       (b) => {
-        var _a, _b;
-        return !(((_a = b.metadata) == null ? void 0 : _a.venue_booking) && String((_b = b.metadata) == null ? void 0 : _b.resource_id) === String(resourceId));
+        var _a, _b, _c, _d;
+        if (!((_a = b.metadata) == null ? void 0 : _a.venue_booking))
+          return true;
+        if (String((_b = b.metadata) == null ? void 0 : _b.resource_id) !== String(resourceId))
+          return true;
+        const bookingProductId = ((_c = b.metadata) == null ? void 0 : _c.product_id) ?? ((_d = b == null ? void 0 : b.product) == null ? void 0 : _d.product_id);
+        if (bookingProductId == null)
+          return false;
+        return Number(bookingProductId) !== Number(productId);
       }
     );
     if (!slots.length) {
@@ -858,6 +969,7 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
     const rawResource = this.store.rawResourceData.find(
       (r) => String(r.resourceId) === String(resourceId)
     );
+    const childRawResources = this.getCombinedChildRawResources(rawResource);
     const venueProduct = this.getVenueProducts().find((p) => p.id === mapping.productId);
     tempOrder.bookings = tempOrder.bookings || [];
     for (let i = 0; i < merged.length; i++) {
@@ -868,6 +980,28 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
       const endMoment = (0, import_dayjs.default)(group.endTime, "YYYY-MM-DD HH:mm");
       const duration = endMoment.diff(startMoment, "minute");
       const customDepositData = cloneCustomDepositData(venueProduct == null ? void 0 : venueProduct.custom_deposit_data);
+      const resourceEntry = {
+        relation_type: "form",
+        like_status: "common",
+        id: resourceId,
+        main_field: mapping.resourceName,
+        form_id: (rawResource == null ? void 0 : rawResource.form_id) ?? mapping.formId,
+        relation_id: resourceId,
+        capacity: 1,
+        metadata: {}
+      };
+      if (childRawResources && childRawResources.length) {
+        resourceEntry.children = childRawResources.map((child) => ({
+          relation_type: "form",
+          like_status: "common",
+          id: child.resourceId,
+          main_field: child.main_field || "",
+          form_id: child.form_id ?? child.formId,
+          relation_id: child.resourceId,
+          capacity: child.capacity ?? 1,
+          metadata: {}
+        }));
+      }
       tempOrder.products.push(
         (0, import_utils.normalizeOrderProduct)({
           product_id: mapping.productId,
@@ -914,16 +1048,7 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
             sub_type: "minutes",
             duration,
             like_status: "common",
-            resources: [{
-              relation_type: "form",
-              like_status: "common",
-              id: resourceId,
-              main_field: mapping.resourceName,
-              form_id: (rawResource == null ? void 0 : rawResource.form_id) ?? mapping.formId,
-              relation_id: resourceId,
-              capacity: 1,
-              metadata: {}
-            }],
+            resources: [resourceEntry],
             schedule_id: 0,
             select_date: startMoment.format("YYYY-MM-DD"),
             start_date: startMoment.format("YYYY-MM-DD"),
@@ -944,7 +1069,8 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
         mapping,
         rawResource,
         bookingUuid,
-        productUid: identityKey
+        productUid: identityKey,
+        childResources: childRawResources
       });
       tempOrder.bookings.push(booking);
     }
@@ -952,6 +1078,24 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
     await this.store.order.recalculateSummary({ createIfMissing: true });
     this.store.order.persistTempOrder();
   }
+  /** 给定一个父 rawResource，返回其 combined_resource.resource_ids 对应的子 rawResource 列表。 */
+  getCombinedChildRawResources(rawResource) {
+    if (!rawResource)
+      return void 0;
+    const combined = rawResource.combined_resource;
+    if (!combined || combined.status !== 1 || !Array.isArray(combined.resource_ids) || !combined.resource_ids.length) {
+      return void 0;
+    }
+    const children = [];
+    for (const id of combined.resource_ids) {
+      const child = this.store.rawResourceData.find(
+        (r) => String(r.resourceId) === String(id)
+      );
+      if (child)
+        children.push(child);
+    }
+    return children.length ? children : void 0;
+  }
   // ─── 配置 ───
   setSlotConfig(config) {
     this.baseSlotConfig = {
@@ -1034,7 +1178,10 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
     const now = (0, import_dayjs.default)().format("YYYY-MM-DD HH:mm:ss");
     for (const product of tempOrder.products) {
       if ((_b = product.metadata) == null ? void 0 : _b.venue_booking) {
-        const mapping = this.resourceProductMap.get(product.metadata.resource_id);
+        const mappings = this.resourceProductMap.get(product.metadata.resource_id);
+        if (!mappings || !mappings.length)
+          continue;
+        const mapping = mappings.find((m) => Number(m.productId) === Number(product.product_id)) || mappings[0];
         if (!mapping)
           continue;
         const slots = (0, import_slotMerge.expandMergedSlotToIndividual)(
@@ -1043,6 +1190,7 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
         );
         const updatedSlots = slots.map((slot) => ({
           ...slot,
+          productId: mapping.productId,
           price: this.store.quotation.getPriceForProduct({
             productId: mapping.productId,
             datetime: slot.startTime
@@ -1096,7 +1244,7 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
   }
   /** 勾选/取消勾选某张折扣券，重新计算折扣并持久化 */
   async setDiscountSelected(params) {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c, _d, _e, _f, _g, _h;
     this.logMethodStart("setDiscountSelected", params);
     try {
       if (!this.store.order)
@@ -1163,11 +1311,18 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
           (sum, pd) => sum + (pd.amount || 0),
           0
         );
-        const newSellingPrice = new import_decimal.default(product.original_price || 0).minus(totalPerUnitDiscount).toDecimalPlaces(2).toString();
-        product.selling_price = newSellingPrice;
+        const optionSum = (0, import_utils3.sumOptionUnitPrice)(product.product_option_item);
+        const sourcePrice = ((_d = product.metadata) == null ? void 0 : _d.source_product_price) ?? (((_e = product.metadata) == null ? void 0 : _e.main_product_original_price) != null ? new import_decimal.default(Number(product.metadata.main_product_original_price) || 0).minus(optionSum).toFixed(2) : product.original_price ?? "0");
+        const newSourceSellingPrice = new import_decimal.default(Number(sourcePrice) || 0).minus(totalPerUnitDiscount).toDecimalPlaces(2).toString();
+        const newMainSellingPrice = new import_decimal.default(Number(newSourceSellingPrice) || 0).plus(optionSum).toDecimalPlaces(2).toFixed(2);
         if (product.metadata) {
-          product.metadata.main_product_selling_price = newSellingPrice;
+          product.metadata.main_product_selling_price = newMainSellingPrice;
+          product.metadata.price_schema_version = 2;
         }
+        product.selling_price = (0, import_utils3.composeLinePrice)({
+          mainPrice: newMainSellingPrice,
+          bundle: product.product_bundle
+        });
       }
       import_Order.OrderModule.populateSavedAmounts(tempOrder.products, nextDiscountList);
       await (discountModule == null ? void 0 : discountModule.setDiscountList(nextDiscountList));
@@ -1175,8 +1330,8 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
       const afterApplyTarget = this.store.order.getDiscountList().find((d) => d.id === params.discountId) || null;
       await this.store.order.recalculateSummary({ createIfMissing: true });
       this.store.order.persistTempOrder();
-      const finalSummary = ((_d = this.store.order.getTempOrder()) == null ? void 0 : _d.summary) || null;
-      const finalProduct = ((_f = (_e = this.store.order.getTempOrder()) == null ? void 0 : _e.products) == null ? void 0 : _f[0]) || null;
+      const finalSummary = ((_f = this.store.order.getTempOrder()) == null ? void 0 : _f.summary) || null;
+      const finalProduct = ((_h = (_g = this.store.order.getTempOrder()) == null ? void 0 : _g.products) == null ? void 0 : _h[0]) || null;
       this.logMethodSuccess("setDiscountSelected", params);
       const finalTarget = this.store.order.getDiscountList().find((d) => d.id === params.discountId) || null;
       return this.store.order.getDiscountList();

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

@@ -36,14 +36,31 @@ export interface VenueTimeSlot {
     resourceFormId: number | string;
     capacity: number | null;
     remainingCapacity: number | null;
+    /** per-product sub-row slot 上带的 productId；外层合并 slot 不写 */
+    productId?: number;
+}
+export interface VenueResourceSubRow {
+    productId: number;
+    productTitle: string;
+    price: string;
+    slots: VenueTimeSlot[];
+}
+export interface VenueResourceCombinedInfo {
+    resourceIds: Array<number | string>;
 }
 export interface VenueResourceRow {
     resourceId: number | string;
     resourceFormId: number | string;
     resourceName: string;
+    /** 单商品时取唯一 mapping.productId；多商品时取第一个 mapping（兼容字段） */
     productId: number;
     productTitle: string;
     slots: VenueTimeSlot[];
+    /** 多商品共享同一场地时的子行；单商品不输出 */
+    products?: VenueResourceSubRow[];
+    hasMultipleProducts?: boolean;
+    /** 当前资源是 combined_resource.status===1 时输出 */
+    combinedResource?: VenueResourceCombinedInfo;
 }
 export interface VenueTimeSlotGrid {
     date: string;
@@ -57,6 +74,10 @@ export interface VenueDateSummaryItem {
     totalSlots: number;
     availableSlots: number;
 }
+export interface VenueResourceCombinedRaw {
+    status: number;
+    resource_ids: Array<number | string>;
+}
 export interface VenueResourceRawData {
     resourceId: number | string;
     formId: number | string;
@@ -69,6 +90,7 @@ export interface VenueResourceRawData {
         end_at: string;
         [key: string]: any;
     }>;
+    combined_resource?: VenueResourceCombinedRaw;
     [key: string]: any;
 }
 export interface ResourceProductMapping {
@@ -81,6 +103,7 @@ export interface ResourceProductMapping {
 }
 export interface VenueSlotSelection {
     resourceId: number | string;
+    productId: number;
     startTime: string;
     endTime: string;
     price: string;

package/lib/solution/VenueBooking/utils/dateSummary.d.ts

@@ -5,7 +5,7 @@ export declare function buildDateRangeSummary(params: {
     endDate: string;
     config: VenueBookingSlotConfig;
     rawResources: VenueResourceRawData[];
-    resourceProductMap: Map<number | string, ResourceProductMapping>;
+    resourceProductMap: Map<number | string, ResourceProductMapping[]>;
     quotationModule?: QuotationModule;
     resolveConfig?: (date: string) => VenueBookingSlotConfig;
 }): VenueDateSummaryItem[];

package/lib/solution/VenueBooking/utils/dateSummary.js

@@ -45,7 +45,7 @@ function buildDateRangeSummary(params) {
     resolveConfig
   } = params;
   const result = [];
-  const productIds = quotationModule ? [...new Set([...resourceProductMap.values()].map((m) => m.productId))] : [];
+  const productIds = quotationModule ? [...new Set([...resourceProductMap.values()].flat().map((m) => m.productId))] : [];
   let cursor = (0, import_dayjs.default)(startDate);
   const end = (0, import_dayjs.default)(endDate);
   while (!cursor.isAfter(end)) {

package/lib/solution/VenueBooking/utils/resource.d.ts

@@ -1,4 +1,14 @@
 import type { ProductData } from '../../../modules/Product/types';
 import type { ResourceProductMapping } from '../types';
+/**
+ * 从商品列表里抽取所有 resource_id：
+ * - 商品绑定的 default_resource / optional_resource
+ * - 以及这些资源上声明的 combined_resource.resource_ids（若可从 product_resource 读取）
+ *   用于一次性拉到子资源数据，判定组合资源的可用性。
+ */
 export declare function extractResourceIds(products: ProductData[]): number[];
-export declare function buildResourceProductMap(products: ProductData[]): Map<number | string, ResourceProductMapping>;
+/**
+ * 每个 resourceId 可以被多个商品共享（同一场地关联多种运动商品）。
+ * Map 的 value 改为 ResourceProductMapping[]，按商品出现顺序保留。
+ */
+export declare function buildResourceProductMap(products: ProductData[]): Map<number | string, ResourceProductMapping[]>;

package/lib/solution/VenueBooking/utils/resource.js

@@ -39,6 +39,13 @@ function extractResourceIds(products) {
         if (typeof id === "number" && id > 0)
           ids.add(id);
       }
+      const combined = resource.combined_resource;
+      if (combined && combined.status === 1 && Array.isArray(combined.resource_ids)) {
+        for (const id of combined.resource_ids) {
+          if (typeof id === "number" && id > 0)
+            ids.add(id);
+        }
+      }
     }
   }
   return Array.from(ids);
@@ -58,16 +65,20 @@ function buildResourceProductMap(products) {
         ...resource.optional_resource || []
       ];
       for (const resId of allResourceIds) {
-        if (map.has(resId))
-          continue;
-        map.set(resId, {
+        const existing = map.get(resId);
+        const mapping = {
           productId: product.id,
           productTitle: product.title,
           resourceName: resource.title,
           formId: resource.id,
           price: product.price || "0.00",
           resourceType: resource.type || "single"
-        });
+        };
+        if (!existing) {
+          map.set(resId, [mapping]);
+        } else if (!existing.some((m) => m.productId === mapping.productId)) {
+          existing.push(mapping);
+        }
       }
     }
   }

package/lib/solution/VenueBooking/utils/slotMerge.d.ts

@@ -19,6 +19,11 @@ export interface BuildVenueBookingParams {
     rawResource: VenueResourceRawData | undefined;
     bookingUuid: string;
     productUid: string;
+    /**
+     * 若当前 resource 是组合资源（combined_resource.status === 1），传入其子资源的原始数据，
+     * 将作为 resources[0].children 写入 booking，结构与父 resource 保持一致。
+     */
+    childResources?: VenueResourceRawData[];
 }
 export declare function buildVenueBookingEntry(params: BuildVenueBookingParams): Record<string, any>;
 /**