@pisell/pisellos 0.0.569 → 0.10.2

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

@@ -101,6 +101,13 @@ 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;
@@ -115,21 +122,28 @@ 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;
+            var _time$event_list, _time$event_list2;
             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_list = time.event_list) === null || _time$event_list === void 0 ? void 0 : _time$event_list.filter(function (event) {
+            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);
             })) || [];
@@ -148,12 +162,20 @@ 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 {
                   // 多人预约资源：检查容量
@@ -167,6 +189,7 @@ 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')));
                     }
                   }
                 }
@@ -179,14 +202,19 @@ 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
             // 每个资源只需要计算一次
@@ -211,16 +239,21 @@ 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];
@@ -258,11 +291,19 @@ 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;
 }
 

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

@@ -322,7 +322,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

package/dist/solution/BookingTicket/index.js

@@ -235,6 +235,8 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
               _context.next = 9;
               return this.configureIdGeneratorFromOpenData();
             case 9:
+              console.log('[BookingTicket] 初始化完成');
+            case 10:
             case "end":
               return _context.stop();
           }

package/dist/solution/BookingTicket/utils/scan/cloudSearch.js

@@ -173,25 +173,26 @@ export var searchOrder = /*#__PURE__*/function () {
           });
         case 3:
           res = _context4.sent;
+          console.log('searchOrder>>>>>>>', res);
           if (!((res === null || res === void 0 ? void 0 : res.code) == 200 && !!(res !== null && res !== void 0 && res.data))) {
-            _context4.next = 6;
+            _context4.next = 7;
             break;
           }
           return _context4.abrupt("return", {
             searchType: 'order',
             response: res
           });
-        case 6:
+        case 7:
           throw new Error('没有找到对应的识别码');
-        case 9:
-          _context4.prev = 9;
+        case 10:
+          _context4.prev = 10;
           _context4.t0 = _context4["catch"](0);
           throw _context4.t0;
-        case 12:
+        case 13:
         case "end":
           return _context4.stop();
       }
-    }, _callee4, null, [[0, 9]]);
+    }, _callee4, null, [[0, 10]]);
   }));
   return function searchOrder(_x7, _x8) {
     return _ref4.apply(this, arguments);

package/dist/solution/BookingTicket/utils/scan/handleScan.js

@@ -76,15 +76,16 @@ var handleScanFn = function handleScanFn(getRequestList, localSearch) {
           case 0:
             _ref3 = scanResult || {}, value = _ref3.value; // 本地解析识别码
             if (!localSearch) {
-              _context2.next = 13;
+              _context2.next = 15;
               break;
             }
             _context2.prev = 2;
             localResult = localSearch === null || localSearch === void 0 ? void 0 : localSearch(value);
             if (!((localResult === null || localResult === void 0 ? void 0 : localResult.length) > 0)) {
-              _context2.next = 8;
+              _context2.next = 9;
               break;
             }
+            console.log('本地搜索到数据>>>>>>>', localResult);
             return _context2.abrupt("return", {
               searchType: 'local_product',
               response: {
@@ -93,53 +94,58 @@ var handleScanFn = function handleScanFn(getRequestList, localSearch) {
                 }
               }
             });
-          case 8:
-            _context2.next = 13;
-            break;
+          case 9:
+            console.log('本地搜索无数据>>>>>>>');
           case 10:
-            _context2.prev = 10;
+            _context2.next = 15;
+            break;
+          case 12:
+            _context2.prev = 12;
             _context2.t0 = _context2["catch"](2);
             console.error('本地搜索到数据失败>>>>>>>', _context2.t0);
-          case 13:
-            _context2.prev = 13;
+          case 15:
+            _context2.prev = 15;
             if (!scanCache.has(value)) {
-              _context2.next = 19;
+              _context2.next = 22;
               break;
             }
             result = scanCache.get(value);
+            console.log('缓存中搜索到数据>>>>>>>', result);
             return _context2.abrupt("return", result);
-          case 19:
-            _context2.next = 24;
+          case 22:
+            console.log('缓存中无数据>>>>>>>');
+          case 23:
+            _context2.next = 28;
             break;
-          case 21:
-            _context2.prev = 21;
-            _context2.t1 = _context2["catch"](13);
+          case 25:
+            _context2.prev = 25;
+            _context2.t1 = _context2["catch"](15);
             console.error('缓存中搜索数据失败>>>>>>>', _context2.t1);
-          case 24:
+          case 28:
             requestList = (getRequestList === null || getRequestList === void 0 ? void 0 : getRequestList(value)) || [];
             if (!(requestList.length === 0)) {
-              _context2.next = 27;
+              _context2.next = 31;
               break;
             }
             throw new Error('requestList is empty');
-          case 27:
-            _context2.prev = 27;
-            _context2.next = 30;
+          case 31:
+            _context2.prev = 31;
+            _context2.next = 34;
             return promiseAny(requestList);
-          case 30:
+          case 34:
             _result = _context2.sent;
             // 将结果缓存
             scanCache.set(value, _result);
             return _context2.abrupt("return", _result);
-          case 35:
-            _context2.prev = 35;
-            _context2.t2 = _context2["catch"](27);
+          case 39:
+            _context2.prev = 39;
+            _context2.t2 = _context2["catch"](31);
             throw _context2.t2;
-          case 38:
+          case 42:
           case "end":
             return _context2.stop();
         }
-      }, _callee2, null, [[2, 10], [13, 21], [27, 35]]);
+      }, _callee2, null, [[2, 12], [15, 25], [31, 39]]);
     }));
     return function (_x2) {
       return _ref2.apply(this, arguments);

package/dist/solution/BookingTicket/utils/scan/index.js

@@ -46,6 +46,7 @@ var Scan = /*#__PURE__*/function () {
       (_this$solution = this.solution) === null || _this$solution === void 0 || (_this$solution = _this$solution.window) === null || _this$solution === void 0 || (_this$solution = _this$solution.interaction) === null || _this$solution === void 0 || (_this$solution = _this$solution.utils) === null || _this$solution === void 0 || (_this$solution$mountF = _this$solution.mountFunction) === null || _this$solution$mountF === void 0 || _this$solution$mountF.call(_this$solution, 'global', 'peripheralsResult', function (strVal) {
         try {
           var _result = JSON.parse(strVal);
+          console.log('nativeScannerResult>>>>>>>', _result);
           Scan.scanInstances.forEach(function (instance) {
             instance.handleScan(_result);
           });
@@ -183,6 +184,7 @@ var Scan = /*#__PURE__*/function () {
   }, {
     key: "clearTaskQueue",
     value: function clearTaskQueue(eventKey) {
+      console.log('clearTaskQueue>>>>>>>', eventKey);
       if (eventKey) {
         var _this$listenerConfig$3;
         (_this$listenerConfig$3 = this.listenerConfig.get(eventKey)) === null || _this$listenerConfig$3 === void 0 || _this$listenerConfig$3.task.clearTaskQueue();
@@ -241,7 +243,7 @@ var Scan = /*#__PURE__*/function () {
               taskItemUuid = other === null || other === void 0 ? void 0 : other.uuid;
               _ref2 = this.getListenerConfig(eventKey) || {}, scanCallback = _ref2.scanCallback, task = _ref2.task;
               if (!scanCallback) {
-                _context.next = 16;
+                _context.next = 18;
                 break;
               }
               _context.prev = 6;
@@ -252,6 +254,7 @@ var Scan = /*#__PURE__*/function () {
               });
             case 9:
               _result2 = _context.sent;
+              console.log("".concat(eventKey, "_result>>>>>>>"), _result2);
               // 如果任务存在，则发布结果
               if (taskItemUuid && task !== null && task !== void 0 && task.isTaskExist(taskItemUuid)) {
                 watch.publishByEventKey(this.watchKey, eventKey, {
@@ -265,11 +268,12 @@ var Scan = /*#__PURE__*/function () {
               } else {
                 console.warn("".concat(eventKey, "_result_task_not_exist>>>>>>>"), task);
               }
-              _context.next = 16;
+              _context.next = 18;
               break;
-            case 13:
-              _context.prev = 13;
+            case 14:
+              _context.prev = 14;
               _context.t0 = _context["catch"](6);
+              console.log("".concat(eventKey, "_result_error>>>>>>>"), _context.t0);
               // 如果任务存在，则发布结果
               if (taskItemUuid && task !== null && task !== void 0 && task.isTaskExist(taskItemUuid)) {
                 watch.publishByEventKey(this.watchKey, eventKey, {
@@ -282,11 +286,11 @@ var Scan = /*#__PURE__*/function () {
               } else {
                 console.warn("".concat(eventKey, "_result_error_task_not_exist>>>>>>>"), task);
               }
-            case 16:
+            case 18:
             case "end":
               return _context.stop();
           }
-        }, _callee, this, [[6, 13]]);
+        }, _callee, this, [[6, 14]]);
       }));
       function scanTaskAction() {
         return _scanTaskAction.apply(this, arguments);

package/dist/solution/BuyTickets/index.js

@@ -53,25 +53,26 @@ export var BuyTicketsImpl = /*#__PURE__*/function (_BaseModule) {
               this.core = core;
               this.store = options.store || {};
               this.otherParams = options.otherParams || {};
+              console.log('[BuyTickets] 初始化完成');
               // 获取依赖的插件
               this.request = core.getPlugin('request');
               this.window = core.getPlugin('window');
               if (this.request) {
-                _context.next = 7;
+                _context.next = 8;
                 break;
               }
               throw new Error('购物车模块需要 request 插件支持');
-            case 7:
+            case 8:
               if (!this.otherParams.prodctIds) {
-                _context.next = 10;
+                _context.next = 11;
                 break;
               }
-              _context.next = 10;
+              _context.next = 11;
               return this.loadProductsByIds(this.otherParams.prodctIds);
-            case 10:
-              _context.next = 12;
+            case 11:
+              _context.next = 13;
               return this.core.effects.emit("".concat(this.name, ":onInited"), {});
-            case 12:
+            case 13:
             case "end":
               return _context.stop();
           }
@@ -149,6 +150,8 @@ export var BuyTicketsImpl = /*#__PURE__*/function (_BaseModule) {
               _context4.next = 2;
               return this.core.effects.emit("".concat(this.name, ":onDestroy"), {});
             case 2:
+              console.log('[BuyTickets] 已销毁');
+            case 3:
             case "end":
               return _context4.stop();
           }
@@ -273,9 +276,9 @@ export var BuyTicketsImpl = /*#__PURE__*/function (_BaseModule) {
               // 如果外部没有阻拦，则默认调用后端的保存至购物车接口，然后通知页面 push 到购物车页面
               // 游乐场逻辑：这里会被 hook 先拦截一次，业务层展示 add other product
               // 然后第二次继续被拦截，业务层把这里的数据推给 native 的购物车
-
+              console.log('listSubmit 应该走逻辑层的 API 发请求了');
               // fetch('')
-            case 6:
+            case 7:
             case "end":
               return _context7.stop();
           }