@pisell/pisellos 2.1.39 → 2.1.41

package/dist/solution/ShopDiscount/index.js

@@ -25,7 +25,6 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import { BaseModule } from "../../modules/BaseModule";
-import { ShopDiscountHooks } from "./types";
 import { DiscountModule } from "../../modules/Discount";
 import { RulesModule } from "../../modules/Rules";
 import Decimal from 'decimal.js';
@@ -104,7 +103,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
               (_this$store$rules = this.store.rules) === null || _this$store$rules === void 0 || _this$store$rules.destroy();
               this.core.effects.offByModuleDestroy(this.name);
               _context2.next = 7;
-              return this.core.effects.emit(ShopDiscountHooks.onDestroy, {});
+              return this.core.effects.emit("".concat(this.name, ":onDestroy"), {});
             case 7:
               console.log('[ShopDiscount] 已销毁');
             case 8:
@@ -192,7 +191,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
     key: "registerEventListeners",
     value: function registerEventListeners() {
       var _this2 = this;
-      this.core.effects.on(ShopDiscountHooks.onCustomerChange, function (customer) {
+      this.core.effects.only("".concat(this.name, ":onCustomerChange"), function (customer) {
         var _this2$options$otherP;
         if ((_this2$options$otherP = _this2.options.otherParams) !== null && _this2$options$otherP !== void 0 && _this2$options$otherP.cacheId && _this2.getDiscountList().length) {
           return;
@@ -223,7 +222,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
               }
               this.store.customer = customer;
               _context4.next = 4;
-              return this.core.effects.emit(ShopDiscountHooks.onCustomerChange, customer);
+              return this.core.effects.emit("".concat(this.name, ":onCustomerChange"), customer);
             case 4:
             case "end":
               return _context4.stop();
@@ -321,7 +320,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
     key: "scanCode",
     value: function () {
       var _scanCode = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(code, customerId) {
-        var _this$store$discount3, resultDiscountList, rulesModule, withScanList, _ref2, newProductList, newDiscountList, isAvailable, _this$options$otherPa6;
+        var _this$store$discount3, resultDiscountList, rulesModule, withScanList, currentSelectedDiscountList, _ref2, newProductList, newDiscountList, isAvailable, _this$options$otherPa6;
         return _regeneratorRuntime().wrap(function _callee5$(_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
@@ -364,7 +363,25 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                 return _objectSpread(_objectSpread({}, item), {}, {
                   isScan: true
                 });
+              }); // 如果扫回来的券当前有选中的，则不进行计算
+              currentSelectedDiscountList = this.getDiscountList().filter(function (n) {
+                return n.isSelected;
               });
+              if (!(currentSelectedDiscountList.length && currentSelectedDiscountList.some(function (n) {
+                return withScanList.some(function (m) {
+                  return m.id === n.id;
+                });
+              }))) {
+                _context5.next = 16;
+                break;
+              }
+              return _context5.abrupt("return", {
+                type: "clientCalc",
+                isAvailable: true,
+                productList: this.store.productList || [],
+                discountList: this.getDiscountList()
+              });
+            case 16:
               _ref2 = rulesModule.isDiscountListAvailable({
                 productList: this.store.productList || [],
                 oldDiscountList: this.getDiscountList(),
@@ -375,27 +392,27 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                 discountList: this.getDiscountList()
               }, newProductList = _ref2.productList, newDiscountList = _ref2.discountList, isAvailable = _ref2.isAvailable;
               if (!isAvailable) {
-                _context5.next = 21;
+                _context5.next = 24;
                 break;
               }
               this.setDiscountList(newDiscountList || []);
               this.store.originalDiscountList = newDiscountList || [];
               this.setProductList(newProductList || []);
               if (!(this.isWalkIn() && resultDiscountList.length && ((_this$options$otherPa6 = this.options.otherParams) === null || _this$options$otherPa6 === void 0 ? void 0 : _this$options$otherPa6.platform) === 'shop')) {
-                _context5.next = 21;
+                _context5.next = 24;
                 break;
               }
-              _context5.next = 21;
+              _context5.next = 24;
               return this.getCustomerWallet(resultDiscountList[0].customer_id);
-            case 21:
+            case 24:
               return _context5.abrupt("return", {
                 type: "clientCalc",
                 isAvailable: isAvailable || false,
                 productList: newProductList || this.store.productList || [],
                 discountList: newDiscountList || this.getDiscountList()
               });
-            case 24:
-              _context5.prev = 24;
+            case 27:
+              _context5.prev = 27;
               _context5.t1 = _context5["catch"](0);
               console.error('[ShopDiscount] 扫码出错:', _context5.t1);
               return _context5.abrupt("return", {
@@ -404,11 +421,11 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                 productList: this.store.productList || [],
                 discountList: this.getDiscountList()
               });
-            case 28:
+            case 31:
             case "end":
               return _context5.stop();
           }
-        }, _callee5, this, [[0, 24]]);
+        }, _callee5, this, [[0, 27]]);
       }));
       function scanCode(_x4, _x5) {
         return _scanCode.apply(this, arguments);
@@ -448,7 +465,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
           while (1) switch (_context6.prev = _context6.next) {
             case 0:
               _context6.next = 2;
-              return this.core.effects.emit(ShopDiscountHooks.onDiscountListChange, discountList);
+              return this.core.effects.emit("".concat(this.name, ":onDiscountListChange"), discountList);
             case 2:
             case "end":
               return _context6.stop();
@@ -579,7 +596,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
               customer = Object.assign({}, (_objectDestructuringEmpty(_result.data), _result.data));
               this.setCustomer(customer);
               _context7.next = 9;
-              return this.core.effects.emit(ShopDiscountHooks.onScanCustomerChange, customer);
+              return this.core.effects.emit("".concat(this.name, ":onScanCustomerChange"), customer);
             case 9:
               _context7.next = 14;
               break;
@@ -616,10 +633,10 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
               _result2 = this.calcDiscount(this.store.productList);
               cb === null || cb === void 0 || cb(_result2);
               _context8.next = 7;
-              return this.core.effects.emit(ShopDiscountHooks.onLoadPrepareCalcResult, _result2);
+              return this.core.effects.emit("".concat(this.name, ":onLoadPrepareCalcResult"), _result2);
             case 7:
               _context8.next = 9;
-              return this.core.effects.emit(ShopDiscountHooks.onLoadDiscountList, newDiscountList);
+              return this.core.effects.emit("".concat(this.name, ":onLoadDiscountList"), newDiscountList);
             case 9:
             case "end":
               return _context8.stop();
@@ -670,10 +687,10 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
               }
               _result3 = this.calcDiscount(this.store.productList);
               _context9.next = 15;
-              return this.core.effects.emit(ShopDiscountHooks.onLoadPrepareCalcResult, _result3);
+              return this.core.effects.emit("".concat(this.name, ":onLoadPrepareCalcResult"), _result3);
             case 15:
               _context9.next = 17;
-              return this.core.effects.emit(ShopDiscountHooks.onLoadDiscountList, newDiscountList);
+              return this.core.effects.emit("".concat(this.name, ":onLoadDiscountList"), newDiscountList);
             case 17:
               _context9.next = 22;
               break;

package/dist/types/index.d.ts

@@ -40,6 +40,7 @@ export interface PisellCore {
     effects: {
         on: (event: string, callback: (payload: any) => void) => () => void;
         once: (event: string, callback: (payload: any) => void) => () => void;
+        only: (event: string, callback: (payload: any) => void) => () => void;
         off: (event: string, callback: (payload: any) => void) => void;
         emit: (event: string, payload: any, value?: any) => Promise<{
             status: boolean;

package/lib/effects/index.d.ts

@@ -6,6 +6,7 @@ type UnsubscribeFunction = () => void;
 declare class EffectsManager {
     private listeners;
     on(event: string, callback: EffectCallback): UnsubscribeFunction;
+    only(event: string, callback: EffectCallback): UnsubscribeFunction;
     off(event: string, callback: EffectCallback): void;
     offByModuleDestroy(module: string): void;
     once(event: string, callback: EffectCallback): UnsubscribeFunction;

package/lib/effects/index.js

@@ -35,6 +35,19 @@ var EffectsManager = class {
       this.off(event, callback);
     };
   }
+  // 设置单例监听器，只能存在一个，新的会替换旧的
+  only(event, callback) {
+    var _a, _b;
+    if (this.listeners.has(event)) {
+      (_a = this.listeners.get(event)) == null ? void 0 : _a.clear();
+    } else {
+      this.listeners.set(event, /* @__PURE__ */ new Set());
+    }
+    (_b = this.listeners.get(event)) == null ? void 0 : _b.add(callback);
+    return () => {
+      this.off(event, callback);
+    };
+  }
   off(event, callback) {
     var _a;
     (_a = this.listeners.get(event)) == null ? void 0 : _a.delete(callback);

package/lib/modules/Account/index.js

@@ -24,7 +24,6 @@ __export(Account_exports, {
 });
 module.exports = __toCommonJS(Account_exports);
 var import_BaseModule = require("../BaseModule");
-var import_types = require("./types");
 __reExport(Account_exports, require("./types"), module.exports);
 var AccountModule = class extends import_BaseModule.BaseModule {
   constructor(name, version) {
@@ -59,7 +58,7 @@ var AccountModule = class extends import_BaseModule.BaseModule {
     };
     this.store.accountInfo = account;
     this.store.isLoggedIn = true;
-    await this.core.effects.emit(import_types.AccountHooks.OnLogin, account);
+    await this.core.effects.emit(`${this.name}:onLogin`, account);
   }
   getCurrentAccount() {
     return this.store.accountInfo;
@@ -72,7 +71,7 @@ var AccountModule = class extends import_BaseModule.BaseModule {
       ...updates
     };
     await this.core.effects.emit(
-      import_types.AccountHooks.OnProfileUpdate,
+      `${this.name}:onProfileUpdate`,
       this.store.accountInfo
     );
   }

package/lib/modules/BaseModule.d.ts

@@ -14,4 +14,7 @@ export declare class BaseModule {
         store: any;
         cacheKey: string[];
     }): void;
+    effectsOn(eventType: string, callback: (payload: any) => void): () => void;
+    effectsOff(eventType: string, callback: (payload: any) => void): void;
+    effectsOnce(eventType: string, callback: (payload: any) => void): () => void;
 }

package/lib/modules/BaseModule.js

@@ -82,6 +82,15 @@ var BaseModule = class {
       }
     }
   }
+  effectsOn(eventType, callback) {
+    return this.core.effects.on(`${this.name}:${eventType}`, callback);
+  }
+  effectsOff(eventType, callback) {
+    return this.core.effects.off(`${this.name}:${eventType}`, callback);
+  }
+  effectsOnce(eventType, callback) {
+    return this.core.effects.once(`${this.name}:${eventType}`, callback);
+  }
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/lib/modules/Customer/index.js

@@ -25,7 +25,6 @@ __export(Customer_exports, {
 module.exports = __toCommonJS(Customer_exports);
 var import_lodash_es = require("lodash-es");
 var import_BaseModule = require("../BaseModule");
-var import_types = require("./types");
 var import_constants = require("./constants");
 __reExport(Customer_exports, require("./types"), module.exports);
 var CustomerModule = class extends import_BaseModule.BaseModule {
@@ -128,7 +127,7 @@ var CustomerModule = class extends import_BaseModule.BaseModule {
     console.error(`Failed to ${operation}:`, error);
     this.store.error = error instanceof Error ? error.message : `Failed to ${operation}`;
     await this.core.effects.emit(
-      import_types.CustomerHooks.OnCustomerListError,
+      `${this.name}:onCustomerListError`,
       this.store.error
     );
   }
@@ -150,7 +149,7 @@ var CustomerModule = class extends import_BaseModule.BaseModule {
       this.store.hasMore = page * pageSize < total;
       this.store.customerList = (0, import_lodash_es.cloneDeep)(customerList);
       await this.core.effects.emit(
-        import_types.CustomerHooks.OnCustomerListUpdate,
+        `${this.name}:onCustomerListUpdate`,
         this.store
       );
       this.triggerPaginationChange({
@@ -193,7 +192,7 @@ var CustomerModule = class extends import_BaseModule.BaseModule {
   setSelectedCustomer(customer) {
     this.store.selectedCustomer = !customer ? import_constants.DEFAULT_CUSTOMER : (0, import_lodash_es.cloneDeep)(customer);
     this.core.effects.emit(
-      import_types.CustomerHooks.OnCustomerSelected,
+      `${this.name}:onCustomerSelected`,
       this.store.selectedCustomer
     );
     this.storeChange();
@@ -233,7 +232,7 @@ var CustomerModule = class extends import_BaseModule.BaseModule {
     this.store.loadingMore = false;
     this.store.searchParams = {};
     this.core.effects.emit(
-      import_types.CustomerHooks.OnCustomerListUpdate,
+      `${this.name}:onCustomerListUpdate`,
       this.store
     );
     this.storeChange();
@@ -247,7 +246,7 @@ var CustomerModule = class extends import_BaseModule.BaseModule {
     this.store.customerList = [newCustomer, ...this.store.customerList];
     this.store.total += 1;
     this.core.effects.emit(
-      import_types.CustomerHooks.OnCustomerListUpdate,
+      `${this.name}:onCustomerListUpdate`,
       this.store
     );
     this.storeChange();
@@ -277,7 +276,7 @@ var CustomerModule = class extends import_BaseModule.BaseModule {
    */
   triggerPaginationChange(pagination) {
     this.core.effects.emit(
-      import_types.CustomerHooks.OnPaginationChange,
+      `${this.name}:onPaginationChange`,
       pagination
     );
   }
@@ -344,7 +343,7 @@ var CustomerModule = class extends import_BaseModule.BaseModule {
       this.store.total = total;
       this.store.hasMore = page * pageSize < total;
       await this.core.effects.emit(
-        import_types.CustomerHooks.OnScrollLoadMore,
+        `${this.name}:onScrollLoadMore`,
         {
           newCustomers,
           allCustomers: this.store.customerList,
@@ -353,7 +352,7 @@ var CustomerModule = class extends import_BaseModule.BaseModule {
         }
       );
       await this.core.effects.emit(
-        import_types.CustomerHooks.OnCustomerListUpdate,
+        `${this.name}:onCustomerListUpdate`,
         this.store
       );
       this.triggerPaginationChange({
@@ -395,7 +394,7 @@ var CustomerModule = class extends import_BaseModule.BaseModule {
     };
     const response = await this.getCustomerList(resetParams);
     await this.core.effects.emit(
-      import_types.CustomerHooks.OnScrollLoadComplete,
+      `${this.name}:onScrollLoadComplete`,
       {
         customers: this.store.customerList,
         total: this.store.total,

package/lib/modules/Customer/types.d.ts

@@ -1,8 +1,8 @@
 import { ICustomer } from "../AccountList/types";
 export declare enum CustomerHooks {
-    OnCustomerListUpdate = "customer:onUpdate",
+    OnCustomerListUpdate = "customer:onCustomerListUpdate",
     OnCustomerListError = "customer:onError",
-    OnCustomerSelected = "customer:onSelected",
+    OnCustomerSelected = "customer:onCustomerSelected",
     OnPaginationChange = "customer:onPaginationChange",
     OnScrollLoadMore = "customer:onScrollLoadMore",
     OnScrollLoadComplete = "customer:onScrollLoadComplete"

package/lib/modules/Customer/types.js

@@ -23,9 +23,9 @@ __export(types_exports, {
 });
 module.exports = __toCommonJS(types_exports);
 var CustomerHooks = /* @__PURE__ */ ((CustomerHooks2) => {
-  CustomerHooks2["OnCustomerListUpdate"] = "customer:onUpdate";
+  CustomerHooks2["OnCustomerListUpdate"] = "customer:onCustomerListUpdate";
   CustomerHooks2["OnCustomerListError"] = "customer:onError";
-  CustomerHooks2["OnCustomerSelected"] = "customer:onSelected";
+  CustomerHooks2["OnCustomerSelected"] = "customer:onCustomerSelected";
   CustomerHooks2["OnPaginationChange"] = "customer:onPaginationChange";
   CustomerHooks2["OnScrollLoadMore"] = "customer:onScrollLoadMore";
   CustomerHooks2["OnScrollLoadComplete"] = "customer:onScrollLoadComplete";

package/lib/modules/Discount/index.js

@@ -171,7 +171,7 @@ var DiscountModule = class extends import_BaseModule.BaseModule {
   async destroy() {
     this.store.discountList = [];
     this.core.effects.offByModuleDestroy(this.name);
-    await this.core.effects.emit(import_types.DiscountHooks.OnDestroy, {});
+    await this.core.effects.emit(`${this.name}:onDestroy`, {});
     console.log("[Discount] 已销毁");
   }
   async clear() {

package/lib/modules/Guests/index.js

@@ -41,8 +41,8 @@ var GuestListModule = class extends import_BaseModule.BaseModule {
   }
   async addGuest(guest) {
     this.state.list.push(guest);
-    await this.core.effects.emit(import_types.GuestHooks.OnGuestAdd, guest);
-    await this.core.effects.emit(import_types.GuestHooks.OnGuestChange, this.state.list);
+    await this.core.effects.emit(`${this.name}:onGuestAdd`, guest);
+    await this.core.effects.emit(`${this.name}:onGuestChange`, this.state.list);
   }
   async updateGuest(id, updates) {
     const index = this.state.list.findIndex((g) => g.id === id);
@@ -56,15 +56,15 @@ var GuestListModule = class extends import_BaseModule.BaseModule {
       import_types.GuestHooks.OnGuestUpdate,
       this.state.list[index]
     );
-    await this.core.effects.emit(import_types.GuestHooks.OnGuestChange, this.state.list);
+    await this.core.effects.emit(`${this.name}:onGuestChange`, this.state.list);
   }
   async removeGuest(id) {
     const index = this.state.list.findIndex((g) => g.id === id);
     if (index === -1)
       return;
     const [removed] = this.state.list.splice(index, 1);
-    await this.core.effects.emit(import_types.GuestHooks.OnGuestRemove, removed);
-    await this.core.effects.emit(import_types.GuestHooks.OnGuestChange, this.state.list);
+    await this.core.effects.emit(`${this.name}:onGuestRemove`, removed);
+    await this.core.effects.emit(`${this.name}:onGuestChange`, this.state.list);
   }
   async getGuests() {
     return this.state.list;
@@ -77,8 +77,8 @@ var GuestListModule = class extends import_BaseModule.BaseModule {
     if (!guest)
       return;
     guest.items.push(item);
-    await this.core.effects.emit(import_types.GuestHooks.OnGuestUpdate, guest);
-    await this.core.effects.emit(import_types.GuestHooks.OnGuestChange, this.state.list);
+    await this.core.effects.emit(`${this.name}:onGuestUpdate`, guest);
+    await this.core.effects.emit(`${this.name}:onGuestChange`, this.state.list);
   }
   async removeItemFromGuest(guestId, itemId) {
     const guest = this.state.list.find((g) => g.id === guestId);
@@ -88,8 +88,8 @@ var GuestListModule = class extends import_BaseModule.BaseModule {
     if (index === -1)
       return;
     guest.items.splice(index, 1);
-    await this.core.effects.emit(import_types.GuestHooks.OnGuestUpdate, guest);
-    await this.core.effects.emit(import_types.GuestHooks.OnGuestChange, this.state.list);
+    await this.core.effects.emit(`${this.name}:onGuestUpdate`, guest);
+    await this.core.effects.emit(`${this.name}:onGuestChange`, this.state.list);
   }
 };
 // Annotate the CommonJS export names for ESM import in node:

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, version);
+    super(name || "order", 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, version);
+    super(name || "payment", 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(
-        import_types.PaymentHooks.OnPaymentMethodsLoaded,
+        `${this.name}: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(
-          import_types.PaymentHooks.OnPaymentMethodsChanged,
+          `${this.name}: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(import_types.PaymentHooks.OnOrderDeleted, order);
+        await this.core.effects.emit(`${this.name}: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(import_types.PaymentHooks.OnOrderUpdated, updatedOrder);
-        await this.core.effects.emit(import_types.PaymentHooks.OnOrderChanged, {
+        await this.core.effects.emit(`${this.name}:onOrderUpdated`, updatedOrder);
+        await this.core.effects.emit(`${this.name}: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(import_types.PaymentHooks.OnOrderUpdated, updatedOrder);
-      await this.core.effects.emit(import_types.PaymentHooks.OnOrderChanged, {
+      await this.core.effects.emit(`${this.name}:onOrderUpdated`, updatedOrder);
+      await this.core.effects.emit(`${this.name}: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(import_types.PaymentHooks.OnPaymentAdded, {
+      await this.core.effects.emit(`${this.name}: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(import_types.PaymentHooks.OnPaymentDeleted, {
+      await this.core.effects.emit(`${this.name}:onPaymentDeleted`, {
         order,
         paymentItem
       });
-      await this.core.effects.emit(import_types.PaymentHooks.OnOrderChanged, {
+      await this.core.effects.emit(`${this.name}: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(import_types.PaymentHooks.OnPaymentAdded, {
+      await this.core.effects.emit(`${this.name}: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(import_types.PaymentHooks.OnPaymentUpdated, {
+        await this.core.effects.emit(`${this.name}:onPaymentUpdated`, {
           order,
           paymentItem
         });
-        await this.core.effects.emit(import_types.PaymentHooks.OnOrderChanged, {
+        await this.core.effects.emit(`${this.name}:onOrderChanged`, {
           action: "payment_update",
           order,
           paymentItem
@@ -833,8 +833,8 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
         });
         return;
       }
-      await this.core.effects.emit(import_types.PaymentHooks.OnPaymentSubmitted, order);
-      await this.core.effects.emit(import_types.PaymentHooks.OnOrderChanged, {
+      await this.core.effects.emit(`${this.name}:onPaymentSubmitted`, order);
+      await this.core.effects.emit(`${this.name}:onOrderChanged`, {
         action: "submit",
         order
       });

package/lib/modules/Payment/walletpass.js

@@ -38,7 +38,9 @@ var WalletPassPaymentImpl = class {
    */
   emitEvent(hook, data) {
     try {
-      this.paymentModule.core.effects.emit(hook, data);
+      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);
     } 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(): "duration" | "session" | "normal";
+    getProductType(): "normal" | "duration" | "session";
 }

package/lib/modules/ProductList/index.js

@@ -24,7 +24,6 @@ __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 {
@@ -134,14 +133,14 @@ var ProductList = class extends import_BaseModule.BaseModule {
   }
   async getProducts() {
     await this.core.effects.emit(
-      import_types.ProductListHooks.onGetProducts,
+      `${this.name}:onGetProducts`,
       this.store.list
     );
     return (0, import_lodash_es.cloneDeep)(this.store.list);
   }
   async getProduct(id) {
     await this.core.effects.emit(
-      import_types.ProductListHooks.onGetProduct,
+      `${this.name}: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(import_types.ResourceHooks.OnResourceSelect, resource);
+    await this.core.effects.emit(`${this.name}:onResourceSelect`, resource);
   }
   getSelectedResource() {
     return this.store.selectedResource;

package/lib/modules/Rules/index.js

@@ -33,7 +33,6 @@ __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"));
@@ -52,7 +51,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
   }
   async setRulesList(rulesList) {
     this.store.rulesList = rulesList;
-    await this.core.effects.emit(import_types.RulesHooks.OnRulesListChange, rulesList);
+    await this.core.effects.emit(`${this.name}:onRulesListChange`, rulesList);
   }
   getRulesList() {
     return this.store.rulesList;
@@ -489,7 +488,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
   }
   async destroy() {
     this.core.effects.offByModuleDestroy(this.name);
-    await this.core.effects.emit(import_types.RulesHooks.OnDestroy, {});
+    await this.core.effects.emit(`${this.name}:onDestroy`, {});
     console.log("[Rules] 已销毁");
   }
   async clear() {