@pisell/pisellos 1.0.68 → 1.0.70

package/dist/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/dist/effects/index.js

@@ -30,28 +30,51 @@ var EffectsManager = /*#__PURE__*/function () {
         _this.off(event, callback);
       };
     }
+
+    // 设置单例监听器，只能存在一个，新的会替换旧的
+  }, {
+    key: "only",
+    value: function only(event, callback) {
+      var _this$listeners$get3,
+        _this2 = this;
+      // 清除该事件的所有现有监听器
+      if (this.listeners.has(event)) {
+        var _this$listeners$get2;
+        (_this$listeners$get2 = this.listeners.get(event)) === null || _this$listeners$get2 === void 0 || _this$listeners$get2.clear();
+      } else {
+        this.listeners.set(event, new Set());
+      }
+
+      // 添加新的监听器
+      (_this$listeners$get3 = this.listeners.get(event)) === null || _this$listeners$get3 === void 0 || _this$listeners$get3.add(callback);
+
+      // 返回取消函数
+      return function () {
+        _this2.off(event, callback);
+      };
+    }
   }, {
     key: "off",
     value: function off(event, callback) {
-      var _this$listeners$get2;
-      (_this$listeners$get2 = this.listeners.get(event)) === null || _this$listeners$get2 === void 0 || _this$listeners$get2.delete(callback);
+      var _this$listeners$get4;
+      (_this$listeners$get4 = this.listeners.get(event)) === null || _this$listeners$get4 === void 0 || _this$listeners$get4.delete(callback);
     }
 
     // 模块销毁时，删除所有以模块名开头的监听
   }, {
     key: "offByModuleDestroy",
     value: function offByModuleDestroy(module) {
-      var _this2 = this;
+      var _this3 = this;
       Array.from(this.listeners.keys()).forEach(function (item) {
         if (item.startsWith(module)) {
-          _this2.listeners.delete(item);
+          _this3.listeners.delete(item);
         }
       });
     }
   }, {
     key: "once",
     value: function once(event, callback) {
-      var _this3 = this;
+      var _this4 = this;
       var wrapper = /*#__PURE__*/function () {
         var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(payload) {
           return _regeneratorRuntime().wrap(function _callee$(_context) {
@@ -60,7 +83,7 @@ var EffectsManager = /*#__PURE__*/function () {
                 _context.next = 2;
                 return callback(payload);
               case 2:
-                _this3.off(event, wrapper);
+                _this4.off(event, wrapper);
               case 3:
               case "end":
                 return _context.stop();

package/dist/modules/Account/index.js

@@ -18,7 +18,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 "../BaseModule";
-import { AccountHooks } from "./types";
 export * from "./types";
 export var AccountModule = /*#__PURE__*/function (_BaseModule) {
   _inherits(AccountModule, _BaseModule);
@@ -85,7 +84,7 @@ export var AccountModule = /*#__PURE__*/function (_BaseModule) {
               this.store.accountInfo = account;
               this.store.isLoggedIn = true;
               _context2.next = 5;
-              return this.core.effects.emit(AccountHooks.OnLogin, account);
+              return this.core.effects.emit("".concat(this.name, ":onLogin"), account);
             case 5:
             case "end":
               return _context2.stop();
@@ -117,7 +116,7 @@ export var AccountModule = /*#__PURE__*/function (_BaseModule) {
             case 2:
               this.store.accountInfo = _objectSpread(_objectSpread({}, this.store.accountInfo), updates);
               _context3.next = 5;
-              return this.core.effects.emit(AccountHooks.OnProfileUpdate, this.store.accountInfo);
+              return this.core.effects.emit("".concat(this.name, ":onProfileUpdate"), this.store.accountInfo);
             case 5:
             case "end":
               return _context3.stop();

package/dist/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/dist/modules/BaseModule.js

@@ -66,6 +66,21 @@ export var BaseModule = /*#__PURE__*/function () {
         }
       }
     }
+  }, {
+    key: "effectsOn",
+    value: function effectsOn(eventType, callback) {
+      return this.core.effects.on("".concat(this.name, ":").concat(eventType), callback);
+    }
+  }, {
+    key: "effectsOff",
+    value: function effectsOff(eventType, callback) {
+      return this.core.effects.off("".concat(this.name, ":").concat(eventType), callback);
+    }
+  }, {
+    key: "effectsOnce",
+    value: function effectsOnce(eventType, callback) {
+      return this.core.effects.once("".concat(this.name, ":").concat(eventType), callback);
+    }
   }]);
   return BaseModule;
 }();

package/dist/modules/Customer/index.js

@@ -29,7 +29,6 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 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 { cloneDeep } from 'lodash-es';
 import { BaseModule } from "../BaseModule";
-import { CustomerHooks } from "./types";
 import { DEFAULT_CUSTOMER, DEFAULT_PAGE_SIZE, SORT_BY } from "./constants";
 export var CustomerModule = /*#__PURE__*/function (_BaseModule) {
   _inherits(CustomerModule, _BaseModule);
@@ -203,7 +202,7 @@ export var CustomerModule = /*#__PURE__*/function (_BaseModule) {
               console.error("Failed to ".concat(operation, ":"), error);
               this.store.error = error instanceof Error ? error.message : "Failed to ".concat(operation);
               _context3.next = 4;
-              return this.core.effects.emit(CustomerHooks.OnCustomerListError, this.store.error);
+              return this.core.effects.emit("".concat(this.name, ":onCustomerListError"), this.store.error);
             case 4:
             case "end":
               return _context3.stop();
@@ -266,7 +265,7 @@ export var CustomerModule = /*#__PURE__*/function (_BaseModule) {
               // 设置客户列表（替换模式）
               this.store.customerList = cloneDeep(customerList);
               _context4.next = 20;
-              return this.core.effects.emit(CustomerHooks.OnCustomerListUpdate, this.store);
+              return this.core.effects.emit("".concat(this.name, ":onCustomerListUpdate"), this.store);
             case 20:
               // 触发分页变化事件
               this.triggerPaginationChange({
@@ -329,7 +328,7 @@ export var CustomerModule = /*#__PURE__*/function (_BaseModule) {
     key: "setSelectedCustomer",
     value: function setSelectedCustomer(customer) {
       this.store.selectedCustomer = !customer ? DEFAULT_CUSTOMER : cloneDeep(customer);
-      this.core.effects.emit(CustomerHooks.OnCustomerSelected, this.store.selectedCustomer);
+      this.core.effects.emit("".concat(this.name, ":onCustomerSelected"), this.store.selectedCustomer);
       this.storeChange();
     }
 
@@ -380,7 +379,7 @@ export var CustomerModule = /*#__PURE__*/function (_BaseModule) {
       this.store.hasMore = true;
       this.store.loadingMore = false;
       this.store.searchParams = {};
-      this.core.effects.emit(CustomerHooks.OnCustomerListUpdate, this.store);
+      this.core.effects.emit("".concat(this.name, ":onCustomerListUpdate"), this.store);
       this.storeChange();
     }
 
@@ -401,7 +400,7 @@ export var CustomerModule = /*#__PURE__*/function (_BaseModule) {
       this.store.total += 1;
 
       // 触发客户列表更新事件
-      this.core.effects.emit(CustomerHooks.OnCustomerListUpdate, this.store);
+      this.core.effects.emit("".concat(this.name, ":onCustomerListUpdate"), this.store);
 
       // 保存状态变化
       this.storeChange();
@@ -439,7 +438,7 @@ export var CustomerModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "triggerPaginationChange",
     value: function triggerPaginationChange(pagination) {
-      this.core.effects.emit(CustomerHooks.OnPaginationChange, pagination);
+      this.core.effects.emit("".concat(this.name, ":onPaginationChange"), pagination);
     }
 
     /**
@@ -552,7 +551,7 @@ export var CustomerModule = /*#__PURE__*/function (_BaseModule) {
 
               // 触发滚动加载特定事件
               _context6.next = 20;
-              return this.core.effects.emit(CustomerHooks.OnScrollLoadMore, {
+              return this.core.effects.emit("".concat(this.name, ":onScrollLoadMore"), {
                 newCustomers: newCustomers,
                 allCustomers: this.store.customerList,
                 currentPage: page,
@@ -560,7 +559,7 @@ export var CustomerModule = /*#__PURE__*/function (_BaseModule) {
               });
             case 20:
               _context6.next = 22;
-              return this.core.effects.emit(CustomerHooks.OnCustomerListUpdate, this.store);
+              return this.core.effects.emit("".concat(this.name, ":onCustomerListUpdate"), this.store);
             case 22:
               // 触发分页变化事件
               this.triggerPaginationChange({
@@ -634,7 +633,7 @@ export var CustomerModule = /*#__PURE__*/function (_BaseModule) {
             case 8:
               response = _context7.sent;
               _context7.next = 11;
-              return this.core.effects.emit(CustomerHooks.OnScrollLoadComplete, {
+              return this.core.effects.emit("".concat(this.name, ":onScrollLoadComplete"), {
                 customers: this.store.customerList,
                 total: this.store.total,
                 hasMore: this.store.hasMore

package/dist/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/dist/modules/Customer/types.js

@@ -1,7 +1,7 @@
 export var CustomerHooks = /*#__PURE__*/function (CustomerHooks) {
-  CustomerHooks["OnCustomerListUpdate"] = "customer:onUpdate";
+  CustomerHooks["OnCustomerListUpdate"] = "customer:onCustomerListUpdate";
   CustomerHooks["OnCustomerListError"] = "customer:onError";
-  CustomerHooks["OnCustomerSelected"] = "customer:onSelected";
+  CustomerHooks["OnCustomerSelected"] = "customer:onCustomerSelected";
   CustomerHooks["OnPaginationChange"] = "customer:onPaginationChange";
   CustomerHooks["OnScrollLoadMore"] = "customer:onScrollLoadMore";
   CustomerHooks["OnScrollLoadComplete"] = "customer:onScrollLoadComplete";

package/dist/modules/Discount/index.js

@@ -283,7 +283,7 @@ export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
               this.store.discountList = [];
               this.core.effects.offByModuleDestroy(this.name);
               _context5.next = 4;
-              return this.core.effects.emit(DiscountHooks.OnDestroy, {});
+              return this.core.effects.emit("".concat(this.name, ":onDestroy"), {});
             case 4:
               console.log('[Discount] 已销毁');
             case 5:

package/dist/modules/Guests/index.js

@@ -70,10 +70,10 @@ export var GuestListModule = /*#__PURE__*/function (_BaseModule) {
             case 0:
               this.state.list.push(guest);
               _context2.next = 3;
-              return this.core.effects.emit(GuestHooks.OnGuestAdd, guest);
+              return this.core.effects.emit("".concat(this.name, ":onGuestAdd"), guest);
             case 3:
               _context2.next = 5;
-              return this.core.effects.emit(GuestHooks.OnGuestChange, this.state.list);
+              return this.core.effects.emit("".concat(this.name, ":onGuestChange"), this.state.list);
             case 5:
             case "end":
               return _context2.stop();
@@ -107,7 +107,7 @@ export var GuestListModule = /*#__PURE__*/function (_BaseModule) {
               return this.core.effects.emit(GuestHooks.OnGuestUpdate, this.state.list[index]);
             case 6:
               _context3.next = 8;
-              return this.core.effects.emit(GuestHooks.OnGuestChange, this.state.list);
+              return this.core.effects.emit("".concat(this.name, ":onGuestChange"), this.state.list);
             case 8:
             case "end":
               return _context3.stop();
@@ -138,10 +138,10 @@ export var GuestListModule = /*#__PURE__*/function (_BaseModule) {
             case 3:
               _this$state$list$spli = this.state.list.splice(index, 1), _this$state$list$spli2 = _slicedToArray(_this$state$list$spli, 1), removed = _this$state$list$spli2[0];
               _context4.next = 6;
-              return this.core.effects.emit(GuestHooks.OnGuestRemove, removed);
+              return this.core.effects.emit("".concat(this.name, ":onGuestRemove"), removed);
             case 6:
               _context4.next = 8;
-              return this.core.effects.emit(GuestHooks.OnGuestChange, this.state.list);
+              return this.core.effects.emit("".concat(this.name, ":onGuestChange"), this.state.list);
             case 8:
             case "end":
               return _context4.stop();
@@ -196,10 +196,10 @@ export var GuestListModule = /*#__PURE__*/function (_BaseModule) {
             case 3:
               guest.items.push(item);
               _context6.next = 6;
-              return this.core.effects.emit(GuestHooks.OnGuestUpdate, guest);
+              return this.core.effects.emit("".concat(this.name, ":onGuestUpdate"), guest);
             case 6:
               _context6.next = 8;
-              return this.core.effects.emit(GuestHooks.OnGuestChange, this.state.list);
+              return this.core.effects.emit("".concat(this.name, ":onGuestChange"), this.state.list);
             case 8:
             case "end":
               return _context6.stop();
@@ -239,10 +239,10 @@ export var GuestListModule = /*#__PURE__*/function (_BaseModule) {
             case 6:
               guest.items.splice(index, 1);
               _context7.next = 9;
-              return this.core.effects.emit(GuestHooks.OnGuestUpdate, guest);
+              return this.core.effects.emit("".concat(this.name, ":onGuestUpdate"), guest);
             case 9:
               _context7.next = 11;
-              return this.core.effects.emit(GuestHooks.OnGuestChange, this.state.list);
+              return this.core.effects.emit("".concat(this.name, ":onGuestChange"), this.state.list);
             case 11:
             case "end":
               return _context7.stop();

package/dist/modules/Order/index.js

@@ -35,7 +35,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   function OrderModule(name, version) {
     var _this;
     _classCallCheck(this, OrderModule);
-    _this = _super.call(this, name, version);
+    _this = _super.call(this, name || "order", version);
     _defineProperty(_assertThisInitialized(_this), "defaultName", 'order');
     _defineProperty(_assertThisInitialized(_this), "defaultVersion", '1.0.0');
     _defineProperty(_assertThisInitialized(_this), "store", void 0);

package/dist/modules/Payment/index.js

@@ -21,7 +21,7 @@ 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 "../BaseModule";
-import { PaymentStatus, PaymentHooks, PaymentMethodType, RoundingRule } from "./types";
+import { PaymentStatus, PaymentMethodType, RoundingRule } from "./types";
 import { getUniqueId } from "../Cart/utils";
 import { CashPaymentImpl } from "./cash";
 import { EftposPaymentImpl } from "./eftpos";
@@ -73,7 +73,7 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
   function PaymentModule(name, version) {
     var _this;
     _classCallCheck(this, PaymentModule);
-    _this = _super.call(this, name, version);
+    _this = _super.call(this, name || "payment", version);
     // 初始化支付方式实例
     _defineProperty(_assertThisInitialized(_this), "defaultName", 'pay');
     _defineProperty(_assertThisInitialized(_this), "defaultVersion", '1.0.0');
@@ -131,6 +131,10 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
               return this.ensurePaymentTables();
             case 14:
               this.registerNetworkHandlers();
+
+              // // 预连接数据库
+              // this.dbManager.connect()
+
               console.log('[PaymentModule] 初始化完成');
               this.logInfo('PaymentModule initialized successfully');
             case 17:
@@ -334,7 +338,7 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
               console.warn('[PaymentModule] 无法缓存支付方式，pay_method 表不存在');
             case 43:
               _context3.next = 45;
-              return this.core.effects.emit(PaymentHooks.OnPaymentMethodsLoaded, payMethods);
+              return this.core.effects.emit("".concat(this.name, ":onPaymentMethodsLoaded"), payMethods);
             case 45:
               this.logInfo('getPayMethodListAsync completed successfully', {
                 methodCount: payMethods.length,
@@ -465,7 +469,7 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                 newMethods: newPayMethods
               };
               _context4.next = 54;
-              return this.core.effects.emit(PaymentHooks.OnPaymentMethodsChanged, eventData);
+              return this.core.effects.emit("".concat(this.name, ":onPaymentMethodsChanged"), eventData);
             case 54:
               _context4.next = 57;
               break;
@@ -657,7 +661,8 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
     key: "createPaymentOrderAsync",
     value: (function () {
       var _createPaymentOrderAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(params) {
-        var existingOrder, newOrder;
+        var _this3 = this;
+        var newOrder, dbAddStartTime, dbAddDuration;
         return _regeneratorRuntime().wrap(function _callee7$(_context7) {
           while (1) switch (_context7.prev = _context7.next) {
             case 0:
@@ -666,41 +671,41 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                 totalAmount: params.total_amount
               });
               _context7.prev = 1;
-              _context7.next = 4;
-              return this.dbManager.get('order', params.order_id);
-            case 4:
-              existingOrder = _context7.sent;
-              this.logInfo('createPaymentOrderAsync existingOrder', {
-                existingOrder: existingOrder
-              });
+              // 检测是否有重复的 order_id
+              // console.time('createLocalOrderAsync: getExistingOrder')
+              // const existingOrder = await this.dbManager.get('order', params.order_id);
+              // const existingOrders = await this.dbManager.getAll('order');
               // const existingOrder = existingOrders.find(
               //   (order: PaymentOrder) => String(order.id) === String(params.order_id),
               // );
-              if (!existingOrder) {
-                _context7.next = 20;
-                break;
-              }
-              // 如果存在相同 order_id 的订单，更新该订单信息
-              this.logInfo("createPaymentOrderAsync found duplicate order ID: ".concat(params.order_id, ", updating existing payment order"));
-
-              // const originalOrder = { ...existingOrder };
-              existingOrder.order_info = params.order_info;
-              existingOrder.total_amount = params.total_amount;
-              existingOrder.is_deposit = params.is_deposit || 0;
-              existingOrder.deposit_amount = params.deposit_amount || '0.00';
-
-              // 重新计算待付金额
-              this.recalculateOrderAmount(existingOrder);
-
-              // 更新到数据库
-              _context7.next = 15;
-              return this.dbManager.update('order', existingOrder);
-            case 15:
-              _context7.next = 17;
-              return this.core.effects.emit(PaymentHooks.OnOrderUpdated, existingOrder);
-            case 17:
-              return _context7.abrupt("return", existingOrder);
-            case 20:
+              // this.logInfo('createPaymentOrderAsync existingOrder', {
+              //   existingOrder
+              // });
+              // console.timeEnd('createLocalOrderAsync: getExistingOrder')
+              // const existingOrder = existingOrders.find(
+              //   (order: PaymentOrder) => String(order.id) === String(params.order_id),
+              // );
+              // if (existingOrder) {
+              //   // 如果存在相同 order_id 的订单，更新该订单信息
+              //   this.logInfo(
+              //     `createPaymentOrderAsync found duplicate order ID: ${params.order_id}, updating existing payment order`,
+              //   );
+              //   // const originalOrder = { ...existingOrder };
+              //   existingOrder.order_info = params.order_info;
+              //   existingOrder.total_amount = params.total_amount;
+              //   existingOrder.is_deposit = params.is_deposit || 0;
+              //   existingOrder.deposit_amount = params.deposit_amount || '0.00';
+              //   // 重新计算待付金额
+              //   this.recalculateOrderAmount(existingOrder);
+              //   // 更新到数据库
+              //   await this.dbManager.update('order', existingOrder);
+              //   // 触发更新事件
+              //   this.core.effects.emit(
+              //     `${this.name}:onOrderUpdated`,
+              //     existingOrder,
+              //   );
+              //   return existingOrder;
+              // } else {
               // 创建新的支付订单
               newOrder = {
                 uuid: getUniqueId('pay_order_'),
@@ -715,32 +720,37 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                 tax_fee: '0.00',
                 is_deposit: params.is_deposit || 0,
                 deposit_amount: params.deposit_amount || '0.00'
-              };
-              _context7.next = 23;
+              }; // 🚀 性能监控：记录数据库添加操作耗时
+              dbAddStartTime = Date.now();
+              _context7.next = 6;
               return this.dbManager.add('order', newOrder);
-            case 23:
-              this.core.effects.emit(PaymentHooks.OnOrderAdded, newOrder);
-              this.logInfo('createPaymentOrderAsync completed - new payment order created', {
+            case 6:
+              dbAddDuration = Date.now() - dbAddStartTime;
+              this.logInfo('Database add operation completed', {
+                operation: 'dbManager.add',
+                table: 'order',
                 orderUuid: newOrder.uuid,
-                orderId: newOrder.id
+                orderId: newOrder.order_id,
+                duration: "".concat(dbAddDuration, "ms"),
+                performance: dbAddDuration > 100 ? 'slow' : dbAddDuration > 50 ? 'medium' : 'fast'
               });
+              setTimeout(function () {
+                _this3.core.effects.emit("".concat(_this3.name, ":onOrderAdded"), newOrder);
+              }, 0);
               return _context7.abrupt("return", newOrder);
-            case 26:
-              _context7.next = 33;
-              break;
-            case 28:
-              _context7.prev = 28;
+            case 12:
+              _context7.prev = 12;
               _context7.t0 = _context7["catch"](1);
               console.error('[PaymentModule] 创建支付订单失败', _context7.t0);
               this.logError('createPaymentOrderAsync failed', _context7.t0, {
                 orderId: params.order_id
               });
               throw _context7.t0;
-            case 33:
+            case 17:
             case "end":
               return _context7.stop();
           }
-        }, _callee7, this, [[1, 28]]);
+        }, _callee7, this, [[1, 12]]);
       }));
       function createPaymentOrderAsync(_x6) {
         return _createPaymentOrderAsync.apply(this, arguments);
@@ -772,7 +782,7 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
               return this.dbManager.delete('order', orderUuid);
             case 7:
               _context8.next = 9;
-              return this.core.effects.emit(PaymentHooks.OnOrderDeleted, order);
+              return this.core.effects.emit("".concat(this.name, ":onOrderDeleted"), order);
             case 9:
               console.log('[PaymentModule] 支付订单删除成功:', orderUuid);
             case 10:
@@ -821,10 +831,10 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
               return this.dbManager.update('order', updatedOrder);
             case 9:
               _context9.next = 11;
-              return this.core.effects.emit(PaymentHooks.OnOrderUpdated, updatedOrder);
+              return this.core.effects.emit("".concat(this.name, ":onOrderUpdated"), updatedOrder);
             case 11:
               _context9.next = 13;
-              return this.core.effects.emit(PaymentHooks.OnOrderChanged, {
+              return this.core.effects.emit("".concat(this.name, ":onOrderChanged"), {
                 action: 'update',
                 order: updatedOrder,
                 originalOrder: order
@@ -919,10 +929,10 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
               return this.dbManager.update('order', updatedOrder);
             case 19:
               _context10.next = 21;
-              return this.core.effects.emit(PaymentHooks.OnOrderUpdated, updatedOrder);
+              return this.core.effects.emit("".concat(this.name, ":onOrderUpdated"), updatedOrder);
             case 21:
               _context10.next = 23;
-              return this.core.effects.emit(PaymentHooks.OnOrderChanged, {
+              return this.core.effects.emit("".concat(this.name, ":onOrderChanged"), {
                 action: 'order_id_replaced',
                 order: updatedOrder,
                 originalOrder: existingOrder,
@@ -1119,7 +1129,7 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
               return this.dbManager.update('order', order);
             case 21:
               _context13.next = 23;
-              return this.core.effects.emit(PaymentHooks.OnPaymentAdded, {
+              return this.core.effects.emit("".concat(this.name, ":onPaymentAdded"), {
                 orderUuid: orderUuid,
                 payment: newPaymentItem
               });
@@ -1221,13 +1231,13 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
               return this.dbManager.update('order', order);
             case 20:
               _context14.next = 22;
-              return this.core.effects.emit(PaymentHooks.OnPaymentDeleted, {
+              return this.core.effects.emit("".concat(this.name, ":onPaymentDeleted"), {
                 order: order,
                 paymentItem: paymentItem
               });
             case 22:
               _context14.next = 24;
-              return this.core.effects.emit(PaymentHooks.OnOrderChanged, {
+              return this.core.effects.emit("".concat(this.name, ":onOrderChanged"), {
                 action: 'payment_delete',
                 order: order,
                 paymentItem: paymentItem
@@ -1394,7 +1404,7 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
             case 50:
               updatedOrder = _context15.sent;
               _context15.next = 53;
-              return this.core.effects.emit(PaymentHooks.OnPaymentAdded, {
+              return this.core.effects.emit("".concat(this.name, ":onPaymentAdded"), {
                 orderUuid: orderUuid,
                 order: updatedOrder,
                 payment: null // 批量操作不提供单个支付项
@@ -1473,13 +1483,13 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
               return this.dbManager.update('order', order);
             case 14:
               _context16.next = 16;
-              return this.core.effects.emit(PaymentHooks.OnPaymentUpdated, {
+              return this.core.effects.emit("".concat(this.name, ":onPaymentUpdated"), {
                 order: order,
                 paymentItem: paymentItem
               });
             case 16:
               _context16.next = 18;
-              return this.core.effects.emit(PaymentHooks.OnOrderChanged, {
+              return this.core.effects.emit("".concat(this.name, ":onOrderChanged"), {
                 action: 'payment_update',
                 order: order,
                 paymentItem: paymentItem
@@ -1658,10 +1668,10 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
               return _context18.abrupt("return");
             case 12:
               _context18.next = 14;
-              return this.core.effects.emit(PaymentHooks.OnPaymentSubmitted, order);
+              return this.core.effects.emit("".concat(this.name, ":onPaymentSubmitted"), order);
             case 14:
               _context18.next = 16;
-              return this.core.effects.emit(PaymentHooks.OnOrderChanged, {
+              return this.core.effects.emit("".concat(this.name, ":onOrderChanged"), {
                 action: 'submit',
                 order: order
               });
@@ -1808,7 +1818,7 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
           // 例如：amount=15, rounding_amount=-0.2，有效支付=15.2（抹掉0.2元零头）
           var paymentAmount = new Decimal(payment.amount || 0);
           var roundingAmount = new Decimal(payment.rounding_amount || 0);
-          var effectiveAmount = paymentAmount.plus(roundingAmount.abs());
+          var effectiveAmount = paymentAmount.plus(roundingAmount.isNegative() ? roundingAmount.abs() : 0);
           return sum.plus(effectiveAmount);
         } catch (error) {
           console.warn("[PaymentModule] \u65E0\u6548\u7684\u652F\u4ED8\u91D1\u989D: amount=".concat(payment.amount, ", rounding_amount=").concat(payment.rounding_amount, "\uFF0C\u8DF3\u8FC7\u8BA1\u7B97"));
@@ -1836,7 +1846,7 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
             code: p.code,
             amount: p.amount,
             rounding_amount: p.rounding_amount || '0.00',
-            effective_amount: new Decimal(p.amount || 0).plus(new Decimal(p.rounding_amount || 0).abs()).toFixed(2)
+            effective_amount: new Decimal(p.amount || 0).plus(new Decimal(Number(p.rounding_amount) > 0 ? 0 : p.rounding_amount || 0).abs()).toFixed(2)
           };
         }),
         说明: '有效支付金额包含抹零计算（amount + |rounding_amount|）'

package/dist/modules/Payment/walletpass.js

@@ -40,7 +40,10 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
     key: "emitEvent",
     value: function emitEvent(hook, data) {
       try {
-        this.paymentModule.core.effects.emit(hook, data);
+        // 提取事件名称，去掉模块前缀
+        var eventName = hook.split(':')[1] || hook.replace(/^[A-Z][a-z]+/, '').replace(/^On/, '').toLowerCase();
+        var fullEventName = "".concat(this.paymentModule.name, ":").concat(eventName);
+        this.paymentModule.core.effects.emit(fullEventName, data);
       } catch (error) {
         this.paymentModule.logError('[WalletPass] 发送事件失败', error, {
           hook: hook

package/dist/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";
 }