@pisell/pisellos 1.0.57 → 1.0.58

package/dist/solution/BookingByStep/utils/timeslots.js

@@ -95,71 +95,122 @@ export function findFastestAvailableResource(_ref2) {
   var currentTime = dayjs();
   var fastestTime = null;
   var fastestResources = [];
+  console.log('[TimeslotUtils] 查找最快可用资源:', {
+    currentTime: currentTime.format('YYYY-MM-DD HH:mm:ss'),
+    resourceCount: resources.length,
+    currentCapacity: currentCapacity,
+    countMap: countMap
+  });
 
   // 遍历所有资源，找到最快可用的时间点
   var _iterator2 = _createForOfIteratorHelper(resources),
     _step2;
   try {
     for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-      var _resource = _step2.value;
-      // 获取资源当天的时间段
-      var todayTimes = _resource.times.filter(function (time) {
-        return dayjs(time.start_at).isSame(currentTime, 'day');
-      });
-      if (todayTimes.length === 0) continue;
-
-      // 按开始时间排序
-      todayTimes.sort(function (a, b) {
-        return dayjs(a.start_at).diff(dayjs(b.start_at));
+      var resource = _step2.value;
+      // 获取资源当天且还在工作时间内的时间段
+      var todayTimes = resource.times.filter(function (time) {
+        var isToday = dayjs(time.start_at).isSame(currentTime, 'day');
+        var isStillWorking = dayjs(time.end_at).isAfter(currentTime);
+        return isToday && isStillWorking;
       });
-
-      // 找到第一个可用的时间段
+      if (todayTimes.length === 0) {
+        console.log("[TimeslotUtils] \u8D44\u6E90 ".concat(resource.id, "(").concat(resource.main_field, ") \u4ECA\u65E5\u65E0\u53EF\u7528\u65F6\u95F4\u6BB5"));
+        continue;
+      }
       var _iterator3 = _createForOfIteratorHelper(todayTimes),
         _step3;
       try {
         var _loop = function _loop() {
+            var _time$event_list, _time$event_list2;
             var time = _step3.value;
-            var startTime = dayjs(time.start_at);
-
-            // 如果开始时间在当前时间之前，跳过
-            if (startTime.isBefore(currentTime)) return 0; // continue
-
-            // 检查这个时间段是否可用
-            if (_resource.resourceType === 'single') {
-              var _time$event_list;
-              // 单个预约类型：检查是否有预约
-              var hasBooking = (_time$event_list = time.event_list) === null || _time$event_list === void 0 ? void 0 : _time$event_list.some(function (event) {
-                return dayjs(event.start_at).isSame(startTime);
-              });
-              if (!hasBooking) {
-                if (!fastestTime || startTime.isSame(fastestTime)) {
-                  fastestTime = startTime;
-                  fastestResources.push(_resource);
-                } else if (startTime.isBefore(fastestTime)) {
-                  fastestTime = startTime;
-                  fastestResources = [_resource];
-                }
-                return 1; // break
-              }
-            } else {
-              var _time$event_list2;
-              // 多个预约类型：检查容量
-              var totalCapacity = _resource.capacity || 0;
-              var usedCapacity = ((_time$event_list2 = time.event_list) === null || _time$event_list2 === void 0 ? void 0 : _time$event_list2.reduce(function (sum, event) {
-                return dayjs(event.start_at).isSame(startTime) ? sum + (event.pax || 0) : sum;
-              }, 0)) || 0;
-              var remainingCapacity = totalCapacity - usedCapacity;
-              if (remainingCapacity >= (countMap[_resource.id] || 0) + currentCapacity) {
-                if (!fastestTime || startTime.isSame(fastestTime)) {
-                  fastestTime = startTime;
-                  fastestResources.push(_resource);
-                } else if (startTime.isBefore(fastestTime)) {
-                  fastestTime = startTime;
-                  fastestResources = [_resource];
+            var workStartTime = dayjs(time.start_at);
+            var workEndTime = dayjs(time.end_at);
+
+            // 确定检查的起始时间（当前时间 vs 工作开始时间）
+            var nextAvailableTime = currentTime.isBefore(workStartTime) ? workStartTime : currentTime;
+            console.log("[TimeslotUtils] \u68C0\u67E5\u8D44\u6E90 ".concat(resource.id, "(").concat(resource.main_field, "):"), {
+              workTime: "".concat(workStartTime.format('HH:mm'), "-").concat(workEndTime.format('HH:mm')),
+              checkStartTime: nextAvailableTime.format('HH:mm:ss'),
+              eventCount: ((_time$event_list = time.event_list) === null || _time$event_list === void 0 ? void 0 : _time$event_list.length) || 0
+            });
+
+            // 获取所有影响的预约事件（当前时间之后的）
+            var relevantEvents = ((_time$event_list2 = time.event_list) === null || _time$event_list2 === void 0 ? void 0 : _time$event_list2.filter(function (event) {
+              var eventEnd = dayjs(event.end_at);
+              return eventEnd.isAfter(nextAvailableTime);
+            })) || [];
+
+            // 按开始时间排序
+            relevantEvents.sort(function (a, b) {
+              return dayjs(a.start_at).diff(dayjs(b.start_at));
+            });
+
+            // 检查从 nextAvailableTime 开始的可用性
+            var finalAvailableTime = nextAvailableTime;
+            var _iterator4 = _createForOfIteratorHelper(relevantEvents),
+              _step4;
+            try {
+              for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+                var event = _step4.value;
+                var eventStart = dayjs(event.start_at);
+                var eventEnd = dayjs(event.end_at);
+                console.log("[TimeslotUtils] \u68C0\u67E5\u4E8B\u4EF6\u51B2\u7A81:", {
+                  resourceId: resource.id,
+                  eventTime: "".concat(eventStart.format('HH:mm'), "-").concat(eventEnd.format('HH:mm')),
+                  checkTime: finalAvailableTime.format('HH:mm:ss'),
+                  pax: event.pax || 1
+                });
+
+                // 检查资源类型和容量
+                if (resource.resourceType === 'single' || (resource.capacity || 1) === 1) {
+                  // 单人预约资源：检查时间冲突
+                  if (finalAvailableTime.isBefore(eventEnd) && eventStart.isBefore(finalAvailableTime.add(30, 'minute'))) {
+                    // 有冲突，使用事件结束时间
+                    finalAvailableTime = eventEnd;
+                    console.log("[TimeslotUtils] \u53D1\u73B0\u65F6\u95F4\u51B2\u7A81\uFF0C\u8C03\u6574\u5230: ".concat(finalAvailableTime.format('HH:mm:ss')));
+                  }
+                } else {
+                  // 多人预约资源：检查容量
+                  var totalCapacity = resource.capacity || 0;
+                  var currentUsedCapacity = countMap[resource.id] || 0;
+                  var eventUsedCapacity = event.pax || 1;
+
+                  // 如果在事件时间范围内，检查容量是否足够
+                  if (finalAvailableTime.isBefore(eventEnd) && eventStart.isBefore(finalAvailableTime.add(30, 'minute'))) {
+                    var totalRequiredCapacity = currentUsedCapacity + currentCapacity + eventUsedCapacity;
+                    if (totalRequiredCapacity > totalCapacity) {
+                      // 容量不足，使用事件结束时间
+                      finalAvailableTime = eventEnd;
+                      console.log("[TimeslotUtils] \u5BB9\u91CF\u4E0D\u8DB3\uFF0C\u8C03\u6574\u5230: ".concat(finalAvailableTime.format('HH:mm:ss')));
+                    }
+                  }
                 }
-                return 1; // break
               }
+
+              // 确保可用时间在工作时间内
+            } catch (err) {
+              _iterator4.e(err);
+            } finally {
+              _iterator4.f();
+            }
+            if (finalAvailableTime.isAfter(workEndTime)) {
+              console.log("[TimeslotUtils] \u8D44\u6E90 ".concat(resource.id, " \u53EF\u7528\u65F6\u95F4\u8D85\u51FA\u5DE5\u4F5C\u65F6\u95F4\uFF0C\u8DF3\u8FC7"));
+              return 0; // continue
             }
+            console.log("[TimeslotUtils] \u8D44\u6E90 ".concat(resource.id, "(").concat(resource.main_field, ") \u6700\u5FEB\u53EF\u7528\u65F6\u95F4: ").concat(finalAvailableTime.format('HH:mm:ss')));
+
+            // 更新最快可用时间和资源
+            if (!fastestTime || finalAvailableTime.isBefore(fastestTime)) {
+              fastestTime = finalAvailableTime;
+              fastestResources = [resource];
+              console.log("[TimeslotUtils] \u66F4\u65B0\u6700\u5FEB\u65F6\u95F4: ".concat(fastestTime.format('HH:mm:ss'), ", \u8D44\u6E90: ").concat(resource.main_field));
+            } else if (finalAvailableTime.isSame(fastestTime)) {
+              fastestResources.push(resource);
+              console.log("[TimeslotUtils] \u6DFB\u52A0\u76F8\u540C\u65F6\u95F4\u8D44\u6E90: ".concat(resource.main_field));
+            }
+            return 1; // break
+            // 每个资源只需要计算一次
           },
           _ret;
         for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
@@ -180,31 +231,22 @@ export function findFastestAvailableResource(_ref2) {
   } finally {
     _iterator2.f();
   }
-  if (!fastestTime || fastestResources.length === 0) return null;
+  if (!fastestTime || fastestResources.length === 0) {
+    console.log('[TimeslotUtils] 未找到可用资源');
+    return null;
+  }
+  console.log("[TimeslotUtils] \u627E\u5230 ".concat(fastestResources.length, " \u4E2A\u6700\u5FEB\u53EF\u7528\u8D44\u6E90\uFF0C\u65F6\u95F4: ").concat(fastestTime.format('HH:mm:ss')));
 
   // 如果只有一个最快可用的资源，直接返回
-  if (fastestResources.length === 1) return fastestResources[0];
-
-  // 如果有多个最快可用的资源，比较它们的空闲时间
-  var maxIdleTime = 0;
-  var selectedResource = null;
-  for (var _i2 = 0, _fastestResources = fastestResources; _i2 < _fastestResources.length; _i2++) {
-    var resource = _fastestResources[_i2];
-    var idleTime = calculateResourceAvailableTime({
-      resource: resource,
-      timeSlots: {
-        start_time: fastestTime.format('HH:mm'),
-        end_time: fastestTime.format('HH:mm'),
-        start_at: fastestTime,
-        end_at: fastestTime
-      },
-      currentCapacity: (countMap[resource.id] || 0) + currentCapacity
-    });
-    if (idleTime > maxIdleTime) {
-      maxIdleTime = idleTime;
-      selectedResource = resource;
-    }
+  if (fastestResources.length === 1) {
+    console.log("[TimeslotUtils] \u8FD4\u56DE\u552F\u4E00\u6700\u5FEB\u8D44\u6E90: ".concat(fastestResources[0].main_field));
+    return fastestResources[0];
   }
+
+  // 如果有多个最快可用的资源，选择第一个或根据其他逻辑选择
+  // 这里简化处理，直接返回第一个
+  var selectedResource = fastestResources[0];
+  console.log("[TimeslotUtils] \u8FD4\u56DE\u591A\u4E2A\u8D44\u6E90\u4E2D\u7684\u7B2C\u4E00\u4E2A: ".concat(selectedResource.main_field));
   return selectedResource;
 }
 

package/lib/solution/BookingByStep/utils/timeslots.js

@@ -83,74 +83,93 @@ function findFastestAvailableResource({
   const currentTime = (0, import_dayjs.default)();
   let fastestTime = null;
   let fastestResources = [];
+  console.log("[TimeslotUtils] 查找最快可用资源:", {
+    currentTime: currentTime.format("YYYY-MM-DD HH:mm:ss"),
+    resourceCount: resources.length,
+    currentCapacity,
+    countMap
+  });
   for (const resource of resources) {
     const todayTimes = resource.times.filter((time) => {
-      return (0, import_dayjs.default)(time.start_at).isSame(currentTime, "day");
+      const isToday = (0, import_dayjs.default)(time.start_at).isSame(currentTime, "day");
+      const isStillWorking = (0, import_dayjs.default)(time.end_at).isAfter(currentTime);
+      return isToday && isStillWorking;
     });
-    if (todayTimes.length === 0)
+    if (todayTimes.length === 0) {
+      console.log(`[TimeslotUtils] 资源 ${resource.id}(${resource.main_field}) 今日无可用时间段`);
       continue;
-    todayTimes.sort((a, b) => {
-      return (0, import_dayjs.default)(a.start_at).diff((0, import_dayjs.default)(b.start_at));
-    });
+    }
     for (const time of todayTimes) {
-      const startTime = (0, import_dayjs.default)(time.start_at);
-      if (startTime.isBefore(currentTime))
-        continue;
-      if (resource.resourceType === "single") {
-        const hasBooking = (_a = time.event_list) == null ? void 0 : _a.some((event) => {
-          return (0, import_dayjs.default)(event.start_at).isSame(startTime);
+      const workStartTime = (0, import_dayjs.default)(time.start_at);
+      const workEndTime = (0, import_dayjs.default)(time.end_at);
+      let nextAvailableTime = currentTime.isBefore(workStartTime) ? workStartTime : currentTime;
+      console.log(`[TimeslotUtils] 检查资源 ${resource.id}(${resource.main_field}):`, {
+        workTime: `${workStartTime.format("HH:mm")}-${workEndTime.format("HH:mm")}`,
+        checkStartTime: nextAvailableTime.format("HH:mm:ss"),
+        eventCount: ((_a = time.event_list) == null ? void 0 : _a.length) || 0
+      });
+      const relevantEvents = ((_b = time.event_list) == null ? void 0 : _b.filter((event) => {
+        const eventEnd = (0, import_dayjs.default)(event.end_at);
+        return eventEnd.isAfter(nextAvailableTime);
+      })) || [];
+      relevantEvents.sort(
+        (a, b) => (0, import_dayjs.default)(a.start_at).diff((0, import_dayjs.default)(b.start_at))
+      );
+      let finalAvailableTime = nextAvailableTime;
+      for (const event of relevantEvents) {
+        const eventStart = (0, import_dayjs.default)(event.start_at);
+        const eventEnd = (0, import_dayjs.default)(event.end_at);
+        console.log(`[TimeslotUtils] 检查事件冲突:`, {
+          resourceId: resource.id,
+          eventTime: `${eventStart.format("HH:mm")}-${eventEnd.format("HH:mm")}`,
+          checkTime: finalAvailableTime.format("HH:mm:ss"),
+          pax: event.pax || 1
         });
-        if (!hasBooking) {
-          if (!fastestTime || startTime.isSame(fastestTime)) {
-            fastestTime = startTime;
-            fastestResources.push(resource);
-          } else if (startTime.isBefore(fastestTime)) {
-            fastestTime = startTime;
-            fastestResources = [resource];
+        if (resource.resourceType === "single" || (resource.capacity || 1) === 1) {
+          if (finalAvailableTime.isBefore(eventEnd) && eventStart.isBefore(finalAvailableTime.add(30, "minute"))) {
+            finalAvailableTime = eventEnd;
+            console.log(`[TimeslotUtils] 发现时间冲突，调整到: ${finalAvailableTime.format("HH:mm:ss")}`);
           }
-          break;
-        }
-      } else {
-        const totalCapacity = resource.capacity || 0;
-        const usedCapacity = ((_b = time.event_list) == null ? void 0 : _b.reduce((sum, event) => {
-          return (0, import_dayjs.default)(event.start_at).isSame(startTime) ? sum + (event.pax || 0) : sum;
-        }, 0)) || 0;
-        const remainingCapacity = totalCapacity - usedCapacity;
-        if (remainingCapacity >= (countMap[resource.id] || 0) + currentCapacity) {
-          if (!fastestTime || startTime.isSame(fastestTime)) {
-            fastestTime = startTime;
-            fastestResources.push(resource);
-          } else if (startTime.isBefore(fastestTime)) {
-            fastestTime = startTime;
-            fastestResources = [resource];
+        } else {
+          const totalCapacity = resource.capacity || 0;
+          const currentUsedCapacity = countMap[resource.id] || 0;
+          const eventUsedCapacity = event.pax || 1;
+          if (finalAvailableTime.isBefore(eventEnd) && eventStart.isBefore(finalAvailableTime.add(30, "minute"))) {
+            const totalRequiredCapacity = currentUsedCapacity + currentCapacity + eventUsedCapacity;
+            if (totalRequiredCapacity > totalCapacity) {
+              finalAvailableTime = eventEnd;
+              console.log(`[TimeslotUtils] 容量不足，调整到: ${finalAvailableTime.format("HH:mm:ss")}`);
+            }
           }
-          break;
         }
       }
+      if (finalAvailableTime.isAfter(workEndTime)) {
+        console.log(`[TimeslotUtils] 资源 ${resource.id} 可用时间超出工作时间，跳过`);
+        continue;
+      }
+      console.log(`[TimeslotUtils] 资源 ${resource.id}(${resource.main_field}) 最快可用时间: ${finalAvailableTime.format("HH:mm:ss")}`);
+      if (!fastestTime || finalAvailableTime.isBefore(fastestTime)) {
+        fastestTime = finalAvailableTime;
+        fastestResources = [resource];
+        console.log(`[TimeslotUtils] 更新最快时间: ${fastestTime.format("HH:mm:ss")}, 资源: ${resource.main_field}`);
+      } else if (finalAvailableTime.isSame(fastestTime)) {
+        fastestResources.push(resource);
+        console.log(`[TimeslotUtils] 添加相同时间资源: ${resource.main_field}`);
+      }
+      break;
     }
   }
-  if (!fastestTime || fastestResources.length === 0)
+  if (!fastestTime || fastestResources.length === 0) {
+    console.log("[TimeslotUtils] 未找到可用资源");
     return null;
-  if (fastestResources.length === 1)
+  }
+  console.log(`[TimeslotUtils] 找到 ${fastestResources.length} 个最快可用资源，时间: ${fastestTime.format("HH:mm:ss")}`);
+  if (fastestResources.length === 1) {
+    console.log(`[TimeslotUtils] 返回唯一最快资源: ${fastestResources[0].main_field}`);
     return fastestResources[0];
-  let maxIdleTime = 0;
-  let selectedResource = null;
-  for (const resource of fastestResources) {
-    const idleTime = calculateResourceAvailableTime({
-      resource,
-      timeSlots: {
-        start_time: fastestTime.format("HH:mm"),
-        end_time: fastestTime.format("HH:mm"),
-        start_at: fastestTime,
-        end_at: fastestTime
-      },
-      currentCapacity: (countMap[resource.id] || 0) + currentCapacity
-    });
-    if (idleTime > maxIdleTime) {
-      maxIdleTime = idleTime;
-      selectedResource = resource;
-    }
   }
+  const selectedResource = fastestResources[0];
+  console.log(`[TimeslotUtils] 返回多个资源中的第一个: ${selectedResource.main_field}`);
   return selectedResource;
 }
 function filterConditionTimeSlots(times, startTime, endTime) {

package/package.json

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