@pisell/pisellos 0.0.275 → 0.0.277

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

@@ -326,7 +326,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     };
     setOtherData(key: string, value: any): void;
     getOtherData(key: string): any;
-    getProductTypeById(id: number): Promise<"normal" | "duration" | "session">;
+    getProductTypeById(id: number): Promise<"duration" | "session" | "normal">;
     /**
      * 提供给 UI 的方法，减轻 UI 层的计算压力，UI 层只需要传递 cartItemId 和 resourceCode 即返回对应的 renderList
      *

package/dist/solution/BookingByStep/index.js

@@ -44,7 +44,7 @@ import { handleAvailableDateByResource } from "../../modules/Date/utils";
 import { areAllNormalProducts, isNormalProduct } from "../../modules/Product/utils";
 import { calculateResourceAvailableTime, filterConditionTimeSlots, findFastestAvailableResource } from "./utils/timeslots";
 import { updateAllCartItemPrice } from "../../modules/Cart/utils/changePrice";
-import { getCapacityInfoByCartItem, checkSubResourcesCapacity, checkResourceCanUseByCapacity, calculateCartItemsCapacityUsageByResourceType, getResourcesIdsByProduct, checkTimeSlotCapacity } from "./utils/capacity";
+import { getCapacityInfoByCartItem, checkSubResourcesCapacity, checkResourceCanUseByCapacity, getResourcesIdsByProduct, checkTimeSlotCapacity } from "./utils/capacity";
 import { checkProductStock } from "./utils/stock";
 export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   _inherits(BookingByStepImpl, _BaseModule);
@@ -2367,7 +2367,9 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getTimeslotBySchedule",
     value: function getTimeslotBySchedule(_ref10) {
-      var _this$store$currentPr2, _targetProductData$pr;
+      var _this$store$currentPr2,
+        _targetProductData$pr,
+        _this14 = this;
       var date = _ref10.date,
         scheduleIds = _ref10.scheduleIds,
         resources = _ref10.resources,
@@ -2415,139 +2417,197 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       var formatScheduleTimeSlots = scheduleTimeSlots.map(function (item) {
         // 用来计算资源的可使用情况，针对单个schedule 时间片
         var resourcesUseableMap = {};
-
-        // 按资源类型分组
-        var resourceTypeMap = {};
-        allProductResources === null || allProductResources === void 0 || allProductResources.forEach(function (resource) {
-          var _resource$form_id;
-          var formId = ((_resource$form_id = resource.form_id) === null || _resource$form_id === void 0 ? void 0 : _resource$form_id.toString()) || 'default';
-          if (!resourceTypeMap[formId]) {
-            resourceTypeMap[formId] = [];
+        var count = 0;
+        var bookingLeft = 0;
+        // 遍历所有资源
+        allProductResources === null || allProductResources === void 0 || allProductResources.forEach(function (m) {
+          // 遍历所有资源的上工时间片
+          var currentResourcesCount = 0;
+          var currentResourcesTimeSlotCanUsedArr = [];
+          // m.times 需要做个过滤，假设 timeSlice.start_at 是 09:30 timeSlice.end_at 是 11:30
+          // time 是 time.start_at = 2025-05-26 10:30, time.end_at = 2025-05-26 12:30
+          // 需要判断 time 的开始结束时间 是否包含timeSlice的开始结束时间
+
+          // n.start_at 是 2025-06-30 15:00 end_at 2025-06-30 17:00
+          // item.start 是 2025-06-30 16:00 item.end 是 2025-06-30 19:00
+          // 需要判断 n.start_at 和 n.end_at 是否在 item.start 和 item.end 之间
+          // 如果 n.start_at 和 n.end_at 在 item.start 和 item.end 有交集，则此时间需要计算
+          var mTimes = m.times.filter(function (n) {
+            return !dayjs(n.start_at).isAfter(dayjs(item.start), 'minute') && !dayjs(n.end_at).isBefore(dayjs(item.end), 'minute') || dayjs(n.start_at).isBefore(dayjs(item.end), 'minute') && dayjs(n.end_at).isAfter(dayjs(item.start), 'minute');
+          });
+          // 如果在这个区间的时间一个都没有，可以直接认为这个资源不可用
+          if (mTimes.length === 0) {
+            return;
+          }
+          mTimes.forEach(function (childTiem) {
+            // 挨个去匹配某个工作时间段结合当前日程时间，资源能不能用，有多少容量能用
+            var res = getIsUsableByTimeItem({
+              timeSlice: {
+                start_time: item.start,
+                end_time: item.end,
+                start_at: dayjs(item.start),
+                end_at: dayjs(item.end)
+              },
+              time: childTiem,
+              resource: m,
+              currentCount: 1,
+              resourcesUseableMap: resourcesUseableMap,
+              cut_off_time: targetProductData === null || targetProductData === void 0 ? void 0 : targetProductData.cut_off_time
+            });
+            if ((resourcesUseableMap === null || resourcesUseableMap === void 0 ? void 0 : resourcesUseableMap[m.id]) !== false && res.reason !== 'capacityOnly') {
+              resourcesUseableMap[m.id] = res.usable;
+            }
+            if (res.usable && res.remainingCapacity >= count && !m.onlyComputed) {
+              currentResourcesCount = res.remainingCapacity;
+            }
+            currentResourcesTimeSlotCanUsedArr.push(res.usable);
+          });
+          // 在已经选定时间的情况下，只要canUseTime如果有一个 false 那就不可用
+          if (!currentResourcesTimeSlotCanUsedArr.some(function (n) {
+            return n === false;
+          }) &&
+          // 只统计第一种资源的容量和 left
+          m.form_id === firstEnabledResourceId) {
+            if (currentResourcesCount >= count) {
+              count = currentResourcesCount;
+            }
+            if (!m.onlyComputed) {
+              bookingLeft += 1;
+            }
           }
-          resourceTypeMap[formId].push(resource);
-        });
-
-        // 计算购物车中商品的容量占用情况
-        var cartCapacityUsage = calculateCartItemsCapacityUsageByResourceType({
-          cartItems: cartItems,
-          timeSlotStart: item.start,
-          timeSlotEnd: item.end,
-          allProductResources: allProductResources || []
         });
-
-        // 计算每种资源类型的可用容量
-        var minAvailableCount = Number.MAX_SAFE_INTEGER;
-        var totalBookingLeft = 0;
-        var hasAnyAvailableResource = false;
-        Object.keys(resourceTypeMap).forEach(function (formId) {
-          var resourcesInType = resourceTypeMap[formId];
-          if (resourcesInType.length === 0) return;
-
-          // 确定这种资源类型的预约类型（取第一个资源的类型）
-          var firstResource = resourcesInType[0];
-          var isMultipleBooking = firstResource.resourceType === 'multiple';
-          var cartUsageForThisType = cartCapacityUsage[formId] || 0;
-          if (isMultipleBooking) {
-            // 多个预约：计算所有资源的总可用容量
-            var totalAvailableCapacity = 0;
-            var availableResourceCount = 0;
-            resourcesInType.forEach(function (resource) {
-              var mTimes = resource.times.filter(function (n) {
-                return !dayjs(n.start_at).isAfter(dayjs(item.start), 'minute') && !dayjs(n.end_at).isBefore(dayjs(item.end), 'minute') || dayjs(n.start_at).isBefore(dayjs(item.end), 'minute') && dayjs(n.end_at).isAfter(dayjs(item.start), 'minute');
+        // 容量检测
+        var cartItems = _this14.store.cart.getItems();
+        productResources.forEach(function (n) {
+          // 单个预约检测规则：
+          // 1、跟我一样的商品同一时间在购物车里不可以超过我最少的那种资源的关联的资源个数
+          // 2、跟我不一样的商品，只需要跟我当前商品有同一种类型的资源的同一时间的，她配置了几个资源的个数+我配置了几个资源的个数，然后购物车里有几个这样的商品，对应的资源做一个去重，不超过这个去重以后的总数
+          if (n.type === 'single') {
+            var currentResourcesSet = new Set([].concat(_toConsumableArray(n.optional_resource), _toConsumableArray(n.default_resource)));
+            // 规则 1
+            var sameCartItems = cartItems.filter(function (m) {
+              var _m$_productOrigin, _targetProductData$id;
+              return ((_m$_productOrigin = m._productOrigin) === null || _m$_productOrigin === void 0 || (_m$_productOrigin = _m$_productOrigin.id) === null || _m$_productOrigin === void 0 ? void 0 : _m$_productOrigin.toString()) === (targetProductData === null || targetProductData === void 0 || (_targetProductData$id = targetProductData.id) === null || _targetProductData$id === void 0 ? void 0 : _targetProductData$id.toString()) && "".concat(m.start_date, " ").concat(m.start_time) === item.start && "".concat(m.start_date, " ").concat(m.end_time) === item.end;
+            });
+            if (sameCartItems.length > 0 && sameCartItems.length >= currentResourcesSet.size || sameCartItems.length > bookingLeft) {
+              bookingLeft = 0;
+              count = 0;
+            }
+            // 规则 2
+            var otherCartItems = cartItems.filter(function (m) {
+              var _m$_productOrigin2, _targetProductData$id2;
+              return ((_m$_productOrigin2 = m._productOrigin) === null || _m$_productOrigin2 === void 0 || (_m$_productOrigin2 = _m$_productOrigin2.id) === null || _m$_productOrigin2 === void 0 ? void 0 : _m$_productOrigin2.toString()) !== (targetProductData === null || targetProductData === void 0 || (_targetProductData$id2 = targetProductData.id) === null || _targetProductData$id2 === void 0 ? void 0 : _targetProductData$id2.toString()) && "".concat(m.start_date, " ").concat(m.start_time) === item.start && "".concat(m.start_date, " ").concat(m.end_time) === item.end;
+            });
+            otherCartItems.forEach(function (m) {
+              var _m$_productOrigin3;
+              var sameTypeResources = (_m$_productOrigin3 = m._productOrigin) === null || _m$_productOrigin3 === void 0 || (_m$_productOrigin3 = _m$_productOrigin3.product_resource) === null || _m$_productOrigin3 === void 0 || (_m$_productOrigin3 = _m$_productOrigin3.resources) === null || _m$_productOrigin3 === void 0 ? void 0 : _m$_productOrigin3.find(function (m) {
+                return m.type === n.type;
               });
-              if (mTimes.length === 0) return;
-              var resourceAvailableCapacity = 0;
-              mTimes.forEach(function (childTime) {
-                var res = getIsUsableByTimeItem({
-                  timeSlice: {
-                    start_time: item.start,
-                    end_time: item.end,
-                    start_at: dayjs(item.start),
-                    end_at: dayjs(item.end)
-                  },
-                  time: childTime,
-                  resource: resource,
-                  currentCount: 1,
-                  resourcesUseableMap: resourcesUseableMap,
-                  cut_off_time: targetProductData === null || targetProductData === void 0 ? void 0 : targetProductData.cut_off_time
+              var sameTypeResourcesSet = new Set([].concat(_toConsumableArray((sameTypeResources === null || sameTypeResources === void 0 ? void 0 : sameTypeResources.optional_resource) || []), _toConsumableArray((sameTypeResources === null || sameTypeResources === void 0 ? void 0 : sameTypeResources.default_resource) || [])));
+              // 把sameTypeResourcesSet 加到currentResourcesSet
+              sameTypeResourcesSet.forEach(function (resource) {
+                return currentResourcesSet.add(resource);
+              });
+            });
+            // 先确定是否每一个currentResourcesSet在这个时间点的 event_list 都是空的,如果不是空的还需要把他踢出currentResourcesSet
+            var currentDataResources = _this14.store.date.getResourcesListByDate(dayjs(item.start).format('YYYY-MM-DD'));
+            currentDataResources === null || currentDataResources === void 0 || currentDataResources.forEach(function (m) {
+              if (currentResourcesSet.has(m.id)) {
+                var mTimes = m.times.filter(function (n) {
+                  return !dayjs(n.start_at).isAfter(dayjs(item.start), 'minute') && !dayjs(n.end_at).isBefore(dayjs(item.end), 'minute') || dayjs(n.start_at).isBefore(dayjs(item.end), 'minute') && dayjs(n.end_at).isAfter(dayjs(item.start), 'minute');
                 });
-                if ((resourcesUseableMap === null || resourcesUseableMap === void 0 ? void 0 : resourcesUseableMap[resource.id]) !== false && res.reason !== 'capacityOnly') {
-                  resourcesUseableMap[resource.id] = res.usable;
-                }
-                if (res.usable && !resource.onlyComputed) {
-                  resourceAvailableCapacity = Math.max(resourceAvailableCapacity, res.remainingCapacity);
-                  availableResourceCount++;
+                if (!mTimes.length || mTimes.some(function (n) {
+                  return n.event_list.length;
+                })) {
+                  currentResourcesSet.delete(m.id);
                 }
-              });
-              totalAvailableCapacity += resourceAvailableCapacity;
+              }
             });
-
-            // 减去购物车中已占用的容量
-            var netAvailableCapacity = Math.max(0, totalAvailableCapacity - cartUsageForThisType);
-            if (netAvailableCapacity < minAvailableCount) {
-              minAvailableCount = netAvailableCapacity;
-            }
-            if (netAvailableCapacity > 0) {
-              hasAnyAvailableResource = true;
+            if (currentResourcesSet.size > 0 && otherCartItems.length + sameCartItems.length >= currentResourcesSet.size) {
+              bookingLeft = 0;
+              count = 0;
             }
           } else {
-            // 单个预约：计算可用资源个数
-            var _availableResourceCount = 0;
-            resourcesInType.forEach(function (resource) {
-              var mTimes = resource.times.filter(function (n) {
+            // 多个预约的检测规则：
+            // 规则1、跟我一样的商品同一时间在购物车需要的容量总数不可以超过我配置的资源的 capacity 之和
+            var _sameCartItems = cartItems.filter(function (m) {
+              var _m$_productOrigin4, _targetProductData$id3;
+              return ((_m$_productOrigin4 = m._productOrigin) === null || _m$_productOrigin4 === void 0 || (_m$_productOrigin4 = _m$_productOrigin4.id) === null || _m$_productOrigin4 === void 0 ? void 0 : _m$_productOrigin4.toString()) === (targetProductData === null || targetProductData === void 0 || (_targetProductData$id3 = targetProductData.id) === null || _targetProductData$id3 === void 0 ? void 0 : _targetProductData$id3.toString()) && "".concat(m.start_date, " ").concat(m.start_time) === item.start && "".concat(m.start_date, " ").concat(m.end_time) === item.end;
+            });
+            var sameCartNeedCapacity = _sameCartItems.reduce(function (acc, curr) {
+              return acc + getCapacityInfoByCartItem(curr).currentCapacity;
+            }, 0);
+            var currentProductResourcesCapacity = n.renderList.reduce(function (acc, curr) {
+              return !curr.onlyComputed ? acc + curr.capacity || 0 : acc;
+            }, 0);
+            if (sameCartNeedCapacity >= currentProductResourcesCapacity) {
+              bookingLeft = 0;
+              count = 0;
+            }
+            // 规则2、不管是不是跟我一样的商品，只需要跟我当前商品有同一种类型的资源的同一时间的，把所有购物车的 capacity 之和 和 所有当前类型资源的 capacity 之和比较，如果超过了resourcesCapacity，则不可用
+            // const otherCartItems = cartItems.filter((m) => m._productOrigin?.id?.toString() !== targetProductData?.id?.toString() && m.start_time === item.start && m.end_time === item.end);
+            var otherSameTimesCartItems = cartItems.filter(function (m) {
+              return "".concat(m.start_date, " ").concat(m.start_time) === item.start && "".concat(m.start_date, " ").concat(m.end_time) === item.end;
+            });
+            var otherCartNeedCapacity = otherSameTimesCartItems.reduce(function (acc, curr) {
+              return acc + getCapacityInfoByCartItem(curr).currentCapacity;
+            }, 0);
+            var allRenderList = _toConsumableArray(n.renderList.filter(function (m) {
+              return !m.onlyComputed;
+            }));
+            otherSameTimesCartItems.forEach(function (m) {
+              var _m$_productOrigin5;
+              var productResources = getResourcesByProduct(getResourcesMap((targetResourceDate === null || targetResourceDate === void 0 ? void 0 : targetResourceDate.resource) || []), ((_m$_productOrigin5 = m._productOrigin) === null || _m$_productOrigin5 === void 0 || (_m$_productOrigin5 = _m$_productOrigin5.product_resource) === null || _m$_productOrigin5 === void 0 ? void 0 : _m$_productOrigin5.resources) || [], selectedResources, 1);
+              productResources.forEach(function (m) {
+                if (m.id === n.id) {
+                  m.renderList.forEach(function (n) {
+                    if (!n.onlyComputed && !allRenderList.find(function (m) {
+                      return m.id === n.id;
+                    })) {
+                      allRenderList.push(n);
+                    }
+                  });
+                }
+              });
+            });
+            var currentTypeResourcesCapacity = allRenderList.reduce(function (acc, curr) {
+              return acc + curr.capacity || 0;
+            }, 0);
+            // 计算当前时间段内所有资源的已使用容量
+            var usedCapacity = allRenderList.reduce(function (acc, curr) {
+              var mTimes = curr.times.filter(function (n) {
                 return !dayjs(n.start_at).isAfter(dayjs(item.start), 'minute') && !dayjs(n.end_at).isBefore(dayjs(item.end), 'minute') || dayjs(n.start_at).isBefore(dayjs(item.end), 'minute') && dayjs(n.end_at).isAfter(dayjs(item.start), 'minute');
               });
-              if (mTimes.length === 0) return;
-              var isResourceAvailable = false;
-              mTimes.forEach(function (childTime) {
-                var res = getIsUsableByTimeItem({
-                  timeSlice: {
-                    start_time: item.start,
-                    end_time: item.end,
-                    start_at: dayjs(item.start),
-                    end_at: dayjs(item.end)
-                  },
-                  time: childTime,
-                  resource: resource,
-                  currentCount: 1,
-                  resourcesUseableMap: resourcesUseableMap,
-                  cut_off_time: targetProductData === null || targetProductData === void 0 ? void 0 : targetProductData.cut_off_time
+              // 这里为什么要设置个 map，因为有可能日程有重叠，所以要把重叠的 event_list 去除
+              var mSet = new Map();
+              mTimes.forEach(function (n) {
+                // acc += n.event_list?.reduce((acc: any, curr: any) => acc + curr.pax, 0);
+                // mSet.set(n)
+                n.event_list.forEach(function (m) {
+                  mSet.set(m.id, m.pax || 1);
                 });
-                if ((resourcesUseableMap === null || resourcesUseableMap === void 0 ? void 0 : resourcesUseableMap[resource.id]) !== false && res.reason !== 'capacityOnly') {
-                  resourcesUseableMap[resource.id] = res.usable;
-                }
-                if (res.usable && !resource.onlyComputed) {
-                  isResourceAvailable = true;
-                }
               });
-              if (isResourceAvailable) {
-                _availableResourceCount++;
-              }
-            });
-
-            // 减去购物车中需要占用的资源个数
-            var netAvailableResources = Math.max(0, _availableResourceCount - cartUsageForThisType);
-            if (netAvailableResources < minAvailableCount) {
-              minAvailableCount = netAvailableResources;
-            }
-            if (netAvailableResources > 0) {
-              hasAnyAvailableResource = true;
+              acc += Array.from(mSet.values()).reduce(function (acc, curr) {
+                return acc + curr;
+              }, 0);
+              return acc;
+            }, 0);
+            // 如果已使用容量超过了当前类型资源的容量，则不可用
+            if (sameCartNeedCapacity + otherCartNeedCapacity + usedCapacity >= currentTypeResourcesCapacity) {
+              bookingLeft = 0;
+              count = 0;
             }
-            totalBookingLeft += netAvailableResources;
           }
         });
         var startDayJs = dayjs(item.start);
         var endDayJs = dayjs(item.end);
-
-        // 最终的可用容量是所有资源类型中最小的那个
-        var finalCount = hasAnyAvailableResource ? minAvailableCount === Number.MAX_SAFE_INTEGER ? 0 : minAvailableCount : 0;
         return {
           start_time: startDayJs.format('HH:mm'),
           end_time: endDayJs.format('HH:mm'),
           start_at: startDayJs,
           end_at: endDayJs,
-          count: finalCount,
-          left: Math.max(0, totalBookingLeft)
+          count: count,
+          left: bookingLeft
         };
       });
       return formatScheduleTimeSlots;
@@ -2639,7 +2699,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "checkMaxDurationCapacity",
     value: function checkMaxDurationCapacity() {
-      var _this14 = this;
+      var _this15 = this;
       var cartItems = cloneDeep(this.store.cart.getItems());
       if (cartItems.length === 0) return {
         success: true,
@@ -2746,9 +2806,9 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
             items.forEach(function (cartItem) {
               var productResourceIds = getResourcesIdsByProduct(cartItem._productOrigin);
               productResourceIds.forEach(function (resourceId) {
-                var _resource$form_id2;
+                var _resource$form_id;
                 var resource = resourcesMap[resourceId];
-                if (resource && ((_resource$form_id2 = resource.form_id) === null || _resource$form_id2 === void 0 ? void 0 : _resource$form_id2.toString()) === targetFormId) {
+                if (resource && ((_resource$form_id = resource.form_id) === null || _resource$form_id === void 0 ? void 0 : _resource$form_id.toString()) === targetFormId) {
                   // 避免重复添加同一个资源
                   if (!resourcesOfThisType.find(function (r) {
                     return r.id === resource.id;
@@ -2840,7 +2900,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
             }));
 
             // 找到所有资源都可用的时间段
-            var commonTimeSlots = _this14.findCommonAvailableTimeSlots(resourcesOfThisType);
+            var commonTimeSlots = _this15.findCommonAvailableTimeSlots(resourcesOfThisType);
             console.log("\u8D44\u6E90\u7C7B\u578B ".concat(resourceCode, " \u7684\u516C\u5171\u65F6\u95F4\u6BB5:"), commonTimeSlots);
             if (commonTimeSlots.length === 0) {
               console.log("\u8D44\u6E90\u7C7B\u578B ".concat(resourceCode, " \u6CA1\u6709\u516C\u5171\u53EF\u7528\u65F6\u95F4\u6BB5"));
@@ -2930,8 +2990,8 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           var resourcesIdSet = new Set();
 
           // 获取资源数据
-          var dateRange = _this14.store.date.getDateRange();
-          var resourcesDates = _this14.store.date.getDateList();
+          var dateRange = _this15.store.date.getDateRange();
+          var resourcesDates = _this15.store.date.getDateList();
           var targetResourceDate = resourcesDates.find(function (n) {
             return n.date === startDate;
           });

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

@@ -326,7 +326,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     };
     setOtherData(key: string, value: any): void;
     getOtherData(key: string): any;
-    getProductTypeById(id: number): Promise<"normal" | "duration" | "session">;
+    getProductTypeById(id: number): Promise<"duration" | "session" | "normal">;
     /**
      * 提供给 UI 的方法，减轻 UI 层的计算压力，UI 层只需要传递 cartItemId 和 resourceCode 即返回对应的 renderList
      *

package/lib/solution/BookingByStep/index.js

@@ -1691,126 +1691,149 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     )) == null ? void 0 : _e.id;
     const formatScheduleTimeSlots = scheduleTimeSlots.map((item) => {
       const resourcesUseableMap = {};
-      const resourceTypeMap = {};
-      allProductResources == null ? void 0 : allProductResources.forEach((resource) => {
-        var _a2;
-        const formId = ((_a2 = resource.form_id) == null ? void 0 : _a2.toString()) || "default";
-        if (!resourceTypeMap[formId]) {
-          resourceTypeMap[formId] = [];
+      let count = 0;
+      let bookingLeft = 0;
+      allProductResources == null ? void 0 : allProductResources.forEach((m) => {
+        let currentResourcesCount = 0;
+        const currentResourcesTimeSlotCanUsedArr = [];
+        const mTimes = m.times.filter((n) => {
+          return !(0, import_dayjs.default)(n.start_at).isAfter((0, import_dayjs.default)(item.start), "minute") && !(0, import_dayjs.default)(n.end_at).isBefore((0, import_dayjs.default)(item.end), "minute") || (0, import_dayjs.default)(n.start_at).isBefore((0, import_dayjs.default)(item.end), "minute") && (0, import_dayjs.default)(n.end_at).isAfter((0, import_dayjs.default)(item.start), "minute");
+        });
+        if (mTimes.length === 0) {
+          return;
+        }
+        mTimes.forEach((childTiem) => {
+          const res = (0, import_resources.getIsUsableByTimeItem)({
+            timeSlice: {
+              start_time: item.start,
+              end_time: item.end,
+              start_at: (0, import_dayjs.default)(item.start),
+              end_at: (0, import_dayjs.default)(item.end)
+            },
+            time: childTiem,
+            resource: m,
+            currentCount: 1,
+            resourcesUseableMap,
+            cut_off_time: targetProductData == null ? void 0 : targetProductData.cut_off_time
+          });
+          if ((resourcesUseableMap == null ? void 0 : resourcesUseableMap[m.id]) !== false && res.reason !== "capacityOnly") {
+            resourcesUseableMap[m.id] = res.usable;
+          }
+          if (res.usable && res.remainingCapacity >= count && !m.onlyComputed) {
+            currentResourcesCount = res.remainingCapacity;
+          }
+          currentResourcesTimeSlotCanUsedArr.push(res.usable);
+        });
+        if (!currentResourcesTimeSlotCanUsedArr.some(
+          (n) => n === false
+        ) && // 只统计第一种资源的容量和 left
+        m.form_id === firstEnabledResourceId) {
+          if (currentResourcesCount >= count) {
+            count = currentResourcesCount;
+          }
+          if (!m.onlyComputed) {
+            bookingLeft += 1;
+          }
         }
-        resourceTypeMap[formId].push(resource);
-      });
-      const cartCapacityUsage = (0, import_capacity.calculateCartItemsCapacityUsageByResourceType)({
-        cartItems,
-        timeSlotStart: item.start,
-        timeSlotEnd: item.end,
-        allProductResources: allProductResources || []
       });
-      let minAvailableCount = Number.MAX_SAFE_INTEGER;
-      let totalBookingLeft = 0;
-      let hasAnyAvailableResource = false;
-      Object.keys(resourceTypeMap).forEach((formId) => {
-        const resourcesInType = resourceTypeMap[formId];
-        if (resourcesInType.length === 0)
-          return;
-        const firstResource = resourcesInType[0];
-        const isMultipleBooking = firstResource.resourceType === "multiple";
-        const cartUsageForThisType = cartCapacityUsage[formId] || 0;
-        if (isMultipleBooking) {
-          let totalAvailableCapacity = 0;
-          let availableResourceCount = 0;
-          resourcesInType.forEach((resource) => {
-            const mTimes = resource.times.filter((n) => {
-              return !(0, import_dayjs.default)(n.start_at).isAfter((0, import_dayjs.default)(item.start), "minute") && !(0, import_dayjs.default)(n.end_at).isBefore((0, import_dayjs.default)(item.end), "minute") || (0, import_dayjs.default)(n.start_at).isBefore((0, import_dayjs.default)(item.end), "minute") && (0, import_dayjs.default)(n.end_at).isAfter((0, import_dayjs.default)(item.start), "minute");
-            });
-            if (mTimes.length === 0)
-              return;
-            let resourceAvailableCapacity = 0;
-            mTimes.forEach((childTime) => {
-              const res = (0, import_resources.getIsUsableByTimeItem)({
-                timeSlice: {
-                  start_time: item.start,
-                  end_time: item.end,
-                  start_at: (0, import_dayjs.default)(item.start),
-                  end_at: (0, import_dayjs.default)(item.end)
-                },
-                time: childTime,
-                resource,
-                currentCount: 1,
-                resourcesUseableMap,
-                cut_off_time: targetProductData == null ? void 0 : targetProductData.cut_off_time
+      const cartItems2 = this.store.cart.getItems();
+      productResources.forEach((n) => {
+        if (n.type === "single") {
+          const currentResourcesSet = /* @__PURE__ */ new Set([...n.optional_resource, ...n.default_resource]);
+          const sameCartItems = cartItems2.filter((m) => {
+            var _a2, _b2, _c2;
+            return ((_b2 = (_a2 = m._productOrigin) == null ? void 0 : _a2.id) == null ? void 0 : _b2.toString()) === ((_c2 = targetProductData == null ? void 0 : targetProductData.id) == null ? void 0 : _c2.toString()) && `${m.start_date} ${m.start_time}` === item.start && `${m.start_date} ${m.end_time}` === item.end;
+          });
+          if (sameCartItems.length > 0 && sameCartItems.length >= currentResourcesSet.size || sameCartItems.length > bookingLeft) {
+            bookingLeft = 0;
+            count = 0;
+          }
+          const otherCartItems = cartItems2.filter((m) => {
+            var _a2, _b2, _c2;
+            return ((_b2 = (_a2 = m._productOrigin) == null ? void 0 : _a2.id) == null ? void 0 : _b2.toString()) !== ((_c2 = targetProductData == null ? void 0 : targetProductData.id) == null ? void 0 : _c2.toString()) && `${m.start_date} ${m.start_time}` === item.start && `${m.start_date} ${m.end_time}` === item.end;
+          });
+          otherCartItems.forEach((m) => {
+            var _a2, _b2, _c2;
+            const sameTypeResources = (_c2 = (_b2 = (_a2 = m._productOrigin) == null ? void 0 : _a2.product_resource) == null ? void 0 : _b2.resources) == null ? void 0 : _c2.find((m2) => m2.type === n.type);
+            const sameTypeResourcesSet = /* @__PURE__ */ new Set([...(sameTypeResources == null ? void 0 : sameTypeResources.optional_resource) || [], ...(sameTypeResources == null ? void 0 : sameTypeResources.default_resource) || []]);
+            sameTypeResourcesSet.forEach((resource) => currentResourcesSet.add(resource));
+          });
+          const currentDataResources = this.store.date.getResourcesListByDate((0, import_dayjs.default)(item.start).format("YYYY-MM-DD"));
+          currentDataResources == null ? void 0 : currentDataResources.forEach((m) => {
+            if (currentResourcesSet.has(m.id)) {
+              const mTimes = m.times.filter((n2) => {
+                return !(0, import_dayjs.default)(n2.start_at).isAfter((0, import_dayjs.default)(item.start), "minute") && !(0, import_dayjs.default)(n2.end_at).isBefore((0, import_dayjs.default)(item.end), "minute") || (0, import_dayjs.default)(n2.start_at).isBefore((0, import_dayjs.default)(item.end), "minute") && (0, import_dayjs.default)(n2.end_at).isAfter((0, import_dayjs.default)(item.start), "minute");
               });
-              if ((resourcesUseableMap == null ? void 0 : resourcesUseableMap[resource.id]) !== false && res.reason !== "capacityOnly") {
-                resourcesUseableMap[resource.id] = res.usable;
+              if (!mTimes.length || mTimes.some((n2) => n2.event_list.length)) {
+                currentResourcesSet.delete(m.id);
               }
-              if (res.usable && !resource.onlyComputed) {
-                resourceAvailableCapacity = Math.max(resourceAvailableCapacity, res.remainingCapacity);
-                availableResourceCount++;
-              }
-            });
-            totalAvailableCapacity += resourceAvailableCapacity;
+            }
           });
-          const netAvailableCapacity = Math.max(0, totalAvailableCapacity - cartUsageForThisType);
-          if (netAvailableCapacity < minAvailableCount) {
-            minAvailableCount = netAvailableCapacity;
-          }
-          if (netAvailableCapacity > 0) {
-            hasAnyAvailableResource = true;
+          if (currentResourcesSet.size > 0 && otherCartItems.length + sameCartItems.length >= currentResourcesSet.size) {
+            bookingLeft = 0;
+            count = 0;
           }
         } else {
-          let availableResourceCount = 0;
-          resourcesInType.forEach((resource) => {
-            const mTimes = resource.times.filter((n) => {
-              return !(0, import_dayjs.default)(n.start_at).isAfter((0, import_dayjs.default)(item.start), "minute") && !(0, import_dayjs.default)(n.end_at).isBefore((0, import_dayjs.default)(item.end), "minute") || (0, import_dayjs.default)(n.start_at).isBefore((0, import_dayjs.default)(item.end), "minute") && (0, import_dayjs.default)(n.end_at).isAfter((0, import_dayjs.default)(item.start), "minute");
-            });
-            if (mTimes.length === 0)
-              return;
-            let isResourceAvailable = false;
-            mTimes.forEach((childTime) => {
-              const res = (0, import_resources.getIsUsableByTimeItem)({
-                timeSlice: {
-                  start_time: item.start,
-                  end_time: item.end,
-                  start_at: (0, import_dayjs.default)(item.start),
-                  end_at: (0, import_dayjs.default)(item.end)
-                },
-                time: childTime,
-                resource,
-                currentCount: 1,
-                resourcesUseableMap,
-                cut_off_time: targetProductData == null ? void 0 : targetProductData.cut_off_time
-              });
-              if ((resourcesUseableMap == null ? void 0 : resourcesUseableMap[resource.id]) !== false && res.reason !== "capacityOnly") {
-                resourcesUseableMap[resource.id] = res.usable;
-              }
-              if (res.usable && !resource.onlyComputed) {
-                isResourceAvailable = true;
+          const sameCartItems = cartItems2.filter((m) => {
+            var _a2, _b2, _c2;
+            return ((_b2 = (_a2 = m._productOrigin) == null ? void 0 : _a2.id) == null ? void 0 : _b2.toString()) === ((_c2 = targetProductData == null ? void 0 : targetProductData.id) == null ? void 0 : _c2.toString()) && `${m.start_date} ${m.start_time}` === item.start && `${m.start_date} ${m.end_time}` === item.end;
+          });
+          const sameCartNeedCapacity = sameCartItems.reduce((acc, curr) => acc + (0, import_capacity.getCapacityInfoByCartItem)(curr).currentCapacity, 0);
+          const currentProductResourcesCapacity = n.renderList.reduce((acc, curr) => !curr.onlyComputed ? acc + curr.capacity || 0 : acc, 0);
+          if (sameCartNeedCapacity >= currentProductResourcesCapacity) {
+            bookingLeft = 0;
+            count = 0;
+          }
+          const otherSameTimesCartItems = cartItems2.filter((m) => `${m.start_date} ${m.start_time}` === item.start && `${m.start_date} ${m.end_time}` === item.end);
+          const otherCartNeedCapacity = otherSameTimesCartItems.reduce((acc, curr) => acc + (0, import_capacity.getCapacityInfoByCartItem)(curr).currentCapacity, 0);
+          const allRenderList = [...n.renderList.filter((m) => !m.onlyComputed)];
+          otherSameTimesCartItems.forEach((m) => {
+            var _a2, _b2;
+            const productResources2 = (0, import_resources.getResourcesByProduct)(
+              (0, import_utils.getResourcesMap)((targetResourceDate == null ? void 0 : targetResourceDate.resource) || []),
+              ((_b2 = (_a2 = m._productOrigin) == null ? void 0 : _a2.product_resource) == null ? void 0 : _b2.resources) || [],
+              selectedResources,
+              1
+            );
+            productResources2.forEach((m2) => {
+              if (m2.id === n.id) {
+                m2.renderList.forEach((n2) => {
+                  if (!n2.onlyComputed && !allRenderList.find((m3) => m3.id === n2.id)) {
+                    allRenderList.push(n2);
+                  }
+                });
               }
             });
-            if (isResourceAvailable) {
-              availableResourceCount++;
-            }
           });
-          const netAvailableResources = Math.max(0, availableResourceCount - cartUsageForThisType);
-          if (netAvailableResources < minAvailableCount) {
-            minAvailableCount = netAvailableResources;
-          }
-          if (netAvailableResources > 0) {
-            hasAnyAvailableResource = true;
+          const currentTypeResourcesCapacity = allRenderList.reduce((acc, curr) => acc + curr.capacity || 0, 0);
+          const usedCapacity = allRenderList.reduce((acc, curr) => {
+            const mTimes = curr.times.filter((n2) => {
+              return !(0, import_dayjs.default)(n2.start_at).isAfter((0, import_dayjs.default)(item.start), "minute") && !(0, import_dayjs.default)(n2.end_at).isBefore((0, import_dayjs.default)(item.end), "minute") || (0, import_dayjs.default)(n2.start_at).isBefore((0, import_dayjs.default)(item.end), "minute") && (0, import_dayjs.default)(n2.end_at).isAfter((0, import_dayjs.default)(item.start), "minute");
+            });
+            const mSet = /* @__PURE__ */ new Map();
+            mTimes.forEach((n2) => {
+              n2.event_list.forEach((m) => {
+                mSet.set(m.id, m.pax || 1);
+              });
+            });
+            acc += Array.from(mSet.values()).reduce((acc2, curr2) => acc2 + curr2, 0);
+            return acc;
+          }, 0);
+          if (sameCartNeedCapacity + otherCartNeedCapacity + usedCapacity >= currentTypeResourcesCapacity) {
+            bookingLeft = 0;
+            count = 0;
           }
-          totalBookingLeft += netAvailableResources;
         }
       });
       const startDayJs = (0, import_dayjs.default)(item.start);
       const endDayJs = (0, import_dayjs.default)(item.end);
-      const finalCount = hasAnyAvailableResource ? minAvailableCount === Number.MAX_SAFE_INTEGER ? 0 : minAvailableCount : 0;
       return {
         start_time: startDayJs.format("HH:mm"),
         end_time: endDayJs.format("HH:mm"),
         start_at: startDayJs,
         end_at: endDayJs,
-        count: finalCount,
-        left: Math.max(0, totalBookingLeft)
+        count,
+        left: bookingLeft
       };
     });
     return formatScheduleTimeSlots;

package/package.json

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