@pisell/pisellos 2.1.129 → 2.1.130

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

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

@@ -107,10 +107,32 @@ function buildPriceBreakdown(params) {
   return entries;
 }
 function buildVenueBookingEntry(params) {
-  const { group, resourceId, mapping, rawResource, bookingUuid, productUid } = params;
+  const { group, resourceId, mapping, rawResource, bookingUuid, productUid, childResources } = params;
   const startMoment = (0, import_dayjs.default)(group.startTime, "YYYY-MM-DD HH:mm");
   const endMoment = (0, import_dayjs.default)(group.endTime, "YYYY-MM-DD HH:mm");
   const duration = endMoment.diff(startMoment, "minute");
+  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 (childResources && childResources.length) {
+    resourceEntry.children = childResources.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: {}
+    }));
+  }
   return {
     schedule_event_id: null,
     appointment_status: "new",
@@ -126,23 +148,15 @@ function buildVenueBookingEntry(params) {
     is_all: false,
     schedule_id: 0,
     product_uid: productUid,
-    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],
     relation_products: [],
     relation_forms: [],
     holder: null,
     metadata: {
       unique_identification_number: bookingUuid,
       venue_booking: true,
-      resource_id: resourceId
+      resource_id: resourceId,
+      product_id: mapping.productId
     }
   };
 }
@@ -155,6 +169,7 @@ function expandMergedSlotToIndividual(product, slotDurationMinutes) {
   const endTime = meta.end_time;
   if (!startTime || !endTime)
     return [];
+  const productId = Number(product.product_id);
   const breakdown = meta.price_breakdown;
   const result = [];
   let cursor = (0, import_dayjs.default)(startTime, "YYYY-MM-DD HH:mm");
@@ -175,6 +190,7 @@ function expandMergedSlotToIndividual(product, slotDurationMinutes) {
       const price = priceMap.get(hm) ?? 0;
       result.push({
         resourceId,
+        productId,
         startTime: cursor.format("YYYY-MM-DD HH:mm"),
         endTime: slotEnd.format("YYYY-MM-DD HH:mm"),
         price: new import_decimal.default(price).toFixed(2)
@@ -189,6 +205,7 @@ function expandMergedSlotToIndividual(product, slotDurationMinutes) {
       const slotEnd = cursor.add(slotDurationMinutes, "minute");
       result.push({
         resourceId,
+        productId,
         startTime: cursor.format("YYYY-MM-DD HH:mm"),
         endTime: slotEnd.format("YYYY-MM-DD HH:mm"),
         price: perSlotPrice

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

@@ -26,7 +26,7 @@ export declare function buildTimeSlotGrid(params: {
     date: string;
     config: VenueBookingSlotConfig;
     rawResources: VenueResourceRawData[];
-    resourceProductMap: Map<number | string, ResourceProductMapping>;
+    resourceProductMap: Map<number | string, ResourceProductMapping[]>;
     quotationPriceMap?: Map<string, string | null>;
 }): VenueTimeSlotGrid;
 export {};

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

@@ -38,6 +38,7 @@ __export(timeSlot_exports, {
 });
 module.exports = __toCommonJS(timeSlot_exports);
 var import_dayjs = __toESM(require("dayjs"));
+var import_decimal = __toESM(require("decimal.js"));
 function isBusinessHoursCrossDay(config) {
   const [startH, startM] = config.businessStartTime.split(":").map(Number);
   const [endH, endM] = config.businessEndTime.split(":").map(Number);
@@ -122,64 +123,202 @@ function computeSlotStatus(params) {
     return { status: "partially_occupied", remainingCapacity: remaining };
   return { status: "available", remainingCapacity: remaining };
 }
+function mergeSubSlots(subSlots) {
+  const priority = {
+    available: 5,
+    partially_occupied: 4,
+    occupied: 3,
+    unavailable: 2,
+    past: 1
+  };
+  let best = subSlots[0];
+  for (const slot of subSlots) {
+    if ((priority[slot.status] ?? 0) > (priority[best.status] ?? 0))
+      best = slot;
+  }
+  let minPrice = null;
+  for (const slot of subSlots) {
+    if (slot.price == null)
+      continue;
+    const decimal = new import_decimal.default(slot.price || "0");
+    if (!minPrice || decimal.lt(minPrice))
+      minPrice = decimal;
+  }
+  return {
+    startTime: best.startTime,
+    endTime: best.endTime,
+    status: best.status,
+    price: minPrice ? minPrice.toFixed(2) : null,
+    resourceId: best.resourceId,
+    resourceFormId: best.resourceFormId,
+    capacity: best.capacity,
+    remainingCapacity: best.remainingCapacity
+  };
+}
+function buildProductSlots(params) {
+  const {
+    date,
+    config,
+    resource,
+    mapping,
+    timeLabels,
+    timesForDate,
+    events,
+    resCapacity,
+    now,
+    crossDay,
+    quotationPriceMap,
+    childRawResources,
+    childTimesCache,
+    childEventsCache,
+    config_businessStartHour
+  } = params;
+  const slots = [];
+  for (const label of timeLabels) {
+    const [h] = label.split(":").map(Number);
+    const isNextDay = crossDay && h < config_businessStartHour;
+    const slotDate = isNextDay ? (0, import_dayjs.default)(date).add(1, "day").format("YYYY-MM-DD") : date;
+    const slotStart = (0, import_dayjs.default)(`${slotDate} ${label}`);
+    const slotEnd = slotStart.add(config.slotDurationMinutes, "minute");
+    let status;
+    let remainingCapacity = null;
+    if (slotStart.isBefore(now)) {
+      status = "past";
+    } else if (!isSlotWithinResourceTimes(slotStart, slotEnd, timesForDate)) {
+      status = "unavailable";
+    } else {
+      const result = computeSlotStatus({
+        slotStart,
+        slotEnd,
+        events,
+        resourceType: mapping.resourceType,
+        capacity: resCapacity
+      });
+      status = result.status;
+      remainingCapacity = result.remainingCapacity;
+      if (status !== "occupied" && childRawResources && childRawResources.length) {
+        for (let i = 0; i < childRawResources.length; i++) {
+          const child = childRawResources[i];
+          const childTimes = (childTimesCache == null ? void 0 : childTimesCache[i]) ?? getResourceTimesForDate(child, date, config);
+          const childEvents = (childEventsCache == null ? void 0 : childEventsCache[i]) ?? collectEventsForDate(child, date, config);
+          if (!isSlotWithinResourceTimes(slotStart, slotEnd, childTimes)) {
+            status = "unavailable";
+            remainingCapacity = null;
+            break;
+          }
+          const childType = child.type || "single";
+          const childResult = computeSlotStatus({
+            slotStart,
+            slotEnd,
+            events: childEvents,
+            resourceType: childType,
+            capacity: child.capacity ?? 1
+          });
+          if (childResult.status === "occupied") {
+            status = "occupied";
+            remainingCapacity = 0;
+            break;
+          }
+          if (childResult.status === "partially_occupied" && status === "available") {
+            status = "partially_occupied";
+            remainingCapacity = Math.min(
+              remainingCapacity ?? childResult.remainingCapacity,
+              childResult.remainingCapacity
+            );
+          }
+        }
+      }
+    }
+    const isBookable = status === "available" || status === "partially_occupied";
+    const slotStartStr = slotStart.format("YYYY-MM-DD HH:mm");
+    slots.push({
+      startTime: slotStartStr,
+      endTime: slotEnd.format("YYYY-MM-DD HH:mm"),
+      status,
+      price: isBookable ? (quotationPriceMap == null ? void 0 : quotationPriceMap.get(`${mapping.productId}:${slotStartStr}`)) ?? mapping.price : null,
+      resourceId: resource.resourceId,
+      resourceFormId: resource.formId,
+      capacity: status === "past" || status === "unavailable" ? null : resCapacity,
+      remainingCapacity,
+      productId: mapping.productId
+    });
+  }
+  return slots;
+}
 function buildTimeSlotGrid(params) {
   const { date, config, rawResources, resourceProductMap, quotationPriceMap } = params;
   const timeLabels = generateTimeLabels(config);
   const now = (0, import_dayjs.default)();
   const crossDay = isBusinessHoursCrossDay(config);
+  const config_businessStartHour = Number(config.businessStartTime.split(":")[0]);
+  const rawResourceById = /* @__PURE__ */ new Map();
+  for (const item of rawResources)
+    rawResourceById.set(item.resourceId, item);
   const resources = [];
   for (const resource of rawResources) {
-    const mapping = resourceProductMap.get(resource.resourceId);
-    if (!mapping)
+    const mappings = resourceProductMap.get(resource.resourceId);
+    if (!mappings || !mappings.length)
       continue;
     const timesForDate = getResourceTimesForDate(resource, date, config);
     const events = collectEventsForDate(resource, date, config);
     const resCapacity = resource.capacity ?? 1;
-    const slots = [];
-    for (const label of timeLabels) {
-      const [h, m] = label.split(":").map(Number);
-      const isNextDay = crossDay && h < Number(config.businessStartTime.split(":")[0]);
-      const slotDate = isNextDay ? (0, import_dayjs.default)(date).add(1, "day").format("YYYY-MM-DD") : date;
-      const slotStart = (0, import_dayjs.default)(`${slotDate} ${label}`);
-      const slotEnd = slotStart.add(config.slotDurationMinutes, "minute");
-      let status;
-      let remainingCapacity = null;
-      if (slotStart.isBefore(now)) {
-        status = "past";
-      } else if (!isSlotWithinResourceTimes(slotStart, slotEnd, timesForDate)) {
-        status = "unavailable";
-      } else {
-        const result = computeSlotStatus({
-          slotStart,
-          slotEnd,
-          events,
-          resourceType: mapping.resourceType,
-          capacity: resCapacity
-        });
-        status = result.status;
-        remainingCapacity = result.remainingCapacity;
-      }
-      const isBookable = status === "available" || status === "partially_occupied";
-      const slotStartStr = slotStart.format("YYYY-MM-DD HH:mm");
-      slots.push({
-        startTime: slotStartStr,
-        endTime: slotEnd.format("YYYY-MM-DD HH:mm"),
-        status,
-        price: isBookable ? (quotationPriceMap == null ? void 0 : quotationPriceMap.get(`${mapping.productId}:${slotStartStr}`)) ?? mapping.price : null,
-        resourceId: resource.resourceId,
-        resourceFormId: resource.formId,
-        capacity: status === "past" || status === "unavailable" ? null : resCapacity,
-        remainingCapacity
+    const combined = resource.combined_resource;
+    const isCombined = !!(combined && combined.status === 1 && Array.isArray(combined.resource_ids) && combined.resource_ids.length);
+    const childRawResources = isCombined ? combined.resource_ids.map((id) => rawResourceById.get(id)).filter((r) => !!r) : void 0;
+    const childTimesCache = childRawResources == null ? void 0 : childRawResources.map((child) => getResourceTimesForDate(child, date, config));
+    const childEventsCache = childRawResources == null ? void 0 : childRawResources.map((child) => collectEventsForDate(child, date, config));
+    const subRows = mappings.map((mapping) => {
+      const productSlots = buildProductSlots({
+        date,
+        config,
+        resource,
+        mapping,
+        timeLabels,
+        timesForDate,
+        events,
+        resCapacity,
+        now,
+        crossDay,
+        quotationPriceMap,
+        childRawResources,
+        childTimesCache,
+        childEventsCache,
+        config_businessStartHour
       });
+      return {
+        productId: mapping.productId,
+        productTitle: mapping.productTitle,
+        price: mapping.price,
+        slots: productSlots
+      };
+    });
+    const hasMultipleProducts = subRows.length > 1;
+    const primary = mappings[0];
+    let outerSlots;
+    if (hasMultipleProducts) {
+      outerSlots = timeLabels.map((_label, slotIndex) => {
+        const group = subRows.map((row2) => row2.slots[slotIndex]);
+        return mergeSubSlots(group);
+      });
+    } else {
+      outerSlots = subRows[0].slots.map((slot) => ({ ...slot, productId: void 0 }));
     }
-    resources.push({
+    const row = {
       resourceId: resource.resourceId,
       resourceFormId: resource.formId,
-      resourceName: resource.main_field || mapping.resourceName,
-      productId: mapping.productId,
-      productTitle: mapping.productTitle,
-      slots
-    });
+      resourceName: resource.main_field || primary.resourceName,
+      productId: primary.productId,
+      productTitle: primary.productTitle,
+      slots: outerSlots
+    };
+    if (hasMultipleProducts) {
+      row.products = subRows;
+      row.hasMultipleProducts = true;
+    }
+    if (isCombined && combined) {
+      row.combinedResource = { resourceIds: [...combined.resource_ids] };
+    }
+    resources.push(row);
   }
   const productOrder = /* @__PURE__ */ new Map();
   for (const row of resources) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@pisell/pisellos",
-  "version": "2.1.129",
+  "version": "2.1.130",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",