@pisell/pisellos 2.1.35 → 2.1.38

package/lib/modules/Order/index.js

@@ -39,7 +39,7 @@ var import_dayjs = __toESM(require("dayjs"));
 var OrderModule = class extends import_BaseModule.BaseModule {
   // LoggerManager 实例
   constructor(name, version) {
-    super(name || "order", version);
+    super(name, version);
     this.defaultName = "order";
     this.defaultVersion = "1.0.0";
   }

package/lib/modules/Payment/index.js

@@ -55,7 +55,7 @@ function generateRequestUniqueId() {
 }
 var PaymentModule = class extends import_BaseModule.BaseModule {
   constructor(name, version) {
-    super(name || "payment", version);
+    super(name, version);
     this.defaultName = "pay";
     this.defaultVersion = "1.0.0";
     // LoggerManager 实例
@@ -193,7 +193,7 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
         console.warn("[PaymentModule] 无法缓存支付方式，pay_method 表不存在");
       }
       await this.core.effects.emit(
-        `${this.name}:onPaymentMethodsLoaded`,
+        import_types.PaymentHooks.OnPaymentMethodsLoaded,
         payMethods
       );
       this.logInfo("getPayMethodListAsync completed successfully", {
@@ -243,7 +243,7 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
           newMethods: newPayMethods
         };
         await this.core.effects.emit(
-          `${this.name}:onPaymentMethodsChanged`,
+          import_types.PaymentHooks.OnPaymentMethodsChanged,
           eventData
         );
       } else {
@@ -368,7 +368,7 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
       const order = await this.dbManager.get("order", orderUuid);
       if (order) {
         await this.dbManager.delete("order", orderUuid);
-        await this.core.effects.emit(`${this.name}:onOrderDeleted`, order);
+        await this.core.effects.emit(import_types.PaymentHooks.OnOrderDeleted, order);
         console.log("[PaymentModule] 支付订单删除成功:", orderUuid);
       }
     } catch (error) {
@@ -386,8 +386,8 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
         const updatedOrder = { ...order, ...params };
         this.recalculateOrderAmount(updatedOrder);
         await this.dbManager.update("order", updatedOrder);
-        await this.core.effects.emit(`${this.name}:onOrderUpdated`, updatedOrder);
-        await this.core.effects.emit(`${this.name}:onOrderChanged`, {
+        await this.core.effects.emit(import_types.PaymentHooks.OnOrderUpdated, updatedOrder);
+        await this.core.effects.emit(import_types.PaymentHooks.OnOrderChanged, {
           action: "update",
           order: updatedOrder,
           originalOrder: order
@@ -445,8 +445,8 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
         }
       };
       await this.dbManager.update("order", updatedOrder);
-      await this.core.effects.emit(`${this.name}:onOrderUpdated`, updatedOrder);
-      await this.core.effects.emit(`${this.name}:onOrderChanged`, {
+      await this.core.effects.emit(import_types.PaymentHooks.OnOrderUpdated, updatedOrder);
+      await this.core.effects.emit(import_types.PaymentHooks.OnOrderChanged, {
         action: "order_id_replaced",
         order: updatedOrder,
         originalOrder: existingOrder,
@@ -563,7 +563,7 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
       order.payment.push(newPaymentItem);
       this.recalculateOrderAmount(order);
       await this.dbManager.update("order", order);
-      await this.core.effects.emit(`${this.name}:onPaymentAdded`, {
+      await this.core.effects.emit(import_types.PaymentHooks.OnPaymentAdded, {
         orderUuid,
         payment: newPaymentItem
       });
@@ -619,11 +619,11 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
       });
       this.recalculateOrderAmount(order);
       await this.dbManager.update("order", order);
-      await this.core.effects.emit(`${this.name}:onPaymentDeleted`, {
+      await this.core.effects.emit(import_types.PaymentHooks.OnPaymentDeleted, {
         order,
         paymentItem
       });
-      await this.core.effects.emit(`${this.name}:onOrderChanged`, {
+      await this.core.effects.emit(import_types.PaymentHooks.OnOrderChanged, {
         action: "payment_delete",
         order,
         paymentItem
@@ -700,7 +700,7 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
         await this.addPaymentItemAsync(orderUuid, voucherItem);
       }
       const updatedOrder = await this.getPaymentOrderByUuidAsync(orderUuid);
-      await this.core.effects.emit(`${this.name}:onPaymentAdded`, {
+      await this.core.effects.emit(import_types.PaymentHooks.OnPaymentAdded, {
         orderUuid,
         order: updatedOrder,
         payment: null
@@ -741,11 +741,11 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
         Object.assign(paymentItem, formattedParams);
         this.recalculateOrderAmount(order);
         await this.dbManager.update("order", order);
-        await this.core.effects.emit(`${this.name}:onPaymentUpdated`, {
+        await this.core.effects.emit(import_types.PaymentHooks.OnPaymentUpdated, {
           order,
           paymentItem
         });
-        await this.core.effects.emit(`${this.name}:onOrderChanged`, {
+        await this.core.effects.emit(import_types.PaymentHooks.OnOrderChanged, {
           action: "payment_update",
           order,
           paymentItem
@@ -833,8 +833,8 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
         });
         return;
       }
-      await this.core.effects.emit(`${this.name}:onPaymentSubmitted`, order);
-      await this.core.effects.emit(`${this.name}:onOrderChanged`, {
+      await this.core.effects.emit(import_types.PaymentHooks.OnPaymentSubmitted, order);
+      await this.core.effects.emit(import_types.PaymentHooks.OnOrderChanged, {
         action: "submit",
         order
       });

package/lib/modules/Payment/walletpass.js

@@ -38,9 +38,7 @@ var WalletPassPaymentImpl = class {
    */
   emitEvent(hook, data) {
     try {
-      const eventName = hook.split(":")[1] || hook.replace(/^[A-Z][a-z]+/, "").replace(/^On/, "").toLowerCase();
-      const fullEventName = `${this.paymentModule.name}:${eventName}`;
-      this.paymentModule.core.effects.emit(fullEventName, data);
+      this.paymentModule.core.effects.emit(hook, data);
     } catch (error) {
       this.paymentModule.logError("[WalletPass] 发送事件失败", error, { hook });
     }

package/lib/modules/Product/index.d.ts

@@ -49,5 +49,5 @@ export declare class Product extends BaseModule implements Module {
     getCategories(): ProductCategory[];
     setOtherParams(key: string, value: any): void;
     getOtherParams(): any;
-    getProductType(): "normal" | "duration" | "session";
+    getProductType(): "duration" | "session" | "normal";
 }

package/lib/modules/ProductList/index.js

@@ -24,6 +24,7 @@ __export(ProductList_exports, {
 });
 module.exports = __toCommonJS(ProductList_exports);
 var import_BaseModule = require("../BaseModule");
+var import_types = require("./types");
 var import_lodash_es = require("lodash-es");
 __reExport(ProductList_exports, require("./types"), module.exports);
 var ProductList = class extends import_BaseModule.BaseModule {
@@ -133,14 +134,14 @@ var ProductList = class extends import_BaseModule.BaseModule {
   }
   async getProducts() {
     await this.core.effects.emit(
-      `${this.name}:onGetProducts`,
+      import_types.ProductListHooks.onGetProducts,
       this.store.list
     );
     return (0, import_lodash_es.cloneDeep)(this.store.list);
   }
   async getProduct(id) {
     await this.core.effects.emit(
-      `${this.name}:onGetProduct`,
+      import_types.ProductListHooks.onGetProduct,
       this.store.list
     );
     const product = this.store.list.find((product2) => product2.id === id);

package/lib/modules/Resource/index.js

@@ -42,7 +42,7 @@ var ResourceListModule = class extends import_BaseModule.BaseModule {
     if (!resource)
       return;
     this.store.selectedResource = resource;
-    await this.core.effects.emit(`${this.name}:onResourceSelect`, resource);
+    await this.core.effects.emit(import_types.ResourceHooks.OnResourceSelect, resource);
   }
   getSelectedResource() {
     return this.store.selectedResource;

package/lib/modules/Rules/index.js

@@ -33,6 +33,7 @@ __export(Rules_exports, {
 });
 module.exports = __toCommonJS(Rules_exports);
 var import_BaseModule = require("../BaseModule");
+var import_types = require("./types");
 var import_utils = require("../../solution/ShopDiscount/utils");
 var import_utils2 = require("../Cart/utils");
 var import_decimal = __toESM(require("decimal.js"));
@@ -51,7 +52,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
   }
   async setRulesList(rulesList) {
     this.store.rulesList = rulesList;
-    await this.core.effects.emit(`${this.name}:onRulesListChange`, rulesList);
+    await this.core.effects.emit(import_types.RulesHooks.OnRulesListChange, rulesList);
   }
   getRulesList() {
     return this.store.rulesList;
@@ -488,7 +489,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
   }
   async destroy() {
     this.core.effects.offByModuleDestroy(this.name);
-    await this.core.effects.emit(`${this.name}:onDestroy`, {});
+    await this.core.effects.emit(import_types.RulesHooks.OnDestroy, {});
     console.log("[Rules] 已销毁");
   }
   async clear() {

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

@@ -342,7 +342,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

@@ -116,7 +116,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       }
     });
     this.store.schedule.loadAllSchedule();
-    this.core.effects.emit(`${this.name}:onInited`, {});
+    this.core.effects.emit(import_types.BookingByStepHooks.onInited, {});
   }
   // 初始化step
   initStep(stepList) {
@@ -636,7 +636,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       addItemParams.account = account;
     }
     this.addProductCheck({ date });
-    if (addItemParams.quantity > 1 && !(0, import_utils5.isNormalProduct)(productData.origin)) {
+    if (addItemParams.quantity > 1 && !(0, import_utils5.isNormalProduct)(productData)) {
       for (let i = 0; i < addItemParams.quantity; i++) {
         const newAddItemParams = (0, import_lodash_es.cloneDeep)(addItemParams);
         newAddItemParams.quantity = 1;
@@ -1904,12 +1904,12 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           }
         });
       });
+      if (intersections.length === 0) {
+        console.log(`资源${i}与当前公共时间段无交集，跳过该资源`);
+        continue;
+      }
       commonSlots = intersections;
       console.log(`与资源${i}求交集后的公共时间段:`, commonSlots.map((slot) => `${slot.start.format("HH:mm")}-${slot.end.format("HH:mm")}`));
-      if (commonSlots.length === 0) {
-        console.log("没有找到公共时间段");
-        return [];
-      }
     }
     const result = commonSlots.map((slot) => ({
       startTime: slot.start.format("HH:mm"),

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

@@ -22,10 +22,6 @@ export declare class BookingTicketImpl extends BaseModule implements Module {
      * @returns 商品列表
      */
     loadProducts(params?: ILoadProductsParams): Promise<any>;
-    /**
-     * 初始化外设扫码结果监听
-     */
-    initPeripheralsListener(): void;
     /**
      * 获取商品列表（不加载到模块中）
      * @returns 商品列表

package/lib/solution/BookingTicket/index.js

@@ -99,7 +99,7 @@ var BookingTicketImpl = class extends import_BaseModule.BaseModule {
         throw new Error(`模块 ${step} 不存在`);
       }
     });
-    this.core.effects.emit(`${this.name}:onInited`, {});
+    this.core.effects.emit(import_types.BookingTicketHooks.onInited, {});
   }
   /**
    * 获取商品列表
@@ -115,7 +115,7 @@ var BookingTicketImpl = class extends import_BaseModule.BaseModule {
         ...params,
         cacheId: this.cacheId
       });
-      this.core.effects.emit(`${this.name}:onProductsLoaded`, result);
+      this.core.effects.emit(import_types.BookingTicketHooks.onProductsLoaded, result);
       return result;
     } catch (error) {
       console.error("Failed to load products:", error);
@@ -149,7 +149,7 @@ var BookingTicketImpl = class extends import_BaseModule.BaseModule {
    */
   setActiveCustomer(customer) {
     this.store.customer.setSelectedCustomer(customer);
-    this.core.effects.emit(`${this.name}:onCustomerSelected`, {
+    this.core.effects.emit(import_types.BookingTicketHooks.onCustomerSelected, {
       customer
     });
   }
@@ -168,7 +168,7 @@ var BookingTicketImpl = class extends import_BaseModule.BaseModule {
     const customer = this.store.customer.getCustomerById(customerId);
     if (customer) {
       this.store.customer.setSelectedCustomer(customer);
-      this.core.effects.emit(`${this.name}:onCustomerSelected`, {
+      this.core.effects.emit(import_types.BookingTicketHooks.onCustomerSelected, {
         customer
       });
     }
@@ -248,7 +248,7 @@ var BookingTicketImpl = class extends import_BaseModule.BaseModule {
   async loadMoreCustomers() {
     try {
       const result = await this.store.customer.loadMoreCustomers();
-      this.core.effects.emit(`${this.name}:onCustomerListUpdate`, result);
+      this.core.effects.emit(import_types.BookingTicketHooks.onCustomerListUpdate, result);
       return result;
     } catch (error) {
       console.error("Failed to load more customers:", error);
@@ -263,7 +263,7 @@ var BookingTicketImpl = class extends import_BaseModule.BaseModule {
   async resetAndLoadCustomers(params = {}) {
     try {
       const result = await this.store.customer.resetAndLoadCustomers(params);
-      this.core.effects.emit(`${this.name}:onCustomerListReset`, result);
+      this.core.effects.emit(import_types.BookingTicketHooks.onCustomerListReset, result);
       return result;
     } catch (error) {
       console.error("Failed to reset and load customers:", error);

package/lib/solution/BookingTicket/utils/scan/index.d.ts

@@ -18,10 +18,6 @@ export default class Scan {
     private watchKey;
     private listenerConfig;
     constructor(solution: BookingTicketImpl, watchKey: string);
-    /**
-     * 初始化外设扫码结果监听
-     */
-    initPeripheralsListener(): void;
     /**
      * 处理扫码事件
      * @param eventKey 事件key

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

@@ -37,15 +37,9 @@ var import_task = __toESM(require("../../../../utils/task"));
 var Scan = class {
   constructor(solution, watchKey) {
     this.listenerConfig = /* @__PURE__ */ new Map();
+    var _a, _b, _c, _d, _e;
     this.solution = solution;
     this.watchKey = watchKey;
-    this.initPeripheralsListener();
-  }
-  /**
-   * 初始化外设扫码结果监听
-   */
-  initPeripheralsListener() {
-    var _a, _b, _c, _d, _e;
     (_e = (_d = (_c = (_b = (_a = this.solution) == null ? void 0 : _a.window) == null ? void 0 : _b.interaction) == null ? void 0 : _c.utils) == null ? void 0 : _d.mountFunction) == null ? void 0 : _e.call(
       _d,
       "global",

package/lib/solution/BuyTickets/index.js

@@ -24,6 +24,7 @@ __export(BuyTickets_exports, {
 });
 module.exports = __toCommonJS(BuyTickets_exports);
 var import_modules = require("../../modules/");
+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 {
@@ -48,7 +49,7 @@ var BuyTicketsImpl = class extends import_BaseModule.BaseModule {
     if (this.otherParams.prodctIds) {
       await this.loadProductsByIds(this.otherParams.prodctIds);
     }
-    await this.core.effects.emit(`${this.name}:onInited`, {});
+    await this.core.effects.emit(import_types.BuyTicketsHooks.onInited, {});
   }
   // 通过 ids 获取产品，在当前解决方案下，获取到的就是主商品
   async loadProductsByIds(ids) {
@@ -68,13 +69,13 @@ var BuyTicketsImpl = class extends import_BaseModule.BaseModule {
       }
     });
     this.store.mainProducts = mainProducts;
-    await this.core.effects.emit(`${this.name}:onMainProductsLoaded`, {});
+    await this.core.effects.emit(import_types.BuyTicketsHooks.onMainProductsLoaded, {});
   }
   // 通过 ids 获取产品，在当前解决方案下，获取到的就是其他商品
   async loadProductsByCategory(categoryId) {
   }
   async destroy() {
-    await this.core.effects.emit(`${this.name}:onDestroy`, {});
+    await this.core.effects.emit(import_types.BuyTicketsHooks.onDestroy, {});
     console.log("[BuyTickets] 已销毁");
   }
   // 获取当前绑定的所有商品
@@ -82,7 +83,7 @@ var BuyTicketsImpl = class extends import_BaseModule.BaseModule {
     var _a;
     const mainData = await this.store.mainProducts.getProducts() || [];
     const otherData = await ((_a = this.store.otherProducts) == null ? void 0 : _a.getProducts()) || [];
-    await this.core.effects.emit(`${this.name}:onGetProducts`, [
+    await this.core.effects.emit(import_types.BuyTicketsHooks.OnGetProducts, [
       ...mainData,
       ...otherData
     ]);
@@ -101,7 +102,7 @@ var BuyTicketsImpl = class extends import_BaseModule.BaseModule {
   }
   // 商品列表页提交
   async listSubmit(data) {
-    const res = await this.core.effects.emit(`${this.name}:onListSubmit`, {
+    const res = await this.core.effects.emit(import_types.BuyTicketsHooks.onListSubmit, {
       ...data,
       products: this.getProducts()
     });
@@ -115,14 +116,14 @@ var BuyTicketsImpl = class extends import_BaseModule.BaseModule {
   }
   // 购物车提交
   async cartSubmit(data) {
-    await this.core.effects.emit(`${this.name}:onCartSubmit`, {
+    await this.core.effects.emit(import_types.BuyTicketsHooks.onCartSubmit, {
       ...data,
       products: this.getProducts()
     });
   }
   // 结算提交
   async checkoutSubmit(data) {
-    await this.core.effects.emit(`${this.name}:onCheckoutSubmit`, {
+    await this.core.effects.emit(import_types.BuyTicketsHooks.onCheckoutSubmit, {
       ...data,
       products: this.getProducts()
     });