@pisell/pisellos 0.0.321 → 0.0.324

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

@@ -43,8 +43,7 @@ function calculateResourceAvailableTime({
   const matchingTimes = resource.times.filter((time) => {
     return (0, import_dayjs.default)(time.start_at).isSame((0, import_dayjs.default)(timeSlots.start_at), "day");
   });
-  if (matchingTimes.length === 0)
-    return 0;
+  if (matchingTimes.length === 0) return 0;
   const overlaps = [];
   for (const time of matchingTimes) {
     const overlapStart = (0, import_dayjs.default)(time.start_at).isAfter((0, import_dayjs.default)(timeSlots.start_at)) ? (0, import_dayjs.default)(time.start_at) : (0, import_dayjs.default)(timeSlots.start_at);
@@ -53,8 +52,7 @@ function calculateResourceAvailableTime({
       overlaps.push({ start: overlapStart, end: overlapEnd });
     }
   }
-  if (overlaps.length === 0)
-    return 0;
+  if (overlaps.length === 0) return 0;
   overlaps.sort((a, b) => a.start.diff(b.start));
   const merged = [];
   let current = overlaps[0];
@@ -83,7 +81,7 @@ function findFastestAvailableResource({
   const currentTime = (0, import_dayjs.default)();
   let fastestTime = null;
   let fastestResources = [];
-  console.log("[TimeslotUtils] 查找最快可用资源:", {
+  console.log("[TimeslotUtils] \u67E5\u627E\u6700\u5FEB\u53EF\u7528\u8D44\u6E90:", {
     currentTime: currentTime.format("YYYY-MM-DD HH:mm:ss"),
     resourceCount: resources.length,
     currentCapacity,
@@ -96,14 +94,14 @@ function findFastestAvailableResource({
       return isToday && isStillWorking;
     });
     if (todayTimes.length === 0) {
-      console.log(`[TimeslotUtils] 资源 ${resource.id}(${resource.main_field}) 今日无可用时间段`);
+      console.log(`[TimeslotUtils] \u8D44\u6E90 ${resource.id}(${resource.main_field}) \u4ECA\u65E5\u65E0\u53EF\u7528\u65F6\u95F4\u6BB5`);
       continue;
     }
     for (const time of todayTimes) {
       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}):`, {
+      console.log(`[TimeslotUtils] \u68C0\u67E5\u8D44\u6E90 ${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
@@ -119,7 +117,7 @@ function findFastestAvailableResource({
       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] 检查事件冲突:`, {
+        console.log(`[TimeslotUtils] \u68C0\u67E5\u4E8B\u4EF6\u51B2\u7A81:`, {
           resourceId: resource.id,
           eventTime: `${eventStart.format("HH:mm")}-${eventEnd.format("HH:mm")}`,
           checkTime: finalAvailableTime.format("HH:mm:ss"),
@@ -128,7 +126,7 @@ function findFastestAvailableResource({
         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")}`);
+            console.log(`[TimeslotUtils] \u53D1\u73B0\u65F6\u95F4\u51B2\u7A81\uFF0C\u8C03\u6574\u5230: ${finalAvailableTime.format("HH:mm:ss")}`);
           }
         } else {
           const totalCapacity = resource.capacity || 0;
@@ -138,47 +136,46 @@ function findFastestAvailableResource({
             const totalRequiredCapacity = currentUsedCapacity + currentCapacity + eventUsedCapacity;
             if (totalRequiredCapacity > totalCapacity) {
               finalAvailableTime = eventEnd;
-              console.log(`[TimeslotUtils] 容量不足，调整到: ${finalAvailableTime.format("HH:mm:ss")}`);
+              console.log(`[TimeslotUtils] \u5BB9\u91CF\u4E0D\u8DB3\uFF0C\u8C03\u6574\u5230: ${finalAvailableTime.format("HH:mm:ss")}`);
             }
           }
         }
       }
       if (finalAvailableTime.isAfter(workEndTime)) {
-        console.log(`[TimeslotUtils] 资源 ${resource.id} 可用时间超出工作时间，跳过`);
+        console.log(`[TimeslotUtils] \u8D44\u6E90 ${resource.id} \u53EF\u7528\u65F6\u95F4\u8D85\u51FA\u5DE5\u4F5C\u65F6\u95F4\uFF0C\u8DF3\u8FC7`);
         continue;
       }
-      console.log(`[TimeslotUtils] 资源 ${resource.id}(${resource.main_field}) 最快可用时间: ${finalAvailableTime.format("HH:mm:ss")}`);
+      console.log(`[TimeslotUtils] \u8D44\u6E90 ${resource.id}(${resource.main_field}) \u6700\u5FEB\u53EF\u7528\u65F6\u95F4: ${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}`);
+        console.log(`[TimeslotUtils] \u66F4\u65B0\u6700\u5FEB\u65F6\u95F4: ${fastestTime.format("HH:mm:ss")}, \u8D44\u6E90: ${resource.main_field}`);
       } else if (finalAvailableTime.isSame(fastestTime)) {
         fastestResources.push(resource);
-        console.log(`[TimeslotUtils] 添加相同时间资源: ${resource.main_field}`);
+        console.log(`[TimeslotUtils] \u6DFB\u52A0\u76F8\u540C\u65F6\u95F4\u8D44\u6E90: ${resource.main_field}`);
       }
       break;
     }
   }
   if (!fastestTime || fastestResources.length === 0) {
-    console.log("[TimeslotUtils] 未找到可用资源");
+    console.log("[TimeslotUtils] \u672A\u627E\u5230\u53EF\u7528\u8D44\u6E90");
     return null;
   }
-  console.log(`[TimeslotUtils] 找到 ${fastestResources.length} 个最快可用资源，时间: ${fastestTime.format("HH:mm:ss")}`);
+  console.log(`[TimeslotUtils] \u627E\u5230 ${fastestResources.length} \u4E2A\u6700\u5FEB\u53EF\u7528\u8D44\u6E90\uFF0C\u65F6\u95F4: ${fastestTime.format("HH:mm:ss")}`);
   if (fastestResources.length === 1) {
-    console.log(`[TimeslotUtils] 返回唯一最快资源: ${fastestResources[0].main_field}`);
+    console.log(`[TimeslotUtils] \u8FD4\u56DE\u552F\u4E00\u6700\u5FEB\u8D44\u6E90: ${fastestResources[0].main_field}`);
     return fastestResources[0];
   }
   let selectedResource = fastestResources[0];
   let maxIdleTime = 0;
-  console.log(`[TimeslotUtils] 比较 ${fastestResources.length} 个资源的空闲时间:`);
+  console.log(`[TimeslotUtils] \u6BD4\u8F83 ${fastestResources.length} \u4E2A\u8D44\u6E90\u7684\u7A7A\u95F2\u65F6\u95F4:`);
   for (const resource of fastestResources) {
     const workingTime = resource.times.find((time) => {
       const isToday = (0, import_dayjs.default)(time.start_at).isSame(fastestTime, "day");
       const isStillWorking = (0, import_dayjs.default)(time.end_at).isAfter(fastestTime);
       return isToday && isStillWorking;
     });
-    if (!workingTime)
-      continue;
+    if (!workingTime) continue;
     const workEndTime = (0, import_dayjs.default)(workingTime.end_at);
     let totalIdleTime = workEndTime.diff(fastestTime, "minute");
     const relevantEvents = ((_c = workingTime.event_list) == null ? void 0 : _c.filter((event) => {
@@ -192,19 +189,19 @@ function findFastestAvailableResource({
       const eventDuration = eventEnd.diff(eventStart, "minute");
       totalIdleTime -= eventDuration;
     }
-    console.log(`[TimeslotUtils] 资源 ${resource.id}(${resource.main_field}):`, {
-      工作结束时间: workEndTime.format("HH:mm"),
-      总工作时长: workEndTime.diff(fastestTime, "minute") + "分钟",
-      预约占用时长: workEndTime.diff(fastestTime, "minute") - totalIdleTime + "分钟",
-      实际空闲时长: totalIdleTime + "分钟"
+    console.log(`[TimeslotUtils] \u8D44\u6E90 ${resource.id}(${resource.main_field}):`, {
+      \u5DE5\u4F5C\u7ED3\u675F\u65F6\u95F4: workEndTime.format("HH:mm"),
+      \u603B\u5DE5\u4F5C\u65F6\u957F: workEndTime.diff(fastestTime, "minute") + "\u5206\u949F",
+      \u9884\u7EA6\u5360\u7528\u65F6\u957F: workEndTime.diff(fastestTime, "minute") - totalIdleTime + "\u5206\u949F",
+      \u5B9E\u9645\u7A7A\u95F2\u65F6\u957F: totalIdleTime + "\u5206\u949F"
     });
     if (totalIdleTime > maxIdleTime) {
       maxIdleTime = totalIdleTime;
       selectedResource = resource;
-      console.log(`[TimeslotUtils] 更新最佳选择: ${resource.main_field} (空闲${totalIdleTime}分钟)`);
+      console.log(`[TimeslotUtils] \u66F4\u65B0\u6700\u4F73\u9009\u62E9: ${resource.main_field} (\u7A7A\u95F2${totalIdleTime}\u5206\u949F)`);
     }
   }
-  console.log(`[TimeslotUtils] 最终选择资源: ${selectedResource.main_field} (最长空闲${maxIdleTime}分钟)`);
+  console.log(`[TimeslotUtils] \u6700\u7EC8\u9009\u62E9\u8D44\u6E90: ${selectedResource.main_field} (\u6700\u957F\u7A7A\u95F2${maxIdleTime}\u5206\u949F)`);
   return selectedResource;
 }
 function filterConditionTimeSlots(times, startTime, endTime) {

package/lib/solution/BookingTicket/index.js

@@ -41,27 +41,32 @@ var import_handleScan = require("./utils/scan/handleScan");
 var import_scanCache = __toESM(require("./utils/scan/scanCache"));
 __reExport(BookingTicket_exports, require("./types"), module.exports);
 var BookingTicketImpl = class extends import_BaseModule.BaseModule {
-  constructor() {
-    super(...arguments);
-    this.defaultName = "bookingTicket";
-    this.defaultVersion = "1.0.0";
-    this.isSolution = true;
-    this.otherParams = {};
-  }
+  defaultName = "bookingTicket";
+  defaultVersion = "1.0.0";
+  isSolution = true;
+  request;
+  window;
+  shopStore;
+  store;
+  otherParams = {};
+  cacheId;
+  platform;
+  // 平台类型，用于判断是 PC / H5
+  scan;
   async initialize(core, options) {
     var _a, _b, _c;
     this.core = core;
     this.store = options.store || {};
     this.otherParams = options.otherParams || {};
-    console.log("[BookingTicket] 初始化完成");
+    console.log("[BookingTicket] \u521D\u59CB\u5316\u5B8C\u6210");
     this.request = core.getPlugin("request");
     this.window = core.getPlugin("window");
     this.shopStore = core.getPlugin("shopStore");
     if (!this.request) {
-      throw new Error("bookingTicket解决方案需要 request 插件支持");
+      throw new Error("bookingTicket\u89E3\u51B3\u65B9\u6848\u9700\u8981 request \u63D2\u4EF6\u652F\u6301");
     }
     if (!this.shopStore) {
-      throw new Error("bookingTicket解决方案需要 shopStore 插件支持");
+      throw new Error("bookingTicket\u89E3\u51B3\u65B9\u6848\u9700\u8981 shopStore \u63D2\u4EF6\u652F\u6301");
     }
     let targetCacheData = {};
     this.cacheId = (_a = this.otherParams) == null ? void 0 : _a.cacheId;
@@ -96,7 +101,7 @@ var BookingTicketImpl = class extends import_BaseModule.BaseModule {
           }
         });
       } else {
-        throw new Error(`模块 ${step} 不存在`);
+        throw new Error(`\u6A21\u5757 ${step} \u4E0D\u5B58\u5728`);
       }
     });
     this.core.effects.emit(import_types.BookingTicketHooks.onInited, {});
@@ -302,7 +307,7 @@ var BookingTicketImpl = class extends import_BaseModule.BaseModule {
       try {
         callback(d);
       } catch (error) {
-        console.error("scanGlobalListener传入的回调函数异常", error);
+        console.error("scanGlobalListener\u4F20\u5165\u7684\u56DE\u8C03\u51FD\u6570\u5F02\u5E38", error);
       }
     };
     const listener = { key: "global", callback: safeCallback };
@@ -319,7 +324,7 @@ var BookingTicketImpl = class extends import_BaseModule.BaseModule {
       try {
         callback(d);
       } catch (error) {
-        console.error("scanCustomerListener传入的回调函数异常", error);
+        console.error("scanCustomerListener\u4F20\u5165\u7684\u56DE\u8C03\u51FD\u6570\u5F02\u5E38", error);
       }
     };
     const listener = { key: "customer", callback: safeCallback };
@@ -338,7 +343,7 @@ var BookingTicketImpl = class extends import_BaseModule.BaseModule {
         callback(d);
       } catch (error) {
         console.error(
-          `scanUniversalListener传入的回调函数异常, key: ${key}`,
+          `scanUniversalListener\u4F20\u5165\u7684\u56DE\u8C03\u51FD\u6570\u5F02\u5E38, key: ${key}`,
           error
         );
       }

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

@@ -57,7 +57,7 @@ var searchWalletPass = async (request, code) => {
     if ((res == null ? void 0 : res.code) == 200 && !!(res == null ? void 0 : res.data)) {
       return { searchType: "walletPass", response: res };
     }
-    throw new Error("没有找到对应的识别码");
+    throw new Error("\u6CA1\u6709\u627E\u5230\u5BF9\u5E94\u7684\u8BC6\u522B\u7801");
   } catch (error) {
     throw error;
   }
@@ -72,7 +72,7 @@ var searchWallet = async (request, code) => {
     if ((res == null ? void 0 : res.code) == 200 && !!(res == null ? void 0 : res.data)) {
       return { searchType: "wallet", response: res };
     }
-    throw new Error("没有找到对应的识别码");
+    throw new Error("\u6CA1\u6709\u627E\u5230\u5BF9\u5E94\u7684\u8BC6\u522B\u7801");
   } catch (error) {
     throw error;
   }
@@ -104,7 +104,7 @@ var searchProduct = async (request, code) => {
     if ((res == null ? void 0 : res.code) == 200 && ((_b = (_a = res == null ? void 0 : res.data) == null ? void 0 : _a.list) == null ? void 0 : _b.length) > 0) {
       return { searchType: "product", response: res };
     }
-    throw new Error("没有找到对应的识别码");
+    throw new Error("\u6CA1\u6709\u627E\u5230\u5BF9\u5E94\u7684\u8BC6\u522B\u7801");
   } catch (error) {
     throw error;
   }

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

@@ -66,28 +66,28 @@ var handleScanFn = (getRequestList, localSearch) => {
       try {
         const localResult = localSearch == null ? void 0 : localSearch(value);
         if ((localResult == null ? void 0 : localResult.length) > 0) {
-          console.log("本地搜索到数据>>>>>>>", localResult);
+          console.log("\u672C\u5730\u641C\u7D22\u5230\u6570\u636E>>>>>>>", localResult);
           return {
             searchType: "local_product",
             response: { data: { list: localResult } }
           };
         } else {
-          console.log("本地搜索无数据>>>>>>>");
+          console.log("\u672C\u5730\u641C\u7D22\u65E0\u6570\u636E>>>>>>>");
         }
       } catch (error) {
-        console.error("本地搜索到数据失败>>>>>>>", error);
+        console.error("\u672C\u5730\u641C\u7D22\u5230\u6570\u636E\u5931\u8D25>>>>>>>", error);
       }
     }
     try {
       if (import_scanCache.default.has(value)) {
         const result = import_scanCache.default.get(value);
-        console.log("缓存中搜索到数据>>>>>>>", result);
+        console.log("\u7F13\u5B58\u4E2D\u641C\u7D22\u5230\u6570\u636E>>>>>>>", result);
         return result;
       } else {
-        console.log("缓存中无数据>>>>>>>");
+        console.log("\u7F13\u5B58\u4E2D\u65E0\u6570\u636E>>>>>>>");
       }
     } catch (error) {
-      console.error("缓存中搜索数据失败>>>>>>>", error);
+      console.error("\u7F13\u5B58\u4E2D\u641C\u7D22\u6570\u636E\u5931\u8D25>>>>>>>", error);
     }
     const requestList = (getRequestList == null ? void 0 : getRequestList(value)) || [];
     if (requestList.length === 0) {

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

@@ -35,8 +35,10 @@ module.exports = __toCommonJS(scan_exports);
 var import_watch = __toESM(require("../../../../utils/watch"));
 var import_task = __toESM(require("../../../../utils/task"));
 var Scan = class {
+  solution;
+  watchKey;
+  listenerConfig = /* @__PURE__ */ new Map();
   constructor(solution, watchKey) {
-    this.listenerConfig = /* @__PURE__ */ new Map();
     var _a, _b, _c, _d, _e;
     this.solution = solution;
     this.watchKey = watchKey;

package/lib/solution/BookingTicket/utils/scan/scanCache.js

@@ -29,7 +29,7 @@ var compressData = (data) => {
     }
     return JSON.stringify(data);
   } catch (error) {
-    console.warn("数据压缩失败:", error);
+    console.warn("\u6570\u636E\u538B\u7F29\u5931\u8D25:", error);
     return JSON.stringify(data);
   }
 };
@@ -40,17 +40,19 @@ var decompressData = (compressedData) => {
     }
     return JSON.parse(compressedData);
   } catch (error) {
-    console.warn("数据解压缩失败:", error);
+    console.warn("\u6570\u636E\u89E3\u538B\u7F29\u5931\u8D25:", error);
     return null;
   }
 };
 var LRUCache = class {
+  head = null;
+  // 最久未使用的节点
+  tail = null;
+  // 最近使用的节点
+  keyMap = /* @__PURE__ */ new Map();
+  // key到节点的映射（只存储引用）
+  maxSize;
   constructor(maxSize = 100) {
-    this.head = null;
-    // 最久未使用的节点
-    this.tail = null;
-    // 最近使用的节点
-    this.keyMap = /* @__PURE__ */ new Map();
     this.maxSize = maxSize;
   }
   /**
@@ -58,8 +60,7 @@ var LRUCache = class {
    * @param node 要移动的节点
    */
   moveToTail(node) {
-    if (this.tail === node)
-      return;
+    if (this.tail === node) return;
     if (node.prev) {
       node.prev.next = node.next;
     }

package/lib/solution/BuyTickets/index.js

@@ -28,23 +28,26 @@ var import_types = require("./types");
 var import_BaseModule = require("../../modules/BaseModule");
 __reExport(BuyTickets_exports, require("./types"), module.exports);
 var BuyTicketsImpl = class extends import_BaseModule.BaseModule {
+  // 提供给 baseModule 用的默认名称 和 默认版本
+  defaultName = "buyTickets";
+  defaultVersion = "1.0.0";
+  isSolution = true;
+  request;
+  window;
+  store;
+  otherParams = {};
   constructor(name, version) {
     super(name, version);
-    // 提供给 baseModule 用的默认名称 和 默认版本
-    this.defaultName = "buyTickets";
-    this.defaultVersion = "1.0.0";
-    this.isSolution = true;
-    this.otherParams = {};
   }
   async initialize(core, options) {
     this.core = core;
     this.store = options.store || {};
     this.otherParams = options.otherParams || {};
-    console.log("[BuyTickets] 初始化完成");
+    console.log("[BuyTickets] \u521D\u59CB\u5316\u5B8C\u6210");
     this.request = core.getPlugin("request");
     this.window = core.getPlugin("window");
     if (!this.request) {
-      throw new Error("购物车模块需要 request 插件支持");
+      throw new Error("\u8D2D\u7269\u8F66\u6A21\u5757\u9700\u8981 request \u63D2\u4EF6\u652F\u6301");
     }
     if (this.otherParams.prodctIds) {
       await this.loadProductsByIds(this.otherParams.prodctIds);
@@ -76,7 +79,7 @@ var BuyTicketsImpl = class extends import_BaseModule.BaseModule {
   }
   async destroy() {
     await this.core.effects.emit(import_types.BuyTicketsHooks.onDestroy, {});
-    console.log("[BuyTickets] 已销毁");
+    console.log("[BuyTickets] \u5DF2\u9500\u6BC1");
   }
   // 获取当前绑定的所有商品
   async getProducts() {
@@ -94,10 +97,8 @@ var BuyTicketsImpl = class extends import_BaseModule.BaseModule {
     var _a, _b;
     const mainProduct = await ((_a = this.store.mainProducts) == null ? void 0 : _a.getProduct(id));
     const otherProduct = await ((_b = this.store.otherProducts) == null ? void 0 : _b.getProduct(id));
-    if (mainProduct)
-      return mainProduct;
-    if (otherProduct)
-      return otherProduct;
+    if (mainProduct) return mainProduct;
+    if (otherProduct) return otherProduct;
     throw new Error(`Product not found: ${id}`);
   }
   // 商品列表页提交
@@ -106,13 +107,12 @@ var BuyTicketsImpl = class extends import_BaseModule.BaseModule {
       ...data,
       products: this.getProducts()
     });
-    if (res.status === false)
-      return res;
+    if (res.status === false) return res;
     this.window.localStorage.setItem(
       "buyTickets:listSubmit",
       JSON.stringify({ ...data, products: this.getProducts() })
     );
-    console.log("listSubmit 应该走逻辑层的 API 发请求了");
+    console.log("listSubmit \u5E94\u8BE5\u8D70\u903B\u8F91\u5C42\u7684 API \u53D1\u8BF7\u6C42\u4E86");
   }
   // 购物车提交
   async cartSubmit(data) {