@pisell/pisellos 2.1.128 → 2.1.130

package/dist/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/dist/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/dist/solution/VenueBooking/utils/dateSummary.js

@@ -16,7 +16,7 @@ export function buildDateRangeSummary(params) {
     quotationModule = params.quotationModule,
     resolveConfig = params.resolveConfig;
   var result = [];
-  var productIds = quotationModule ? _toConsumableArray(new Set(_toConsumableArray(resourceProductMap.values()).map(function (m) {
+  var productIds = quotationModule ? _toConsumableArray(new Set(_toConsumableArray(resourceProductMap.values()).flat().map(function (m) {
     return m.productId;
   }))) : [];
   var cursor = dayjs(startDate);

package/dist/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/dist/solution/VenueBooking/utils/resource.js

@@ -5,6 +5,12 @@ function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToAr
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+/**
+ * 从商品列表里抽取所有 resource_id：
+ * - 商品绑定的 default_resource / optional_resource
+ * - 以及这些资源上声明的 combined_resource.resource_ids（若可从 product_resource 读取）
+ *   用于一次性拉到子资源数据，判定组合资源的可用性。
+ */
 export function extractResourceIds(products) {
   var ids = new Set();
   var _iterator = _createForOfIteratorHelper(products),
@@ -27,6 +33,21 @@ export function extractResourceIds(products) {
             var id = _arr[_i];
             if (typeof id === 'number' && id > 0) ids.add(id);
           }
+          var combined = resource.combined_resource;
+          if (combined && combined.status === 1 && Array.isArray(combined.resource_ids)) {
+            var _iterator3 = _createForOfIteratorHelper(combined.resource_ids),
+              _step3;
+            try {
+              for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+                var _id = _step3.value;
+                if (typeof _id === 'number' && _id > 0) ids.add(_id);
+              }
+            } catch (err) {
+              _iterator3.e(err);
+            } finally {
+              _iterator3.f();
+            }
+          }
         }
       } catch (err) {
         _iterator2.e(err);
@@ -41,54 +62,69 @@ export function extractResourceIds(products) {
   }
   return Array.from(ids);
 }
+
+/**
+ * 每个 resourceId 可以被多个商品共享（同一场地关联多种运动商品）。
+ * Map 的 value 改为 ResourceProductMapping[]，按商品出现顺序保留。
+ */
 export function buildResourceProductMap(products) {
   var map = new Map();
-  var _iterator3 = _createForOfIteratorHelper(products),
-    _step3;
+  var _iterator4 = _createForOfIteratorHelper(products),
+    _step4;
   try {
-    for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+    for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
       var _product$product_reso2;
-      var product = _step3.value;
+      var product = _step4.value;
       var resources = (_product$product_reso2 = product.product_resource) === null || _product$product_reso2 === void 0 ? void 0 : _product$product_reso2.resources;
       if (!Array.isArray(resources)) continue;
-      var _iterator4 = _createForOfIteratorHelper(resources),
-        _step4;
+      var _iterator5 = _createForOfIteratorHelper(resources),
+        _step5;
       try {
-        for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
-          var resource = _step4.value;
+        for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
+          var resource = _step5.value;
           if (resource.status !== 1) continue;
           var allResourceIds = [].concat(_toConsumableArray(resource.default_resource || []), _toConsumableArray(resource.optional_resource || []));
-          var _iterator5 = _createForOfIteratorHelper(allResourceIds),
-            _step5;
+          var _iterator6 = _createForOfIteratorHelper(allResourceIds),
+            _step6;
           try {
-            for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
-              var resId = _step5.value;
-              if (map.has(resId)) continue;
-              map.set(resId, {
+            var _loop = function _loop() {
+              var resId = _step6.value;
+              var existing = map.get(resId);
+              var 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(function (m) {
+                return m.productId === mapping.productId;
+              })) {
+                existing.push(mapping);
+              }
+            };
+            for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
+              _loop();
             }
           } catch (err) {
-            _iterator5.e(err);
+            _iterator6.e(err);
           } finally {
-            _iterator5.f();
+            _iterator6.f();
           }
         }
       } catch (err) {
-        _iterator4.e(err);
+        _iterator5.e(err);
       } finally {
-        _iterator4.f();
+        _iterator5.f();
       }
     }
   } catch (err) {
-    _iterator3.e(err);
+    _iterator4.e(err);
   } finally {
-    _iterator3.f();
+    _iterator4.f();
   }
   return map;
 }

package/dist/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/dist/solution/VenueBooking/utils/slotMerge.js

@@ -96,10 +96,36 @@ export function buildVenueBookingEntry(params) {
     mapping = params.mapping,
     rawResource = params.rawResource,
     bookingUuid = params.bookingUuid,
-    productUid = params.productUid;
+    productUid = params.productUid,
+    childResources = params.childResources;
   var startMoment = dayjs(group.startTime, 'YYYY-MM-DD HH:mm');
   var endMoment = dayjs(group.endTime, 'YYYY-MM-DD HH:mm');
   var duration = endMoment.diff(startMoment, 'minute');
+  var resourceEntry = {
+    relation_type: 'form',
+    like_status: 'common',
+    id: resourceId,
+    main_field: mapping.resourceName,
+    form_id: (_rawResource$form_id = rawResource === null || rawResource === void 0 ? void 0 : rawResource.form_id) !== null && _rawResource$form_id !== void 0 ? _rawResource$form_id : mapping.formId,
+    relation_id: resourceId,
+    capacity: 1,
+    metadata: {}
+  };
+  if (childResources && childResources.length) {
+    resourceEntry.children = childResources.map(function (child) {
+      var _child$form_id, _child$capacity;
+      return {
+        relation_type: 'form',
+        like_status: 'common',
+        id: child.resourceId,
+        main_field: child.main_field || '',
+        form_id: (_child$form_id = child.form_id) !== null && _child$form_id !== void 0 ? _child$form_id : child.formId,
+        relation_id: child.resourceId,
+        capacity: (_child$capacity = child.capacity) !== null && _child$capacity !== void 0 ? _child$capacity : 1,
+        metadata: {}
+      };
+    });
+  }
   return {
     schedule_event_id: null,
     appointment_status: 'new',
@@ -115,23 +141,15 @@ export 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$form_id = rawResource === null || rawResource === void 0 ? void 0 : rawResource.form_id) !== null && _rawResource$form_id !== 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
     }
   };
 }
@@ -148,6 +166,7 @@ export function expandMergedSlotToIndividual(product, slotDurationMinutes) {
   var startTime = meta.start_time;
   var endTime = meta.end_time;
   if (!startTime || !endTime) return [];
+  var productId = Number(product.product_id);
   var breakdown = meta.price_breakdown;
   var result = [];
   var cursor = dayjs(startTime, 'YYYY-MM-DD HH:mm');
@@ -178,6 +197,7 @@ export function expandMergedSlotToIndividual(product, slotDurationMinutes) {
       var price = (_priceMap$get = priceMap.get(hm)) !== null && _priceMap$get !== void 0 ? _priceMap$get : 0;
       result.push({
         resourceId: resourceId,
+        productId: productId,
         startTime: cursor.format('YYYY-MM-DD HH:mm'),
         endTime: slotEnd.format('YYYY-MM-DD HH:mm'),
         price: new Decimal(price).toFixed(2)
@@ -192,6 +212,7 @@ export function expandMergedSlotToIndividual(product, slotDurationMinutes) {
       var _slotEnd = cursor.add(slotDurationMinutes, 'minute');
       result.push({
         resourceId: resourceId,
+        productId: productId,
         startTime: cursor.format('YYYY-MM-DD HH:mm'),
         endTime: _slotEnd.format('YYYY-MM-DD HH:mm'),
         price: perSlotPrice

package/dist/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 {};