@pisell/pisellos 0.0.567 → 0.0.569

package/dist/solution/BookingByStep/index.js

@@ -87,23 +87,22 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               this.core = core;
               this.store = options.store || {};
               this.otherParams = options.otherParams || {};
-              console.log('[BookingByStep] 初始化完成');
               // 获取依赖的插件
               this.request = core.getPlugin('request');
               this.window = core.getPlugin('window');
               this.shopStore = core.getPlugin('shopStore');
               if (this.request) {
-                _context.next = 9;
+                _context.next = 8;
                 break;
               }
               throw new Error('bookingByStep解决方案需要 request 插件支持');
-            case 9:
+            case 8:
               if (this.shopStore) {
-                _context.next = 11;
+                _context.next = 10;
                 break;
               }
               throw new Error('SummaryModule 需要 shopStore 插件支持');
-            case 11:
+            case 10:
               // 如果有传 cacheid，默认需要收集上面这些模块里用户操作选中的数据
               // 并且在上面 registerModule 的时候，读取 sessionStroage 里的数据，塞进默认值
               targetCacheData = {};
@@ -138,7 +137,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               });
               this.store.schedule.loadAllSchedule();
               this.core.effects.emit("".concat(this.name, ":onInited"), {});
-            case 19:
+            case 18:
             case "end":
               return _context.stop();
           }
@@ -3190,8 +3189,6 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
     key: "findCommonAvailableTimeSlots",
     value: function findCommonAvailableTimeSlots(resources) {
       if (resources.length === 0) return [];
-      console.log("\u8BA1\u7B97 ".concat(resources.length, " \u4E2A\u8D44\u6E90\u7684\u516C\u5171\u65F6\u95F4\u6BB5"));
-
       // 收集所有资源的时间段，转换为统一的时间格式
       var allTimeSlots = resources.map(function (resource) {
         return resource.times.map(function (time) {
@@ -3201,19 +3198,8 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           };
         });
       });
-      console.log('所有资源的时间段:', allTimeSlots.map(function (slots) {
-        return slots.map(function (slot) {
-          return "".concat(slot.start.format('HH:mm'), "-").concat(slot.end.format('HH:mm'));
-        });
-      }));
-
       // 找到公共时间段的交集
       var commonSlots = allTimeSlots[0]; // 从第一个资源的时间段开始
-      console.log('初始公共时间段:', commonSlots.map(function (slot) {
-        return "".concat(slot.start.format('HH:mm'), "-").concat(slot.end.format('HH:mm'));
-      }));
-
-      // 与其他资源的时间段求交集
       var _loop3 = function _loop3() {
         var currentResourceSlots = allTimeSlots[i];
         var intersections = [];
@@ -3234,14 +3220,11 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           });
         });
         if (intersections.length === 0) {
-          console.log("\u8D44\u6E90".concat(i, "\u4E0E\u5F53\u524D\u516C\u5171\u65F6\u95F4\u6BB5\u65E0\u4EA4\u96C6\uFF0C\u8DF3\u8FC7\u8BE5\u8D44\u6E90"));
           return 1; // continue
         }
         commonSlots = intersections;
-        console.log("\u4E0E\u8D44\u6E90".concat(i, "\u6C42\u4EA4\u96C6\u540E\u7684\u516C\u5171\u65F6\u95F4\u6BB5:"), commonSlots.map(function (slot) {
-          return "".concat(slot.start.format('HH:mm'), "-").concat(slot.end.format('HH:mm'));
-        }));
       };
+      // 与其他资源的时间段求交集
       for (var i = 1; i < allTimeSlots.length; i++) {
         if (_loop3()) continue;
       }
@@ -3253,7 +3236,6 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           endTime: slot.end.format('HH:mm')
         };
       });
-      console.log('最终公共时间段:', result);
       return result;
     }
   }, {
@@ -3363,7 +3345,6 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
             // 获取该资源类型对应的 form_id
             var targetFormId = resourceCodeToFormIdMap[resourceCode];
             if (!targetFormId) {
-              console.log("\u8D44\u6E90\u7C7B\u578B ".concat(resourceCode, " \u627E\u4E0D\u5230\u5BF9\u5E94\u7684 form_id"));
               return {
                 v: {
                   success: false,
@@ -3390,7 +3371,6 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               });
             });
             if (resourcesOfThisType.length === 0) {
-              console.log("\u8D44\u6E90\u7C7B\u578B ".concat(resourceCode, " \u6CA1\u6709\u627E\u5230\u53EF\u7528\u8D44\u6E90"));
               return {
                 v: {
                   success: false,
@@ -3457,24 +3437,13 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
             // 检查是否有容量问题
             if (requiredAmount > totalAvailable) {
               hasCapacityIssue = true;
-              console.log("\u8D44\u6E90\u7C7B\u578B ".concat(resourceCode, " ").concat(isMultipleBooking ? '容量' : '资源数量', "\u4E0D\u8DB3: \u9700\u8981 ").concat(requiredAmount, ", \u603B\u5171 ").concat(totalAvailable));
             }
 
             // 为通过检测的商品分配一个公共可用时间段
-            console.log("\u8D44\u6E90\u7C7B\u578B ".concat(resourceCode, " \u7684\u8D44\u6E90\u65F6\u95F4\u4FE1\u606F:"), resourcesOfThisType.map(function (r) {
-              return {
-                id: r.id,
-                times: r.times.map(function (t) {
-                  return "".concat(t.start_at, " - ").concat(t.end_at);
-                })
-              };
-            }));
 
             // 找到所有资源都可用的时间段
             var commonTimeSlots = _this16.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"));
               return {
                 v: {
                   success: false,
@@ -3485,7 +3454,6 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
 
             // 使用第一个公共可用时间段，但只处理未处理过的商品
             var firstCommonSlot = commonTimeSlots[0];
-            console.log("\u4F7F\u7528\u516C\u5171\u65F6\u95F4\u6BB5: ".concat(firstCommonSlot.startTime, " - ").concat(firstCommonSlot.endTime));
             items.forEach(function (cartItem) {
               // 只处理未处理过的商品，避免重复添加
               if (!processedCartItemIds.has(cartItem._id)) {
@@ -3796,7 +3764,6 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
             // 获取该资源类型对应的 form_id
             var targetFormId = resourceCodeToFormIdMap[resourceCode];
             if (!targetFormId) {
-              console.log("\u8D44\u6E90\u7C7B\u578B ".concat(resourceCode, " \u627E\u4E0D\u5230\u5BF9\u5E94\u7684 form_id"));
               return {
                 v: {
                   success: false,
@@ -3823,7 +3790,6 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               });
             });
             if (resourcesOfThisType.length === 0) {
-              console.log("\u8D44\u6E90\u7C7B\u578B ".concat(resourceCode, " \u6CA1\u6709\u627E\u5230\u53EF\u7528\u8D44\u6E90"));
               return {
                 v: {
                   success: false,
@@ -3890,24 +3856,13 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
             // 检查是否有容量问题
             if (requiredAmount > totalAvailable) {
               hasCapacityIssue = true;
-              console.log("\u8D44\u6E90\u7C7B\u578B ".concat(resourceCode, " ").concat(isMultipleBooking ? '容量' : '资源数量', "\u4E0D\u8DB3: \u9700\u8981 ").concat(requiredAmount, ", \u603B\u5171 ").concat(totalAvailable));
             }
 
             // 为通过检测的商品分配一个公共可用时间段
-            console.log("\u8D44\u6E90\u7C7B\u578B ".concat(resourceCode, " \u7684\u8D44\u6E90\u65F6\u95F4\u4FE1\u606F:"), resourcesOfThisType.map(function (r) {
-              return {
-                id: r.id,
-                times: r.times.map(function (t) {
-                  return "".concat(t.start_at, " - ").concat(t.end_at);
-                })
-              };
-            }));
 
             // 找到所有资源都可用的时间段
             var commonTimeSlots = _this17.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"));
               return {
                 v: {
                   success: false,
@@ -3918,7 +3873,6 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
 
             // 使用第一个公共可用时间段，但只处理未处理过的商品
             var firstCommonSlot = commonTimeSlots[0];
-            console.log("\u4F7F\u7528\u516C\u5171\u65F6\u95F4\u6BB5: ".concat(firstCommonSlot.startTime, " - ").concat(firstCommonSlot.endTime));
             items.forEach(function (cartItem) {
               // 只处理未处理过的商品，避免重复添加
               if (!processedCartItemIds.has(cartItem._id)) {
@@ -4228,12 +4182,6 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           while (1) switch (_context29.prev = _context29.next) {
             case 0:
               startDate = _ref16.startDate, endDate = _ref16.endDate, scheduleIds = _ref16.scheduleIds, resources = _ref16.resources;
-              console.log('appoimentBooking-session-date-getTimeslotsScheduleByDateRange', {
-                startDate: startDate,
-                endDate: endDate,
-                scheduleIds: scheduleIds,
-                resources: resources
-              });
               // 生成日期范围内的所有日期
               dates = [];
               currentDate = dayjs(startDate);
@@ -4253,7 +4201,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 });
               }
               return _context29.abrupt("return", results);
-            case 9:
+            case 8:
             case "end":
               return _context29.stop();
           }

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

@@ -293,7 +293,7 @@ export function checkTimeSlotCapacity(timeSlotStart, timeSlotEnd, cartItems, all
 
   // 检查每种资源类型是否有足够的容量
   var _loop = function _loop() {
-      var _resourceTypeConfig, _resourceTypeConfig2;
+      var _resourceTypeConfig;
       var _Object$entries$_i = _slicedToArray(_Object$entries[_i], 2),
         formId = _Object$entries$_i[0],
         requiredCapacity = _Object$entries$_i[1];
@@ -324,12 +324,6 @@ export function checkTimeSlotCapacity(timeSlotStart, timeSlotEnd, cartItems, all
         _iterator2.f();
       }
       var isMultipleBooking = ((_resourceTypeConfig = resourceTypeConfig) === null || _resourceTypeConfig === void 0 ? void 0 : _resourceTypeConfig.type) === 'multiple';
-      console.log("capacity.ts - \u8D44\u6E90\u7C7B\u578B ".concat(formId, " \u914D\u7F6E:"), {
-        resourceTypeConfig: resourceTypeConfig,
-        type: (_resourceTypeConfig2 = resourceTypeConfig) === null || _resourceTypeConfig2 === void 0 ? void 0 : _resourceTypeConfig2.type,
-        isMultipleBooking: isMultipleBooking,
-        requiredCapacity: requiredCapacity
-      });
       if (isMultipleBooking) {
         // 多个预约：计算总可用容量
         var totalAvailableCapacity = 0;
@@ -343,9 +337,7 @@ export function checkTimeSlotCapacity(timeSlotStart, timeSlotEnd, cartItems, all
             totalAvailableCapacity += resource.capacity || 0;
           }
         });
-        console.log("capacity.ts - \u8D44\u6E90\u7C7B\u578B ".concat(formId, " \u591A\u4E2A\u9884\u7EA6\u68C0\u67E5: \u603B\u5BB9\u91CF ").concat(totalAvailableCapacity, ", \u9700\u6C42 ").concat(requiredCapacity));
         if (totalAvailableCapacity < requiredCapacity) {
-          console.log("\u8D44\u6E90\u7C7B\u578B ".concat(formId, " \u5BB9\u91CF\u4E0D\u8DB3: \u9700\u8981 ").concat(requiredCapacity, ", \u53EF\u7528 ").concat(totalAvailableCapacity));
           return {
             v: {
               success: false,
@@ -366,9 +358,7 @@ export function checkTimeSlotCapacity(timeSlotStart, timeSlotEnd, cartItems, all
             availableResourceCount++;
           }
         });
-        console.log("capacity.ts - \u8D44\u6E90\u7C7B\u578B ".concat(formId, " \u5355\u4E2A\u9884\u7EA6\u68C0\u67E5: \u53EF\u7528\u8D44\u6E90\u6570 ").concat(availableResourceCount, ", \u9700\u6C42 ").concat(requiredCapacity));
         if (availableResourceCount < requiredCapacity) {
-          console.log("\u8D44\u6E90\u7C7B\u578B ".concat(formId, " \u6570\u91CF\u4E0D\u8DB3: \u9700\u8981 ").concat(requiredCapacity, ", \u53EF\u7528 ").concat(availableResourceCount));
           return {
             v: {
               success: false,

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

@@ -399,9 +399,7 @@ export var formatResources = function formatResources(_ref4) {
       list: _list,
       maps: maps
     };
-  } catch (err) {
-    console.log('formatResourcesErr', err);
-  }
+  } catch (err) {}
   return {
     list: [],
     maps: {}

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

@@ -101,13 +101,6 @@ export function findFastestAvailableResource(_ref2) {
   var isTargetDayToday = targetDay.isSame(currentTime, 'day');
   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;
@@ -122,28 +115,21 @@ export function findFastestAvailableResource(_ref2) {
         return dayjs(time.end_at).isAfter(currentTime);
       });
       if (targetDayTimes.length === 0) {
-        console.log("[TimeslotUtils] \u8D44\u6E90 ".concat(_resource.id, "(").concat(_resource.main_field, ") \u4ECA\u65E5\u65E0\u53EF\u7528\u65F6\u95F4\u6BB5"));
         continue;
       }
       var _iterator4 = _createForOfIteratorHelper(targetDayTimes),
         _step4;
       try {
         var _loop = function _loop() {
-            var _time$event_list, _time$event_list2;
+            var _time$event_list;
             var time = _step4.value;
             var workStartTime = dayjs(time.start_at);
             var workEndTime = dayjs(time.end_at);
 
             // 确定检查的起始时间（当前时间 vs 工作开始时间）
             var nextAvailableTime = isTargetDayToday && currentTime.isAfter(workStartTime) ? currentTime : workStartTime;
-            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 relevantEvents = ((_time$event_list = time.event_list) === null || _time$event_list === void 0 ? void 0 : _time$event_list.filter(function (event) {
               var eventEnd = dayjs(event.end_at);
               return eventEnd.isAfter(nextAvailableTime);
             })) || [];
@@ -162,20 +148,12 @@ export function findFastestAvailableResource(_ref2) {
                 var _event = _step5.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(resolvedDuration, 'minute'))) {
                     // 有冲突，使用事件结束时间
                     finalAvailableTime = _eventEnd;
-                    console.log("[TimeslotUtils] \u53D1\u73B0\u65F6\u95F4\u51B2\u7A81\uFF0C\u8C03\u6574\u5230: ".concat(finalAvailableTime.format('HH:mm:ss')));
                   }
                 } else {
                   // 多人预约资源：检查容量
@@ -189,7 +167,6 @@ export function findFastestAvailableResource(_ref2) {
                     if (totalRequiredCapacity > totalCapacity) {
                       // 容量不足，使用事件结束时间
                       finalAvailableTime = _eventEnd;
-                      console.log("[TimeslotUtils] \u5BB9\u91CF\u4E0D\u8DB3\uFF0C\u8C03\u6574\u5230: ".concat(finalAvailableTime.format('HH:mm:ss')));
                     }
                   }
                 }
@@ -202,19 +179,14 @@ export function findFastestAvailableResource(_ref2) {
               _iterator5.f();
             }
             if (finalAvailableTime.add(resolvedDuration, 'minute').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
             // 每个资源只需要计算一次
@@ -239,21 +211,16 @@ export function findFastestAvailableResource(_ref2) {
     _iterator2.f();
   }
   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) {
-    console.log("[TimeslotUtils] \u8FD4\u56DE\u552F\u4E00\u6700\u5FEB\u8D44\u6E90: ".concat(fastestResources[0].main_field));
     return fastestResources[0];
   }
 
   // 如果有多个最快可用的资源，选择空闲时间最长的资源
   var selectedResource = fastestResources[0];
   var maxIdleTime = 0;
-  console.log("[TimeslotUtils] \u6BD4\u8F83 ".concat(fastestResources.length, " \u4E2A\u8D44\u6E90\u7684\u7A7A\u95F2\u65F6\u95F4:"));
   for (var _i2 = 0, _fastestResources = fastestResources; _i2 < _fastestResources.length; _i2++) {
     var _workingTime$event_li;
     var resource = _fastestResources[_i2];
@@ -291,19 +258,11 @@ export function findFastestAvailableResource(_ref2) {
     } finally {
       _iterator3.f();
     }
-    console.log("[TimeslotUtils] \u8D44\u6E90 ".concat(resource.id, "(").concat(resource.main_field, "):"), {
-      工作结束时间: workEndTime.format('HH:mm'),
-      总工作时长: workEndTime.diff(fastestTime, 'minute') + '分钟',
-      预约占用时长: workEndTime.diff(fastestTime, 'minute') - totalIdleTime + '分钟',
-      实际空闲时长: totalIdleTime + '分钟'
-    });
     if (totalIdleTime > maxIdleTime) {
       maxIdleTime = totalIdleTime;
       selectedResource = resource;
-      console.log("[TimeslotUtils] \u66F4\u65B0\u6700\u4F73\u9009\u62E9: ".concat(resource.main_field, " (\u7A7A\u95F2").concat(totalIdleTime, "\u5206\u949F)"));
     }
   }
-  console.log("[TimeslotUtils] \u6700\u7EC8\u9009\u62E9\u8D44\u6E90: ".concat(selectedResource.main_field, " (\u6700\u957F\u7A7A\u95F2").concat(maxIdleTime, "\u5206\u949F)"));
   return selectedResource;
 }