@pisell/pisellos 0.0.568 → 0.10.1

package/dist/modules/Payment/index.js

@@ -76,6 +76,13 @@ function generateRequestUniqueId() {
 
   return "".concat(year).concat(month).concat(day).concat(hour).concat(minute).concat(second).concat(millisecond).concat(randomDigits);
 }
+function normalizeCustomPaymentId(paymentItem) {
+  var _ref, _paymentItem$custom_p;
+  var rawId = (_ref = (_paymentItem$custom_p = paymentItem.custom_payment_id) !== null && _paymentItem$custom_p !== void 0 ? _paymentItem$custom_p : paymentItem.id) !== null && _ref !== void 0 ? _ref : 0;
+  var parsedId = Number(rawId);
+  if (!Number.isFinite(parsedId)) return 0;
+  return parsedId;
+}
 
 /**
  * 支付模块实现
@@ -190,16 +197,16 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
               this.logger = this.app.logger;
 
               // 确保支付模块所需的对象存储已创建
-              _context.next = 15;
-              return this.ensurePaymentTables();
-            case 15:
+              // await this.ensurePaymentTables();
+
               this.registerNetworkHandlers();
 
               // // 预连接数据库
               // this.dbManager.connect()
 
+              console.log('[PaymentModule] 初始化完成');
               this.logInfo('PaymentModule initialized successfully');
-            case 17:
+            case 16:
             case "end":
               return _context.stop();
           }
@@ -210,6 +217,18 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
       }
       return initialize;
     }()
+    /**
+     * 更新父级解决方案透传的运行态参数，主要用于日志父模块等上下文。
+     *
+     * @example
+     * paymentModule.updateOtherParams({ fatherModule: 'bookingTicket' });
+     */
+  }, {
+    key: "updateOtherParams",
+    value: function updateOtherParams(params) {
+      this.otherParams = params || {};
+    }
+
     /**
      * 记录信息日志
      */
@@ -296,10 +315,11 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
       var network = this.app.plugins.get('network');
       this.logInfo('Registering network status listener');
       network === null || network === void 0 || network.addListener('networkStatusChange', /*#__PURE__*/function () {
-        var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(status) {
+        var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(status) {
           return _regeneratorRuntime().wrap(function _callee2$(_context2) {
             while (1) switch (_context2.prev = _context2.next) {
               case 0:
+                console.log('网络状态:', status.connected);
                 _this3.logInfo('Network status changed', {
                   connected: status.connected,
                   previousStatus: status.previousStatus
@@ -308,347 +328,89 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                   _this3.logInfo('Network reconnected');
                   // 网络恢复时的处理逻辑可以在这里添加
                 }
-              case 2:
+              case 3:
               case "end":
                 return _context2.stop();
             }
           }, _callee2);
         }));
         return function (_x3) {
-          return _ref.apply(this, arguments);
+          return _ref2.apply(this, arguments);
         };
       }());
     }
-  }, {
-    key: "filterPayMethods",
-    value: function () {
-      var _filterPayMethods = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(payMethods) {
-        var walletPassMethod;
-        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-          while (1) switch (_context3.prev = _context3.next) {
-            case 0:
-              // 1. 筛选 status === 1 && disable === 0的数据
-              // 2. 检查列表里是否有 code=WALLET_PASS的数据，如果没有，则列表里如果有 PRODUCTVOUCHER 、 GIFTCARD 、 POINTCARD 则删除他们
-              // 如果有 code = WALLET_PASS的数据，则列表里PRODUCTVOUCHER 、 GIFTCARD 、 POINTCARD 的channel_application 指向 WALLET_PASS 的 channel_application
-              payMethods = payMethods.filter(function (method) {
-                return method.status === 1 && method.disable === 0;
-              });
-              walletPassMethod = payMethods.find(function (method) {
-                return method.code === 'WALLET_PASS';
-              });
-              if (walletPassMethod) {
-                payMethods.forEach(function (method) {
-                  if (method.code === 'PRODUCTVOUCHER' || method.code === 'GIFTCARD' || method.code === 'POINTCARD') {
-                    method.channel_application = walletPassMethod.channel_application;
-                  }
-                });
-              } else {
-                payMethods = payMethods.filter(function (method) {
-                  return method.code !== 'PRODUCTVOUCHER' && method.code !== 'GIFTCARD' && method.code !== 'POINTCARD';
-                });
-              }
-              return _context3.abrupt("return", payMethods);
-            case 4:
-            case "end":
-              return _context3.stop();
-          }
-        }, _callee3);
-      }));
-      function filterPayMethods(_x4) {
-        return _filterPayMethods.apply(this, arguments);
-      }
-      return filterPayMethods;
-    }()
+
     /**
      * 获取支付方式列表
      */
   }, {
     key: "getPayMethodListAsync",
     value: (function () {
-      var _getPayMethodListAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
-        var cachedMethods, hasCache, response, payMethods, _iterator2, _step2, method;
-        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-          while (1) switch (_context4.prev = _context4.next) {
+      var _getPayMethodListAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+        var response, payMethods;
+        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
             case 0:
               this.logInfo('Starting getPayMethodListAsync');
-              _context4.prev = 1;
-              // 先尝试从 IndexDB 获取缓存
-              cachedMethods = [];
-              _context4.prev = 3;
-              _context4.next = 6;
-              return this.dbManager.getAll('pay_method');
-            case 6:
-              cachedMethods = _context4.sent;
-              _context4.next = 12;
-              break;
-            case 9:
-              _context4.prev = 9;
-              _context4.t0 = _context4["catch"](3);
-              console.warn('[PaymentModule] pay_method 表不存在，将从服务器获取数据');
-            case 12:
-              // 如果有缓存，先返回缓存数据
-              hasCache = cachedMethods.length > 0;
-              if (!hasCache) {
-                _context4.next = 16;
-                break;
-              }
-              // 后台异步获取最新数据
-              this.refreshPaymentMethodsInBackground(cachedMethods);
-              return _context4.abrupt("return", cachedMethods);
-            case 16:
-              _context4.next = 18;
-              return this.request.get('/pay/custom-payment/all');
-            case 18:
-              response = _context4.sent;
-              response.data = this.filterPayMethods(response.data);
-              payMethods = response.data || []; // 尝试缓存到 IndexDB
-              _context4.prev = 21;
-              _iterator2 = _createForOfIteratorHelper(payMethods);
-              _context4.prev = 23;
-              _iterator2.s();
-            case 25:
-              if ((_step2 = _iterator2.n()).done) {
-                _context4.next = 31;
-                break;
-              }
-              method = _step2.value;
-              _context4.next = 29;
-              return this.dbManager.update('pay_method', method);
-            case 29:
-              _context4.next = 25;
-              break;
-            case 31:
-              _context4.next = 36;
-              break;
-            case 33:
-              _context4.prev = 33;
-              _context4.t1 = _context4["catch"](23);
-              _iterator2.e(_context4.t1);
-            case 36:
-              _context4.prev = 36;
-              _iterator2.f();
-              return _context4.finish(36);
-            case 39:
-              _context4.next = 44;
-              break;
-            case 41:
-              _context4.prev = 41;
-              _context4.t2 = _context4["catch"](21);
-              console.warn('[PaymentModule] 无法缓存支付方式，pay_method 表不存在');
-            case 44:
-              _context4.next = 46;
-              return this.core.effects.emit("".concat(this.name, ":onPaymentMethodsLoaded"), payMethods);
-            case 46:
+              _context3.prev = 1;
+              _context3.next = 4;
+              return this.request.get('/pay/custom-payment/all', {
+                filterPaymentMethods: true
+              }, {
+                osServer: true
+              });
+            case 4:
+              response = _context3.sent;
+              payMethods = (response === null || response === void 0 ? void 0 : response.data) || response || [];
               this.logInfo('getPayMethodListAsync completed successfully', {
                 payMethods: payMethods
               });
-              return _context4.abrupt("return", payMethods);
-            case 50:
-              _context4.prev = 50;
-              _context4.t3 = _context4["catch"](1);
-              console.error('[PaymentModule] 获取支付方式列表失败', _context4.t3);
-              this.logError('getPayMethodListAsync failed', _context4.t3);
+              return _context3.abrupt("return", payMethods);
+            case 10:
+              _context3.prev = 10;
+              _context3.t0 = _context3["catch"](1);
+              console.error('[PaymentModule] 获取支付方式列表失败', _context3.t0);
+              this.logError('getPayMethodListAsync failed', _context3.t0);
               // 如果所有操作都失败，返回空数组
-              return _context4.abrupt("return", []);
-            case 55:
+              return _context3.abrupt("return", []);
+            case 15:
             case "end":
-              return _context4.stop();
+              return _context3.stop();
           }
-        }, _callee4, this, [[1, 50], [3, 9], [21, 41], [23, 33, 36, 39]]);
+        }, _callee3, this, [[1, 10]]);
       }));
       function getPayMethodListAsync() {
         return _getPayMethodListAsync.apply(this, arguments);
       }
       return getPayMethodListAsync;
     }()
-    /**
-     * 后台刷新支付方式列表
-     */
-    )
-  }, {
-    key: "refreshPaymentMethodsInBackground",
-    value: (function () {
-      var _refreshPaymentMethodsInBackground = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(cachedMethods) {
-        var response, newPayMethods, hasChanges, _iterator3, _step3, method, _iterator4, _step4, _method, eventData;
-        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
-          while (1) switch (_context5.prev = _context5.next) {
-            case 0:
-              this.logInfo('Starting refreshPaymentMethodsInBackground', {
-                cachedMethodsCount: cachedMethods.length
-              });
-              _context5.prev = 1;
-              _context5.next = 4;
-              return this.request.get('/pay/custom-payment/all');
-            case 4:
-              response = _context5.sent;
-              response.data = this.filterPayMethods(response.data);
-              newPayMethods = response.data || []; // 检查是否有变化
-              hasChanges = this.hasPaymentMethodsChanged(cachedMethods, newPayMethods);
-              if (!hasChanges) {
-                _context5.next = 55;
-                break;
-              }
-              this.logInfo('Payment methods updated in background', {
-                oldCount: cachedMethods.length,
-                newCount: newPayMethods.length
-              });
-
-              // 更新缓存
-              _context5.prev = 10;
-              // 先清除旧数据
-              _iterator3 = _createForOfIteratorHelper(cachedMethods);
-              _context5.prev = 12;
-              _iterator3.s();
-            case 14:
-              if ((_step3 = _iterator3.n()).done) {
-                _context5.next = 20;
-                break;
-              }
-              method = _step3.value;
-              _context5.next = 18;
-              return this.dbManager.delete('pay_method', method.id);
-            case 18:
-              _context5.next = 14;
-              break;
-            case 20:
-              _context5.next = 25;
-              break;
-            case 22:
-              _context5.prev = 22;
-              _context5.t0 = _context5["catch"](12);
-              _iterator3.e(_context5.t0);
-            case 25:
-              _context5.prev = 25;
-              _iterator3.f();
-              return _context5.finish(25);
-            case 28:
-              // 添加新数据
-              _iterator4 = _createForOfIteratorHelper(newPayMethods);
-              _context5.prev = 29;
-              _iterator4.s();
-            case 31:
-              if ((_step4 = _iterator4.n()).done) {
-                _context5.next = 37;
-                break;
-              }
-              _method = _step4.value;
-              _context5.next = 35;
-              return this.dbManager.update('pay_method', _method);
-            case 35:
-              _context5.next = 31;
-              break;
-            case 37:
-              _context5.next = 42;
-              break;
-            case 39:
-              _context5.prev = 39;
-              _context5.t1 = _context5["catch"](29);
-              _iterator4.e(_context5.t1);
-            case 42:
-              _context5.prev = 42;
-              _iterator4.f();
-              return _context5.finish(42);
-            case 45:
-              _context5.next = 50;
-              break;
-            case 47:
-              _context5.prev = 47;
-              _context5.t2 = _context5["catch"](10);
-              console.warn('[PaymentModule] 无法更新支付方式缓存', _context5.t2);
-            case 50:
-              // 通知外部支付方式已变化
-              eventData = {
-                oldMethods: cachedMethods,
-                newMethods: newPayMethods
-              };
-              _context5.next = 53;
-              return this.core.effects.emit("".concat(this.name, ":onPaymentMethodsChanged"), eventData);
-            case 53:
-              _context5.next = 55;
-              break;
-            case 55:
-              _context5.next = 60;
-              break;
-            case 57:
-              _context5.prev = 57;
-              _context5.t3 = _context5["catch"](1);
-              console.error('[PaymentModule] 后台刷新支付方式失败', _context5.t3);
-            case 60:
-            case "end":
-              return _context5.stop();
-          }
-        }, _callee5, this, [[1, 57], [10, 47], [12, 22, 25, 28], [29, 39, 42, 45]]);
-      }));
-      function refreshPaymentMethodsInBackground(_x5) {
-        return _refreshPaymentMethodsInBackground.apply(this, arguments);
-      }
-      return refreshPaymentMethodsInBackground;
-    }()
-    /**
-     * 检查支付方式列表是否有变化
-     */
-    )
-  }, {
-    key: "hasPaymentMethodsChanged",
-    value: function hasPaymentMethodsChanged(oldMethods, newMethods) {
-      if (oldMethods.length !== newMethods.length) {
-        return true;
-      }
-
-      // 创建旧数据的 Map 便于查找
-      var oldMethodsMap = new Map(oldMethods.map(function (method) {
-        return [method.id, method];
-      }));
-
-      // 检查每个新方法是否与旧方法相同
-      var _iterator5 = _createForOfIteratorHelper(newMethods),
-        _step5;
-      try {
-        for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
-          var newMethod = _step5.value;
-          var oldMethod = oldMethodsMap.get(newMethod.id);
-          if (!oldMethod) {
-            return true; // 新增方法
-          }
-
-          // 检查关键字段是否有变化
-          if (oldMethod.code !== newMethod.code || oldMethod.name !== newMethod.name || oldMethod.type !== newMethod.type || oldMethod.description !== newMethod.description || oldMethod.status !== newMethod.status || oldMethod.disable !== newMethod.disable || oldMethod.is_surcharge !== newMethod.is_surcharge || oldMethod.fixed !== newMethod.fixed || oldMethod.percentage !== newMethod.percentage || oldMethod.enabled !== newMethod.enabled || JSON.stringify(oldMethod.channel_application || []) !== JSON.stringify(newMethod.channel_application || []) || JSON.stringify(oldMethod.companies || []) !== JSON.stringify(newMethod.companies || []) || JSON.stringify(oldMethod.metadata || {}) !== JSON.stringify(newMethod.metadata || {})) {
-            return true; // 方法属性有变化
-          }
-        }
-      } catch (err) {
-        _iterator5.e(err);
-      } finally {
-        _iterator5.f();
-      }
-      return false;
-    }
-
     /**
      * 获取订单列表
      */
+    /** @deprecated */
+    )
   }, {
     key: "getOrderListAsync",
     value: (function () {
-      var _getOrderListAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
-        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
-          while (1) switch (_context6.prev = _context6.next) {
+      var _getOrderListAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
+        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+          while (1) switch (_context4.prev = _context4.next) {
             case 0:
-              _context6.prev = 0;
-              _context6.next = 3;
+              _context4.prev = 0;
+              _context4.next = 3;
               return this.dbManager.getAll('order');
             case 3:
-              return _context6.abrupt("return", _context6.sent);
+              return _context4.abrupt("return", _context4.sent);
             case 6:
-              _context6.prev = 6;
-              _context6.t0 = _context6["catch"](0);
-              console.error('[PaymentModule] 获取订单列表失败', _context6.t0);
-              return _context6.abrupt("return", []);
+              _context4.prev = 6;
+              _context4.t0 = _context4["catch"](0);
+              console.error('[PaymentModule] 获取订单列表失败', _context4.t0);
+              return _context4.abrupt("return", []);
             case 10:
             case "end":
-              return _context6.stop();
+              return _context4.stop();
           }
-        }, _callee6, this, [[0, 6]]);
+        }, _callee4, this, [[0, 6]]);
       }));
       function getOrderListAsync() {
         return _getOrderListAsync.apply(this, arguments);
@@ -662,27 +424,27 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getPaymentOrderByUuidAsync",
     value: (function () {
-      var _getPaymentOrderByUuidAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(orderUuid) {
-        return _regeneratorRuntime().wrap(function _callee7$(_context7) {
-          while (1) switch (_context7.prev = _context7.next) {
+      var _getPaymentOrderByUuidAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(orderUuid) {
+        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+          while (1) switch (_context5.prev = _context5.next) {
             case 0:
-              _context7.prev = 0;
-              _context7.next = 3;
+              _context5.prev = 0;
+              _context5.next = 3;
               return this.dbManager.get('order', orderUuid, true);
             case 3:
-              return _context7.abrupt("return", _context7.sent);
+              return _context5.abrupt("return", _context5.sent);
             case 6:
-              _context7.prev = 6;
-              _context7.t0 = _context7["catch"](0);
-              console.error('[PaymentModule] 获取支付订单失败', _context7.t0);
-              return _context7.abrupt("return", null);
+              _context5.prev = 6;
+              _context5.t0 = _context5["catch"](0);
+              console.error('[PaymentModule] 获取支付订单失败', _context5.t0);
+              return _context5.abrupt("return", null);
             case 10:
             case "end":
-              return _context7.stop();
+              return _context5.stop();
           }
-        }, _callee7, this, [[0, 6]]);
+        }, _callee5, this, [[0, 6]]);
       }));
-      function getPaymentOrderByUuidAsync(_x6) {
+      function getPaymentOrderByUuidAsync(_x4) {
         return _getPaymentOrderByUuidAsync.apply(this, arguments);
       }
       return getPaymentOrderByUuidAsync;
@@ -694,17 +456,17 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "createPaymentOrderAsync",
     value: (function () {
-      var _createPaymentOrderAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(params) {
+      var _createPaymentOrderAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(params) {
         var _this4 = this;
         var newOrder, currentTime, dbAddStartTime, dbAddDuration;
-        return _regeneratorRuntime().wrap(function _callee8$(_context8) {
-          while (1) switch (_context8.prev = _context8.next) {
+        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+          while (1) switch (_context6.prev = _context6.next) {
             case 0:
               this.logInfo('Starting createPaymentOrderAsync', {
                 orderId: params.order_id,
                 totalAmount: params.total_amount
               });
-              _context8.prev = 1;
+              _context6.prev = 1;
               // 检测是否有重复的 order_id
               // console.time('createLocalOrderAsync: getExistingOrder')
               // const existingOrder = await this.dbManager.get('order', params.order_id);
@@ -790,7 +552,7 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
 
               // 🚀 性能监控：记录数据库添加操作耗时
               dbAddStartTime = Date.now();
-              _context8.next = 7;
+              _context6.next = 7;
               return this.dbManager.add('order', newOrder, true);
             case 7:
               dbAddDuration = Date.now() - dbAddStartTime;
@@ -805,22 +567,22 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
               setTimeout(function () {
                 _this4.core.effects.emit("".concat(_this4.name, ":onOrderAdded"), newOrder);
               }, 0);
-              return _context8.abrupt("return", newOrder);
+              return _context6.abrupt("return", newOrder);
             case 13:
-              _context8.prev = 13;
-              _context8.t0 = _context8["catch"](1);
-              console.error('[PaymentModule] 创建支付订单失败', _context8.t0);
-              this.logError('createPaymentOrderAsync failed', _context8.t0, {
+              _context6.prev = 13;
+              _context6.t0 = _context6["catch"](1);
+              console.error('[PaymentModule] 创建支付订单失败', _context6.t0);
+              this.logError('createPaymentOrderAsync failed', _context6.t0, {
                 orderId: params.order_id
               });
-              throw _context8.t0;
+              throw _context6.t0;
             case 18:
             case "end":
-              return _context8.stop();
+              return _context6.stop();
           }
-        }, _callee8, this, [[1, 13]]);
+        }, _callee6, this, [[1, 13]]);
       }));
-      function createPaymentOrderAsync(_x7) {
+      function createPaymentOrderAsync(_x5) {
         return _createPaymentOrderAsync.apply(this, arguments);
       }
       return createPaymentOrderAsync;
@@ -832,40 +594,42 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "deletePaymentOrderAsync",
     value: (function () {
-      var _deletePaymentOrderAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(orderUuid) {
+      var _deletePaymentOrderAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(orderUuid) {
         var order;
-        return _regeneratorRuntime().wrap(function _callee9$(_context9) {
-          while (1) switch (_context9.prev = _context9.next) {
+        return _regeneratorRuntime().wrap(function _callee7$(_context7) {
+          while (1) switch (_context7.prev = _context7.next) {
             case 0:
-              _context9.prev = 0;
-              _context9.next = 3;
+              _context7.prev = 0;
+              _context7.next = 3;
               return this.dbManager.get('order', orderUuid);
             case 3:
-              order = _context9.sent;
+              order = _context7.sent;
               if (!order) {
-                _context9.next = 9;
+                _context7.next = 10;
                 break;
               }
-              _context9.next = 7;
+              _context7.next = 7;
               return this.dbManager.delete('order', orderUuid);
             case 7:
-              _context9.next = 9;
+              _context7.next = 9;
               return this.core.effects.emit("".concat(this.name, ":onOrderDeleted"), order);
             case 9:
-              _context9.next = 15;
+              console.log('[PaymentModule] 支付订单删除成功:', orderUuid);
+            case 10:
+              _context7.next = 16;
               break;
-            case 11:
-              _context9.prev = 11;
-              _context9.t0 = _context9["catch"](0);
-              console.error('[PaymentModule] 删除支付订单失败', _context9.t0);
-              throw _context9.t0;
-            case 15:
+            case 12:
+              _context7.prev = 12;
+              _context7.t0 = _context7["catch"](0);
+              console.error('[PaymentModule] 删除支付订单失败', _context7.t0);
+              throw _context7.t0;
+            case 16:
             case "end":
-              return _context9.stop();
+              return _context7.stop();
           }
-        }, _callee9, this, [[0, 11]]);
+        }, _callee7, this, [[0, 12]]);
       }));
-      function deletePaymentOrderAsync(_x8) {
+      function deletePaymentOrderAsync(_x6) {
         return _deletePaymentOrderAsync.apply(this, arguments);
       }
       return deletePaymentOrderAsync;
@@ -877,49 +641,49 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "updateOrderAsync",
     value: (function () {
-      var _updateOrderAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(orderUuid, params) {
+      var _updateOrderAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(orderUuid, params) {
         var order, updatedOrder;
-        return _regeneratorRuntime().wrap(function _callee10$(_context10) {
-          while (1) switch (_context10.prev = _context10.next) {
+        return _regeneratorRuntime().wrap(function _callee8$(_context8) {
+          while (1) switch (_context8.prev = _context8.next) {
             case 0:
-              _context10.prev = 0;
-              _context10.next = 3;
+              _context8.prev = 0;
+              _context8.next = 3;
               return this.dbManager.get('order', orderUuid);
             case 3:
-              order = _context10.sent;
+              order = _context8.sent;
               if (!order) {
-                _context10.next = 13;
+                _context8.next = 13;
                 break;
               }
               updatedOrder = _objectSpread(_objectSpread({}, order), params);
               this.recalculateOrderAmount(updatedOrder);
-              _context10.next = 9;
+              _context8.next = 9;
               return this.dbManager.update('order', updatedOrder);
             case 9:
-              _context10.next = 11;
+              _context8.next = 11;
               return this.core.effects.emit("".concat(this.name, ":onOrderUpdated"), updatedOrder);
             case 11:
-              _context10.next = 13;
+              _context8.next = 13;
               return this.core.effects.emit("".concat(this.name, ":onOrderChanged"), {
                 action: 'update',
                 order: updatedOrder,
                 originalOrder: order
               });
             case 13:
-              _context10.next = 19;
+              _context8.next = 19;
               break;
             case 15:
-              _context10.prev = 15;
-              _context10.t0 = _context10["catch"](0);
-              console.error('[PaymentModule] 更新订单失败', _context10.t0);
-              throw _context10.t0;
+              _context8.prev = 15;
+              _context8.t0 = _context8["catch"](0);
+              console.error('[PaymentModule] 更新订单失败', _context8.t0);
+              throw _context8.t0;
             case 19:
             case "end":
-              return _context10.stop();
+              return _context8.stop();
           }
-        }, _callee10, this, [[0, 15]]);
+        }, _callee8, this, [[0, 15]]);
       }));
-      function updateOrderAsync(_x9, _x10) {
+      function updateOrderAsync(_x7, _x8) {
         return _updateOrderAsync.apply(this, arguments);
       }
       return updateOrderAsync;
@@ -938,38 +702,38 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "replaceOrderIdByUuidAsync",
     value: (function () {
-      var _replaceOrderIdByUuidAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11(orderUuid, newOrderId) {
+      var _replaceOrderIdByUuidAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(orderUuid, newOrderId) {
         var existingOrder, allOrders, duplicateOrder, originalOrderId, updatedOrder;
-        return _regeneratorRuntime().wrap(function _callee11$(_context11) {
-          while (1) switch (_context11.prev = _context11.next) {
+        return _regeneratorRuntime().wrap(function _callee9$(_context9) {
+          while (1) switch (_context9.prev = _context9.next) {
             case 0:
               this.logInfo('Starting replaceOrderIdByUuidAsync', {
                 orderUuid: orderUuid,
                 newOrderId: newOrderId
               });
-              _context11.prev = 1;
-              _context11.next = 4;
+              _context9.prev = 1;
+              _context9.next = 4;
               return this.dbManager.get('order', orderUuid);
             case 4:
-              existingOrder = _context11.sent;
+              existingOrder = _context9.sent;
               if (existingOrder) {
-                _context11.next = 8;
+                _context9.next = 8;
                 break;
               }
               this.logWarning('Order not found for UUID replacement', {
                 orderUuid: orderUuid
               });
-              return _context11.abrupt("return", null);
+              return _context9.abrupt("return", null);
             case 8:
-              _context11.next = 10;
+              _context9.next = 10;
               return this.dbManager.getAll('order');
             case 10:
-              allOrders = _context11.sent;
+              allOrders = _context9.sent;
               duplicateOrder = allOrders.find(function (order) {
                 return String(order.order_id) === String(newOrderId) && order.uuid !== orderUuid;
               });
               if (!duplicateOrder) {
-                _context11.next = 15;
+                _context9.next = 15;
                 break;
               }
               this.logWarning('New order ID already exists', {
@@ -991,13 +755,13 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                   updated_at: new Date().toISOString()
                 })
               }); // 更新到数据库
-              _context11.next = 19;
+              _context9.next = 19;
               return this.dbManager.update('order', updatedOrder);
             case 19:
-              _context11.next = 21;
+              _context9.next = 21;
               return this.core.effects.emit("".concat(this.name, ":onOrderUpdated"), updatedOrder);
             case 21:
-              _context11.next = 23;
+              _context9.next = 23;
               return this.core.effects.emit("".concat(this.name, ":onOrderChanged"), {
                 action: 'order_id_replaced',
                 order: updatedOrder,
@@ -1013,23 +777,24 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                 originalOrderId: originalOrderId,
                 newOrderId: newOrderId
               });
-              return _context11.abrupt("return", updatedOrder);
-            case 27:
-              _context11.prev = 27;
-              _context11.t0 = _context11["catch"](1);
-              console.error('[PaymentModule] 替换订单ID失败', _context11.t0);
-              this.logError('replaceOrderIdByUuidAsync failed', _context11.t0, {
+              console.log("[PaymentModule] \u8BA2\u5355ID\u66FF\u6362\u6210\u529F: ".concat(originalOrderId, " \u2192 ").concat(newOrderId));
+              return _context9.abrupt("return", updatedOrder);
+            case 28:
+              _context9.prev = 28;
+              _context9.t0 = _context9["catch"](1);
+              console.error('[PaymentModule] 替换订单ID失败', _context9.t0);
+              this.logError('replaceOrderIdByUuidAsync failed', _context9.t0, {
                 orderUuid: orderUuid,
                 newOrderId: newOrderId
               });
-              throw _context11.t0;
-            case 32:
+              throw _context9.t0;
+            case 33:
             case "end":
-              return _context11.stop();
+              return _context9.stop();
           }
-        }, _callee11, this, [[1, 27]]);
+        }, _callee9, this, [[1, 28]]);
       }));
-      function replaceOrderIdByUuidAsync(_x11, _x12) {
+      function replaceOrderIdByUuidAsync(_x9, _x10) {
         return _replaceOrderIdByUuidAsync.apply(this, arguments);
       }
       return replaceOrderIdByUuidAsync;
@@ -1045,42 +810,42 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getPaymentItemsAsync",
     value: (function () {
-      var _getPaymentItemsAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12(orderUuid) {
+      var _getPaymentItemsAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(orderUuid) {
         var includeVoided,
           order,
           allPayments,
-          _args12 = arguments;
-        return _regeneratorRuntime().wrap(function _callee12$(_context12) {
-          while (1) switch (_context12.prev = _context12.next) {
+          _args10 = arguments;
+        return _regeneratorRuntime().wrap(function _callee10$(_context10) {
+          while (1) switch (_context10.prev = _context10.next) {
             case 0:
-              includeVoided = _args12.length > 1 && _args12[1] !== undefined ? _args12[1] : false;
+              includeVoided = _args10.length > 1 && _args10[1] !== undefined ? _args10[1] : false;
               if (orderUuid) {
-                _context12.next = 3;
+                _context10.next = 3;
                 break;
               }
               throw new Error('orderUuid is required');
             case 3:
-              _context12.next = 5;
+              _context10.next = 5;
               return this.getPaymentOrderByUuidAsync(orderUuid);
             case 5:
-              order = _context12.sent;
+              order = _context10.sent;
               allPayments = (order === null || order === void 0 ? void 0 : order.payment) || [];
               if (!includeVoided) {
-                _context12.next = 9;
+                _context10.next = 9;
                 break;
               }
-              return _context12.abrupt("return", allPayments);
+              return _context10.abrupt("return", allPayments);
             case 9:
-              return _context12.abrupt("return", allPayments.filter(function (payment) {
+              return _context10.abrupt("return", allPayments.filter(function (payment) {
                 return payment.status !== 'voided';
               }));
             case 10:
             case "end":
-              return _context12.stop();
+              return _context10.stop();
           }
-        }, _callee12, this);
+        }, _callee10, this);
       }));
-      function getPaymentItemsAsync(_x13) {
+      function getPaymentItemsAsync(_x11) {
         return _getPaymentItemsAsync.apply(this, arguments);
       }
       return getPaymentItemsAsync;
@@ -1095,18 +860,18 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getAllPaymentItemsAsync",
     value: (function () {
-      var _getAllPaymentItemsAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13(orderUuid) {
-        return _regeneratorRuntime().wrap(function _callee13$(_context13) {
-          while (1) switch (_context13.prev = _context13.next) {
+      var _getAllPaymentItemsAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11(orderUuid) {
+        return _regeneratorRuntime().wrap(function _callee11$(_context11) {
+          while (1) switch (_context11.prev = _context11.next) {
             case 0:
-              return _context13.abrupt("return", this.getPaymentItemsAsync(orderUuid, true));
+              return _context11.abrupt("return", this.getPaymentItemsAsync(orderUuid, true));
             case 1:
             case "end":
-              return _context13.stop();
+              return _context11.stop();
           }
-        }, _callee13, this);
+        }, _callee11, this);
       }));
-      function getAllPaymentItemsAsync(_x14) {
+      function getAllPaymentItemsAsync(_x12) {
         return _getAllPaymentItemsAsync.apply(this, arguments);
       }
       return getAllPaymentItemsAsync;
@@ -1118,10 +883,10 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "addPaymentItemAsync",
     value: (function () {
-      var _addPaymentItemAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14(orderUuid, paymentItem) {
+      var _addPaymentItemAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12(orderUuid, paymentItem) {
         var _paymentItem$metadata, _newPaymentItem$metad, _newPaymentItem$metad2, _newPaymentItem$metad3, order, expectAmount, paidDepositAmount, expectedDepositAmount, warningMessage, paymentUuid, currentTime, newPaymentItem;
-        return _regeneratorRuntime().wrap(function _callee14$(_context14) {
-          while (1) switch (_context14.prev = _context14.next) {
+        return _regeneratorRuntime().wrap(function _callee12$(_context12) {
+          while (1) switch (_context12.prev = _context12.next) {
             case 0:
               this.logInfo('Starting addPaymentItemAsync', {
                 orderUuid: orderUuid,
@@ -1129,20 +894,20 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                 paymentCode: paymentItem.code,
                 orderPaymentType: paymentItem.order_payment_type
               });
-              _context14.prev = 1;
+              _context12.prev = 1;
               this.logInfo('准备获取订单', {
                 orderUuid: orderUuid
               });
-              _context14.next = 5;
+              _context12.next = 5;
               return this.getPaymentOrderByUuidAsync(orderUuid);
             case 5:
-              order = _context14.sent;
+              order = _context12.sent;
               this.logInfo('获取订单信息成功', {
                 orderUuid: orderUuid,
                 order: order
               });
               if (order) {
-                _context14.next = 9;
+                _context12.next = 9;
                 break;
               }
               throw new Error("Order not found: ".concat(orderUuid));
@@ -1157,7 +922,7 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
               }, new Decimal(0));
               expectedDepositAmount = new Decimal(order.deposit_amount || '0').sub(paidDepositAmount); // 有一种特殊情况,订单金额为 0，但是定金金额>0，且此时是定金状态的，允许添加支付项
               if (!(expectAmount.lte(0) && expectedDepositAmount.eq(0))) {
-                _context14.next = 17;
+                _context12.next = 17;
                 break;
               }
               warningMessage = "\u8BA2\u5355 ".concat(orderUuid, " \u5F85\u4ED8\u91D1\u989D\u5DF2\u4E3A0\uFF0C\u4E0D\u5141\u8BB8\u6DFB\u52A0\u65B0\u7684\u652F\u4ED8\u9879");
@@ -1183,12 +948,14 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
               currentTime = formatDateTime(new Date());
               newPaymentItem = {
                 uuid: paymentUuid,
-                custom_payment_id: paymentItem.custom_payment_id || 0,
+                custom_payment_id: normalizeCustomPaymentId(paymentItem),
                 name: paymentItem.name,
                 code: paymentItem.code,
                 type: paymentItem.type,
                 amount: formatAmount(paymentItem.amount),
                 voucher_id: paymentItem.voucher_id || '',
+                wallet_pass_usage_unit: paymentItem.wallet_pass_usage_unit,
+                wallet_pass_use_value: paymentItem.wallet_pass_use_value,
                 rounding_amount: paymentItem.rounding_amount || '0.00',
                 service_charge: paymentItem.service_charge,
                 status: 'active',
@@ -1199,8 +966,6 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                 // 创建时间
                 updated_at: currentTime,
                 // 更新时间
-                wallet_pass_usage_unit: paymentItem === null || paymentItem === void 0 ? void 0 : paymentItem.wallet_pass_usage_unit,
-                wallet_pass_use_value: paymentItem === null || paymentItem === void 0 ? void 0 : paymentItem.wallet_pass_use_value,
                 metadata: _objectSpread(_objectSpread({}, paymentItem.metadata), {}, {
                   // 保留传入的所有 metadata 字段
                   unique_payment_number: paymentUuid // 设置唯一支付号为支付项的 uuid
@@ -1212,7 +977,7 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                 orderUuid: orderUuid,
                 order: order
               });
-              _context14.next = 25;
+              _context12.next = 25;
               return this.dbManager.update('order', order, true);
             case 25:
               this.logInfo('更新订单支付项完成', {
@@ -1235,24 +1000,24 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                 actualPaidAmount: (_newPaymentItem$metad2 = newPaymentItem.metadata) === null || _newPaymentItem$metad2 === void 0 ? void 0 : _newPaymentItem$metad2.actual_paid_amount,
                 changeGivenAmount: (_newPaymentItem$metad3 = newPaymentItem.metadata) === null || _newPaymentItem$metad3 === void 0 ? void 0 : _newPaymentItem$metad3.change_given_amount
               });
-              _context14.next = 35;
+              _context12.next = 35;
               break;
             case 30:
-              _context14.prev = 30;
-              _context14.t0 = _context14["catch"](1);
-              console.error('[PaymentModule] 添加支付项失败', _context14.t0);
-              this.logError('addPaymentItemAsync failed', _context14.t0, {
+              _context12.prev = 30;
+              _context12.t0 = _context12["catch"](1);
+              console.error('[PaymentModule] 添加支付项失败', _context12.t0);
+              this.logError('addPaymentItemAsync failed', _context12.t0, {
                 orderUuid: orderUuid,
                 paymentItem: paymentItem
               });
-              throw _context14.t0;
+              throw _context12.t0;
             case 35:
             case "end":
-              return _context14.stop();
+              return _context12.stop();
           }
-        }, _callee14, this, [[1, 30]]);
+        }, _callee12, this, [[1, 30]]);
       }));
-      function addPaymentItemAsync(_x15, _x16) {
+      function addPaymentItemAsync(_x13, _x14) {
         return _addPaymentItemAsync.apply(this, arguments);
       }
       return addPaymentItemAsync;
@@ -1264,22 +1029,22 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "deletePaymentAsync",
     value: (function () {
-      var _deletePaymentAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee15(orderUuid, paymentUuid) {
+      var _deletePaymentAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13(orderUuid, paymentUuid) {
         var order, paymentItem;
-        return _regeneratorRuntime().wrap(function _callee15$(_context15) {
-          while (1) switch (_context15.prev = _context15.next) {
+        return _regeneratorRuntime().wrap(function _callee13$(_context13) {
+          while (1) switch (_context13.prev = _context13.next) {
             case 0:
               this.logInfo('Starting deletePaymentAsync (mark as voided)', {
                 orderUuid: orderUuid,
                 paymentUuid: paymentUuid
               });
-              _context15.prev = 1;
-              _context15.next = 4;
+              _context13.prev = 1;
+              _context13.next = 4;
               return this.dbManager.get('order', orderUuid);
             case 4:
-              order = _context15.sent;
+              order = _context13.sent;
               if (order) {
-                _context15.next = 7;
+                _context13.next = 7;
                 break;
               }
               throw new Error('订单不存在');
@@ -1288,67 +1053,73 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                 return payment.uuid === paymentUuid;
               });
               if (paymentItem) {
-                _context15.next = 10;
+                _context13.next = 10;
                 break;
               }
               throw new Error("\u652F\u4ED8\u9879\u4E0D\u5B58\u5728: ".concat(paymentUuid));
             case 10:
               if (!(paymentItem.status === 'voided')) {
-                _context15.next = 13;
+                _context13.next = 13;
                 break;
               }
               console.warn("[PaymentModule] \u652F\u4ED8\u9879 ".concat(paymentUuid, " \u5DF2\u7ECF\u88AB\u5220\u9664\uFF0C\u8DF3\u8FC7\u64CD\u4F5C"));
-              return _context15.abrupt("return");
+              return _context13.abrupt("return");
             case 13:
               // 标记删除而不是物理删除
               paymentItem.status = 'voided';
               paymentItem.origin_amount = paymentItem.amount; // 保存原始金额
               paymentItem.amount = '0.00'; // 将金额设为0，不参与订单金额计算
 
+              console.log("[PaymentModule] \u652F\u4ED8\u9879\u6807\u8BB0\u4E3A\u5220\u9664:", {
+                uuid: paymentItem.uuid,
+                originalAmount: paymentItem.origin_amount,
+                status: paymentItem.status
+              });
+
               // 重新计算待付金额
               this.recalculateOrderAmount(order);
 
               // 更新到 IndexDB
-              _context15.next = 19;
+              _context13.next = 20;
               return this.dbManager.update('order', order);
-            case 19:
-              _context15.next = 21;
+            case 20:
+              _context13.next = 22;
               return this.core.effects.emit("".concat(this.name, ":onPaymentDeleted"), {
                 order: order,
                 paymentItem: paymentItem
               });
-            case 21:
-              _context15.next = 23;
+            case 22:
+              _context13.next = 24;
               return this.core.effects.emit("".concat(this.name, ":onOrderChanged"), {
                 action: 'payment_delete',
                 order: order,
                 paymentItem: paymentItem
               });
-            case 23:
+            case 24:
               this.logInfo('deletePaymentAsync completed successfully (marked as voided)', {
                 orderUuid: orderUuid,
                 paymentUuid: paymentUuid,
                 originalAmount: paymentItem.origin_amount,
                 newExpectAmount: order.expect_amount
               });
-              _context15.next = 31;
+              _context13.next = 32;
               break;
-            case 26:
-              _context15.prev = 26;
-              _context15.t0 = _context15["catch"](1);
-              console.error('[PaymentModule] 删除支付项失败', _context15.t0);
-              this.logError('deletePaymentAsync failed', _context15.t0, {
+            case 27:
+              _context13.prev = 27;
+              _context13.t0 = _context13["catch"](1);
+              console.error('[PaymentModule] 删除支付项失败', _context13.t0);
+              this.logError('deletePaymentAsync failed', _context13.t0, {
                 orderUuid: orderUuid,
                 paymentUuid: paymentUuid
               });
-              throw _context15.t0;
-            case 31:
+              throw _context13.t0;
+            case 32:
             case "end":
-              return _context15.stop();
+              return _context13.stop();
           }
-        }, _callee15, this, [[1, 26]]);
+        }, _callee13, this, [[1, 27]]);
       }));
-      function deletePaymentAsync(_x17, _x18) {
+      function deletePaymentAsync(_x15, _x16) {
         return _deletePaymentAsync.apply(this, arguments);
       }
       return deletePaymentAsync;
@@ -1363,15 +1134,15 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "updateVoucherPaymentItemsAsync",
     value: (function () {
-      var _updateVoucherPaymentItemsAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee17(orderUuid, voucherPaymentItems) {
+      var _updateVoucherPaymentItemsAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee15(orderUuid, voucherPaymentItems) {
         var _this5 = this;
-        return _regeneratorRuntime().wrap(function _callee17$(_context17) {
-          while (1) switch (_context17.prev = _context17.next) {
+        return _regeneratorRuntime().wrap(function _callee15$(_context15) {
+          while (1) switch (_context15.prev = _context15.next) {
             case 0:
-              return _context17.abrupt("return", this.runVoucherUpdateLocked(orderUuid, /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16() {
-                var _this5$normalizeVouch, normalizedVoucherItems, originalCount, normalizedCount, order, existingVoucherItems, _iterator6, _step6, voucherItem, orderAfterDelete, existingActiveVoucherKeys, _iterator7, _step7, _voucherItem, orderPaymentType, key, updatedOrder;
-                return _regeneratorRuntime().wrap(function _callee16$(_context16) {
-                  while (1) switch (_context16.prev = _context16.next) {
+              return _context15.abrupt("return", this.runVoucherUpdateLocked(orderUuid, /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14() {
+                var _this5$normalizeVouch, normalizedVoucherItems, originalCount, normalizedCount, order, existingVoucherItems, _iterator2, _step2, voucherItem, orderAfterDelete, existingActiveVoucherKeys, _iterator3, _step3, _voucherItem, orderPaymentType, key, updatedOrder;
+                return _regeneratorRuntime().wrap(function _callee14$(_context14) {
+                  while (1) switch (_context14.prev = _context14.next) {
                     case 0:
                       _this5$normalizeVouch = _this5.normalizeVoucherPaymentItems(voucherPaymentItems), normalizedVoucherItems = _this5$normalizeVouch.items, originalCount = _this5$normalizeVouch.originalCount, normalizedCount = _this5$normalizeVouch.normalizedCount;
                       _this5.logInfo('Starting updateVoucherPaymentItemsAsync', {
@@ -1394,13 +1165,13 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                           normalizedCount: normalizedCount
                         });
                       }
-                      _context16.prev = 3;
-                      _context16.next = 6;
+                      _context14.prev = 3;
+                      _context14.next = 6;
                       return _this5.getPaymentOrderByUuidAsync(orderUuid);
                     case 6:
-                      order = _context16.sent;
+                      order = _context14.sent;
                       if (order) {
-                        _context16.next = 9;
+                        _context14.next = 9;
                         break;
                       }
                       throw new Error("\u8BA2\u5355\u4E0D\u5B58\u5728: ".concat(orderUuid));
@@ -1410,61 +1181,80 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                       existingVoucherItems = order.payment.filter(function (payment) {
                         return payment.voucher_id && payment.status !== 'voided' && !payment.isSynced;
                       });
+                      console.log('[PaymentModule] 发现现有代金券支付项:', {
+                        orderUuid: orderUuid,
+                        existingVoucherCount: existingVoucherItems.length,
+                        existingItems: existingVoucherItems.map(function (item) {
+                          return {
+                            uuid: item.uuid,
+                            code: item.code,
+                            amount: item.amount,
+                            voucher_id: item.voucher_id,
+                            isSynced: item.isSynced
+                          };
+                        })
+                      });
+
                       // 2. 删除所有现有的代金券支付项（仅删除未同步的）
-                      _iterator6 = _createForOfIteratorHelper(existingVoucherItems);
-                      _context16.prev = 11;
-                      _iterator6.s();
-                    case 13:
-                      if ((_step6 = _iterator6.n()).done) {
-                        _context16.next = 19;
+                      _iterator2 = _createForOfIteratorHelper(existingVoucherItems);
+                      _context14.prev = 12;
+                      _iterator2.s();
+                    case 14:
+                      if ((_step2 = _iterator2.n()).done) {
+                        _context14.next = 21;
                         break;
                       }
-                      voucherItem = _step6.value;
-                      _context16.next = 17;
+                      voucherItem = _step2.value;
+                      console.log("[PaymentModule] \u5220\u9664\u73B0\u6709\u4EE3\u91D1\u5238\u652F\u4ED8\u9879: ".concat(voucherItem.uuid));
+                      _context14.next = 19;
                       return _this5.deletePaymentAsync(orderUuid, voucherItem.uuid);
-                    case 17:
-                      _context16.next = 13;
-                      break;
                     case 19:
-                      _context16.next = 24;
+                      _context14.next = 14;
                       break;
                     case 21:
-                      _context16.prev = 21;
-                      _context16.t0 = _context16["catch"](11);
-                      _iterator6.e(_context16.t0);
-                    case 24:
-                      _context16.prev = 24;
-                      _iterator6.f();
-                      return _context16.finish(24);
-                    case 27:
-                      _context16.next = 29;
-                      return _this5.getPaymentOrderByUuidAsync(orderUuid);
+                      _context14.next = 26;
+                      break;
+                    case 23:
+                      _context14.prev = 23;
+                      _context14.t0 = _context14["catch"](12);
+                      _iterator2.e(_context14.t0);
+                    case 26:
+                      _context14.prev = 26;
+                      _iterator2.f();
+                      return _context14.finish(26);
                     case 29:
-                      orderAfterDelete = _context16.sent;
+                      _context14.next = 31;
+                      return _this5.getPaymentOrderByUuidAsync(orderUuid);
+                    case 31:
+                      orderAfterDelete = _context14.sent;
                       if (orderAfterDelete) {
-                        _context16.next = 32;
+                        _context14.next = 34;
                         break;
                       }
                       throw new Error("\u8BA2\u5355\u4E0D\u5B58\u5728: ".concat(orderUuid));
-                    case 32:
+                    case 34:
                       existingActiveVoucherKeys = new Set(orderAfterDelete.payment.filter(function (p) {
                         return p.voucher_id && p.status !== 'voided' && !p.isSynced;
                       }).map(function (p) {
                         return "".concat(p.voucher_id, "|").concat(p.order_payment_type || 'normal');
                       }));
-                      _iterator7 = _createForOfIteratorHelper(normalizedVoucherItems);
-                      _context16.prev = 34;
-                      _iterator7.s();
-                    case 36:
-                      if ((_step7 = _iterator7.n()).done) {
-                        _context16.next = 48;
+                      console.log('[PaymentModule] 添加新的代金券支付项:', {
+                        orderUuid: orderUuid,
+                        newItemCount: normalizedVoucherItems.length
+                      });
+                      _iterator3 = _createForOfIteratorHelper(normalizedVoucherItems);
+                      _context14.prev = 37;
+                      _iterator3.s();
+                    case 39:
+                      if ((_step3 = _iterator3.n()).done) {
+                        _context14.next = 52;
                         break;
                       }
-                      _voucherItem = _step7.value;
+                      _voucherItem = _step3.value;
                       orderPaymentType = _voucherItem.order_payment_type || 'normal';
                       key = "".concat(_voucherItem.voucher_id, "|").concat(orderPaymentType);
                       if (!existingActiveVoucherKeys.has(key)) {
-                        _context16.next = 43;
+                        _context14.next = 46;
                         break;
                       }
                       console.warn('[PaymentModule] Skip adding voucher payment item because it already exists (active)', {
@@ -1472,68 +1262,74 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                         voucher_id: _voucherItem.voucher_id,
                         order_payment_type: orderPaymentType
                       });
-                      return _context16.abrupt("continue", 46);
-                    case 43:
-                      _context16.next = 45;
+                      return _context14.abrupt("continue", 50);
+                    case 46:
+                      console.log("[PaymentModule] \u6DFB\u52A0\u4EE3\u91D1\u5238\u652F\u4ED8\u9879:", _objectSpread(_objectSpread({}, _voucherItem), {}, {
+                        code: _voucherItem.code,
+                        amount: _voucherItem.amount,
+                        voucher_id: _voucherItem.voucher_id,
+                        order_payment_type: orderPaymentType
+                      }));
+                      _context14.next = 49;
                       return _this5.addPaymentItemAsync(orderUuid, _voucherItem);
-                    case 45:
+                    case 49:
                       existingActiveVoucherKeys.add(key);
-                    case 46:
-                      _context16.next = 36;
+                    case 50:
+                      _context14.next = 39;
                       break;
-                    case 48:
-                      _context16.next = 53;
+                    case 52:
+                      _context14.next = 57;
                       break;
-                    case 50:
-                      _context16.prev = 50;
-                      _context16.t1 = _context16["catch"](34);
-                      _iterator7.e(_context16.t1);
-                    case 53:
-                      _context16.prev = 53;
-                      _iterator7.f();
-                      return _context16.finish(53);
-                    case 56:
-                      _context16.next = 58;
+                    case 54:
+                      _context14.prev = 54;
+                      _context14.t1 = _context14["catch"](37);
+                      _iterator3.e(_context14.t1);
+                    case 57:
+                      _context14.prev = 57;
+                      _iterator3.f();
+                      return _context14.finish(57);
+                    case 60:
+                      _context14.next = 62;
                       return _this5.getPaymentOrderByUuidAsync(orderUuid);
-                    case 58:
-                      updatedOrder = _context16.sent;
-                      _context16.next = 61;
+                    case 62:
+                      updatedOrder = _context14.sent;
+                      _context14.next = 65;
                       return _this5.core.effects.emit("".concat(_this5.name, ":onPaymentAdded"), {
                         orderUuid: orderUuid,
                         order: updatedOrder,
                         payment: null // 批量操作不提供单个支付项
                       });
-                    case 61:
+                    case 65:
                       _this5.logInfo('updateVoucherPaymentItemsAsync completed successfully', {
                         orderUuid: orderUuid,
                         removedVoucherCount: existingVoucherItems.length,
                         addedVoucherCount: normalizedVoucherItems.length,
                         finalExpectAmount: updatedOrder === null || updatedOrder === void 0 ? void 0 : updatedOrder.expect_amount
                       });
-                      _context16.next = 69;
+                      _context14.next = 73;
                       break;
-                    case 64:
-                      _context16.prev = 64;
-                      _context16.t2 = _context16["catch"](3);
-                      console.error('[PaymentModule] 批量更新代金券支付项失败:', _context16.t2);
-                      _this5.logError('updateVoucherPaymentItemsAsync failed', _context16.t2, {
+                    case 68:
+                      _context14.prev = 68;
+                      _context14.t2 = _context14["catch"](3);
+                      console.error('[PaymentModule] 批量更新代金券支付项失败:', _context14.t2);
+                      _this5.logError('updateVoucherPaymentItemsAsync failed', _context14.t2, {
                         orderUuid: orderUuid,
                         voucherPaymentItems: voucherPaymentItems
                       });
-                      throw _context16.t2;
-                    case 69:
+                      throw _context14.t2;
+                    case 73:
                     case "end":
-                      return _context16.stop();
+                      return _context14.stop();
                   }
-                }, _callee16, null, [[3, 64], [11, 21, 24, 27], [34, 50, 53, 56]]);
+                }, _callee14, null, [[3, 68], [12, 23, 26, 29], [37, 54, 57, 60]]);
               }))));
             case 1:
             case "end":
-              return _context17.stop();
+              return _context15.stop();
           }
-        }, _callee17, this);
+        }, _callee15, this);
       }));
-      function updateVoucherPaymentItemsAsync(_x19, _x20) {
+      function updateVoucherPaymentItemsAsync(_x17, _x18) {
         return _updateVoucherPaymentItemsAsync.apply(this, arguments);
       }
       return updateVoucherPaymentItemsAsync;
@@ -1545,18 +1341,18 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "updatePaymentAsync",
     value: (function () {
-      var _updatePaymentAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18(orderUuid, paymentUuid, params) {
+      var _updatePaymentAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16(orderUuid, paymentUuid, params) {
         var order, paymentItem, formattedParams;
-        return _regeneratorRuntime().wrap(function _callee18$(_context18) {
-          while (1) switch (_context18.prev = _context18.next) {
+        return _regeneratorRuntime().wrap(function _callee16$(_context16) {
+          while (1) switch (_context16.prev = _context16.next) {
             case 0:
-              _context18.prev = 0;
-              _context18.next = 3;
+              _context16.prev = 0;
+              _context16.next = 3;
               return this.dbManager.get('order', orderUuid);
             case 3:
-              order = _context18.sent;
+              order = _context16.sent;
               if (order) {
-                _context18.next = 6;
+                _context16.next = 6;
                 break;
               }
               throw new Error('订单不存在');
@@ -1565,7 +1361,7 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                 return payment.uuid === paymentUuid;
               });
               if (!paymentItem) {
-                _context18.next = 18;
+                _context16.next = 18;
                 break;
               }
               // 如果更新参数中包含 amount，先格式化
@@ -1579,36 +1375,36 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
               this.recalculateOrderAmount(order);
 
               // 更新到 IndexDB
-              _context18.next = 14;
+              _context16.next = 14;
               return this.dbManager.update('order', order);
             case 14:
-              _context18.next = 16;
+              _context16.next = 16;
               return this.core.effects.emit("".concat(this.name, ":onPaymentUpdated"), {
                 order: order,
                 paymentItem: paymentItem
               });
             case 16:
-              _context18.next = 18;
+              _context16.next = 18;
               return this.core.effects.emit("".concat(this.name, ":onOrderChanged"), {
                 action: 'payment_update',
                 order: order,
                 paymentItem: paymentItem
               });
             case 18:
-              _context18.next = 24;
+              _context16.next = 24;
               break;
             case 20:
-              _context18.prev = 20;
-              _context18.t0 = _context18["catch"](0);
-              console.error('[PaymentModule] 更新支付项失败', _context18.t0);
-              throw _context18.t0;
+              _context16.prev = 20;
+              _context16.t0 = _context16["catch"](0);
+              console.error('[PaymentModule] 更新支付项失败', _context16.t0);
+              throw _context16.t0;
             case 24:
             case "end":
-              return _context18.stop();
+              return _context16.stop();
           }
-        }, _callee18, this, [[0, 20]]);
+        }, _callee16, this, [[0, 20]]);
       }));
-      function updatePaymentAsync(_x21, _x22, _x23) {
+      function updatePaymentAsync(_x19, _x20, _x21) {
         return _updatePaymentAsync.apply(this, arguments);
       }
       return updatePaymentAsync;
@@ -1620,61 +1416,61 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "submitPayAsync",
     value: (function () {
-      var _submitPayAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee19(orderUuid) {
-        var orderToSubmit, order, allOrders, _iterator8, _step8, _order, result;
-        return _regeneratorRuntime().wrap(function _callee19$(_context19) {
-          while (1) switch (_context19.prev = _context19.next) {
+      var _submitPayAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee17(orderUuid) {
+        var orderToSubmit, order, allOrders, _iterator4, _step4, _order, result;
+        return _regeneratorRuntime().wrap(function _callee17$(_context17) {
+          while (1) switch (_context17.prev = _context17.next) {
             case 0:
               this.logInfo('Starting submitPayAsync', {
                 orderUuid: orderUuid
               });
-              _context19.prev = 1;
+              _context17.prev = 1;
               if (!orderUuid) {
-                _context19.next = 9;
+                _context17.next = 9;
                 break;
               }
-              _context19.next = 5;
+              _context17.next = 5;
               return this.dbManager.get('order', orderUuid);
             case 5:
-              order = _context19.sent;
+              order = _context17.sent;
               orderToSubmit = order ? [order] : [];
-              _context19.next = 13;
+              _context17.next = 13;
               break;
             case 9:
-              _context19.next = 11;
+              _context17.next = 11;
               return this.dbManager.getAll('order');
             case 11:
-              allOrders = _context19.sent;
+              allOrders = _context17.sent;
               // 包括正在处理中的订单和部分支付的订单（可能添加了新的支付项）
               orderToSubmit = allOrders.filter(function (order) {
                 return order.payment_status === PaymentStatus.Processing || order.payment_status === PaymentStatus.PartiallyPaid;
               });
             case 13:
-              _iterator8 = _createForOfIteratorHelper(orderToSubmit);
-              _context19.prev = 14;
-              _iterator8.s();
+              _iterator4 = _createForOfIteratorHelper(orderToSubmit);
+              _context17.prev = 14;
+              _iterator4.s();
             case 16:
-              if ((_step8 = _iterator8.n()).done) {
-                _context19.next = 22;
+              if ((_step4 = _iterator4.n()).done) {
+                _context17.next = 22;
                 break;
               }
-              _order = _step8.value;
-              _context19.next = 20;
+              _order = _step4.value;
+              _context17.next = 20;
               return this.submitSingleOrderPayment(_order);
             case 20:
-              _context19.next = 16;
+              _context17.next = 16;
               break;
             case 22:
-              _context19.next = 27;
+              _context17.next = 27;
               break;
             case 24:
-              _context19.prev = 24;
-              _context19.t0 = _context19["catch"](14);
-              _iterator8.e(_context19.t0);
+              _context17.prev = 24;
+              _context17.t0 = _context17["catch"](14);
+              _iterator4.e(_context17.t0);
             case 27:
-              _context19.prev = 27;
-              _iterator8.f();
-              return _context19.finish(27);
+              _context17.prev = 27;
+              _iterator4.f();
+              return _context17.finish(27);
             case 30:
               result = {
                 status: 'success'
@@ -1683,24 +1479,24 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                 result: result.status,
                 processedOrdersCount: orderToSubmit.length
               });
-              return _context19.abrupt("return", result);
+              return _context17.abrupt("return", result);
             case 35:
-              _context19.prev = 35;
-              _context19.t1 = _context19["catch"](1);
-              console.error('[PaymentModule] 提交支付失败', _context19.t1);
-              this.logError('submitPayAsync failed', _context19.t1, {
+              _context17.prev = 35;
+              _context17.t1 = _context17["catch"](1);
+              console.error('[PaymentModule] 提交支付失败', _context17.t1);
+              this.logError('submitPayAsync failed', _context17.t1, {
                 orderUuid: orderUuid
               });
-              return _context19.abrupt("return", {
+              return _context17.abrupt("return", {
                 status: 'failed'
               });
             case 40:
             case "end":
-              return _context19.stop();
+              return _context17.stop();
           }
-        }, _callee19, this, [[1, 35], [14, 24, 27, 30]]);
+        }, _callee17, this, [[1, 35], [14, 24, 27, 30]]);
       }));
-      function submitPayAsync(_x24) {
+      function submitPayAsync(_x22) {
         return _submitPayAsync.apply(this, arguments);
       }
       return submitPayAsync;
@@ -1712,12 +1508,12 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "submitSingleOrderPayment",
     value: (function () {
-      var _submitSingleOrderPayment = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee20(order) {
+      var _submitSingleOrderPayment = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18(order) {
         var paymentData, totalPaidAmount, orderTotalAmount;
-        return _regeneratorRuntime().wrap(function _callee20$(_context20) {
-          while (1) switch (_context20.prev = _context20.next) {
+        return _regeneratorRuntime().wrap(function _callee18$(_context18) {
+          while (1) switch (_context18.prev = _context18.next) {
             case 0:
-              _context20.prev = 0;
+              _context18.prev = 0;
               paymentData = {
                 payments: order.payment.map(function (payment) {
                   return {
@@ -1742,51 +1538,54 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
               if (totalPaidAmount.gte(orderTotalAmount)) {
                 // 支付金额足够，标记为已完成
                 order.payment_status = PaymentStatus.Finished;
+                console.log("[PaymentModule] \u8BA2\u5355 ".concat(order.uuid, " \u652F\u4ED8\u5B8C\u6210\uFF0C\u91D1\u989D: ").concat(totalPaidAmount.toString(), "/").concat(orderTotalAmount.toString()));
               } else {
                 // 支付金额不足，标记为部分支付
                 order.payment_status = PaymentStatus.PartiallyPaid;
+                console.log("[PaymentModule] \u8BA2\u5355 ".concat(order.uuid, " \u90E8\u5206\u652F\u4ED8\uFF0C\u91D1\u989D: ").concat(totalPaidAmount.toString(), "/").concat(orderTotalAmount.toString()));
               }
 
               // 给后端标记一下是全部支付（paid）还是部分支付
               paymentData.payment_status = order.payment_status === PaymentStatus.Finished ? 'paid' : 'partially_paid';
 
               // 更新订单状态到数据库
-              _context20.next = 8;
+              _context18.next = 8;
               return this.dbManager.update('order', order);
             case 8:
               if (!(paymentData.payments.length === 0)) {
-                _context20.next = 11;
+                _context18.next = 12;
                 break;
               }
+              console.log("[PaymentModule] \u8BA2\u5355 ".concat(order.uuid, " \u652F\u4ED8\u5217\u8868\u4E3A\u7A7A\uFF0C\u8DF3\u8FC7\u652F\u4ED8\u5904\u7406"));
               this.logWarning('Empty payment list', {
                 orderUuid: order.uuid,
                 orderId: order.order_id
               });
-              return _context20.abrupt("return");
-            case 11:
-              _context20.next = 13;
+              return _context18.abrupt("return");
+            case 12:
+              _context18.next = 14;
               return this.core.effects.emit("".concat(this.name, ":onPaymentSubmitted"), order);
-            case 13:
-              _context20.next = 15;
+            case 14:
+              _context18.next = 16;
               return this.core.effects.emit("".concat(this.name, ":onOrderChanged"), {
                 action: 'submit',
                 order: order
               });
-            case 15:
-              _context20.next = 21;
+            case 16:
+              _context18.next = 22;
               break;
-            case 17:
-              _context20.prev = 17;
-              _context20.t0 = _context20["catch"](0);
-              console.error("[PaymentModule] \u8BA2\u5355 ".concat(order.uuid, " \u652F\u4ED8\u63D0\u4EA4\u5931\u8D25"), _context20.t0);
-              throw _context20.t0;
-            case 21:
+            case 18:
+              _context18.prev = 18;
+              _context18.t0 = _context18["catch"](0);
+              console.error("[PaymentModule] \u8BA2\u5355 ".concat(order.uuid, " \u652F\u4ED8\u63D0\u4EA4\u5931\u8D25"), _context18.t0);
+              throw _context18.t0;
+            case 22:
             case "end":
-              return _context20.stop();
+              return _context18.stop();
           }
-        }, _callee20, this, [[0, 17]]);
+        }, _callee18, this, [[0, 18]]);
       }));
-      function submitSingleOrderPayment(_x25) {
+      function submitSingleOrderPayment(_x23) {
         return _submitSingleOrderPayment.apply(this, arguments);
       }
       return submitSingleOrderPayment;
@@ -1798,29 +1597,29 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getRemainingOrderAmountAsync",
     value: (function () {
-      var _getRemainingOrderAmountAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee21(orderUuid) {
+      var _getRemainingOrderAmountAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee19(orderUuid) {
         var order;
-        return _regeneratorRuntime().wrap(function _callee21$(_context21) {
-          while (1) switch (_context21.prev = _context21.next) {
+        return _regeneratorRuntime().wrap(function _callee19$(_context19) {
+          while (1) switch (_context19.prev = _context19.next) {
             case 0:
-              _context21.next = 2;
+              _context19.next = 2;
               return this.getPaymentOrderByUuidAsync(orderUuid);
             case 2:
-              order = _context21.sent;
+              order = _context19.sent;
               if (order) {
-                _context21.next = 5;
+                _context19.next = 5;
                 break;
               }
               throw new Error('订单不存在');
             case 5:
-              return _context21.abrupt("return", new Decimal(order.expect_amount).toNumber());
+              return _context19.abrupt("return", new Decimal(order.expect_amount).toNumber());
             case 6:
             case "end":
-              return _context21.stop();
+              return _context19.stop();
           }
-        }, _callee21, this);
+        }, _callee19, this);
       }));
-      function getRemainingOrderAmountAsync(_x26) {
+      function getRemainingOrderAmountAsync(_x24) {
         return _getRemainingOrderAmountAsync.apply(this, arguments);
       }
       return getRemainingOrderAmountAsync;
@@ -1832,65 +1631,65 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getRemainingOrderAmountWithInputAsync",
     value: (function () {
-      var _getRemainingOrderAmountWithInputAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee22(inputAmount, orderUuid) {
+      var _getRemainingOrderAmountWithInputAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee20(inputAmount, orderUuid) {
         var order, inputDecimal;
-        return _regeneratorRuntime().wrap(function _callee22$(_context22) {
-          while (1) switch (_context22.prev = _context22.next) {
+        return _regeneratorRuntime().wrap(function _callee20$(_context20) {
+          while (1) switch (_context20.prev = _context20.next) {
             case 0:
-              _context22.next = 2;
+              _context20.next = 2;
               return this.getPaymentOrderByUuidAsync(orderUuid);
             case 2:
-              order = _context22.sent;
+              order = _context20.sent;
               if (order) {
-                _context22.next = 5;
+                _context20.next = 5;
                 break;
               }
               throw new Error('订单不存在');
             case 5:
               if (!(inputAmount === null || inputAmount === undefined)) {
-                _context22.next = 7;
+                _context20.next = 7;
                 break;
               }
-              return _context22.abrupt("return", new Decimal(order.expect_amount).toNumber());
+              return _context20.abrupt("return", new Decimal(order.expect_amount).toNumber());
             case 7:
               if (!(typeof inputAmount === 'string')) {
-                _context22.next = 10;
+                _context20.next = 10;
                 break;
               }
               if (!(inputAmount.trim() === '')) {
-                _context22.next = 10;
+                _context20.next = 10;
                 break;
               }
-              return _context22.abrupt("return", new Decimal(order.expect_amount).toNumber());
+              return _context20.abrupt("return", new Decimal(order.expect_amount).toNumber());
             case 10:
               if (!(typeof inputAmount === 'number')) {
-                _context22.next = 14;
+                _context20.next = 14;
                 break;
               }
               if (!(isNaN(inputAmount) || !isFinite(inputAmount))) {
-                _context22.next = 14;
+                _context20.next = 14;
                 break;
               }
               // 如果输入是 NaN 或无穷大，返回原始的待付金额
               console.warn("[PaymentModule] \u8F93\u5165\u91D1\u989D\u4E0D\u662F\u6709\u6548\u6570\u5B57: ".concat(inputAmount, "\uFF0C\u8FD4\u56DE\u539F\u59CB\u5F85\u4ED8\u91D1\u989D"));
-              return _context22.abrupt("return", new Decimal(order.expect_amount).toNumber());
+              return _context20.abrupt("return", new Decimal(order.expect_amount).toNumber());
             case 14:
-              _context22.prev = 14;
+              _context20.prev = 14;
               inputDecimal = new Decimal(inputAmount);
-              return _context22.abrupt("return", new Decimal(order.expect_amount).minus(inputDecimal).toNumber());
+              return _context20.abrupt("return", new Decimal(order.expect_amount).minus(inputDecimal).toNumber());
             case 19:
-              _context22.prev = 19;
-              _context22.t0 = _context22["catch"](14);
+              _context20.prev = 19;
+              _context20.t0 = _context20["catch"](14);
               // 如果输入不是有效的数字，返回原始的待付金额
               console.warn("[PaymentModule] \u8F93\u5165\u91D1\u989D\u683C\u5F0F\u65E0\u6548: ".concat(inputAmount, "\uFF0C\u8FD4\u56DE\u539F\u59CB\u5F85\u4ED8\u91D1\u989D"));
-              return _context22.abrupt("return", new Decimal(order.expect_amount).toNumber());
+              return _context20.abrupt("return", new Decimal(order.expect_amount).toNumber());
             case 23:
             case "end":
-              return _context22.stop();
+              return _context20.stop();
           }
-        }, _callee22, this, [[14, 19]]);
+        }, _callee20, this, [[14, 19]]);
       }));
-      function getRemainingOrderAmountWithInputAsync(_x27, _x28) {
+      function getRemainingOrderAmountWithInputAsync(_x25, _x26) {
         return _getRemainingOrderAmountWithInputAsync.apply(this, arguments);
       }
       return getRemainingOrderAmountWithInputAsync;
@@ -1926,6 +1725,29 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
       // 如果是定金模式，则使用deposit_amount 去减已付款金额
       var remainingAmount = order.is_deposit === 1 ? new Decimal(order.deposit_amount).minus(paidAmount) : totalAmount.minus(paidAmount);
       order.expect_amount = Decimal.max(0, remainingAmount).toFixed(2);
+      console.log("[PaymentModule] \u91CD\u65B0\u8BA1\u7B97\u8BA2\u5355\u91D1\u989D:", {
+        orderUuid: order.uuid,
+        totalAmount: order.total_amount,
+        effectivePaidAmount: paidAmount.toFixed(2),
+        remainingAmount: order.expect_amount,
+        activePayments: order.payment.filter(function (p) {
+          return p.status !== 'voided';
+        }).length,
+        voidedPayments: order.payment.filter(function (p) {
+          return p.status === 'voided';
+        }).length,
+        paymentDetails: order.payment.filter(function (p) {
+          return p.status !== 'voided';
+        }).map(function (p) {
+          return {
+            code: p.code,
+            amount: p.amount,
+            rounding_amount: p.rounding_amount || '0.00',
+            effective_amount: new Decimal(p.amount || 0).minus(new Decimal(p.rounding_amount || 0)).toFixed(2)
+          };
+        }),
+        说明: '有效支付金额包含抹零计算（amount + |rounding_amount|）'
+      });
     }
 
     /**
@@ -1934,29 +1756,29 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getCashPaymentMethod",
     value: (function () {
-      var _getCashPaymentMethod = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee23() {
+      var _getCashPaymentMethod = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee21() {
         var payMethods;
-        return _regeneratorRuntime().wrap(function _callee23$(_context23) {
-          while (1) switch (_context23.prev = _context23.next) {
+        return _regeneratorRuntime().wrap(function _callee21$(_context21) {
+          while (1) switch (_context21.prev = _context21.next) {
             case 0:
-              _context23.prev = 0;
-              _context23.next = 3;
+              _context21.prev = 0;
+              _context21.next = 3;
               return this.dbManager.getAll('pay_method');
             case 3:
-              payMethods = _context23.sent;
-              return _context23.abrupt("return", payMethods.find(function (method) {
+              payMethods = _context21.sent;
+              return _context21.abrupt("return", payMethods.find(function (method) {
                 return method.code === PaymentMethodType.Cash;
               }) || null);
             case 7:
-              _context23.prev = 7;
-              _context23.t0 = _context23["catch"](0);
-              console.error('[PaymentModule] 获取现金支付方式失败', _context23.t0);
-              return _context23.abrupt("return", null);
+              _context21.prev = 7;
+              _context21.t0 = _context21["catch"](0);
+              console.error('[PaymentModule] 获取现金支付方式失败', _context21.t0);
+              return _context21.abrupt("return", null);
             case 11:
             case "end":
-              return _context23.stop();
+              return _context21.stop();
           }
-        }, _callee23, this, [[0, 7]]);
+        }, _callee21, this, [[0, 7]]);
       }));
       function getCashPaymentMethod() {
         return _getCashPaymentMethod.apply(this, arguments);
@@ -1970,29 +1792,29 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getEftposPaymentMethod",
     value: (function () {
-      var _getEftposPaymentMethod = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee24() {
+      var _getEftposPaymentMethod = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee22() {
         var payMethods;
-        return _regeneratorRuntime().wrap(function _callee24$(_context24) {
-          while (1) switch (_context24.prev = _context24.next) {
+        return _regeneratorRuntime().wrap(function _callee22$(_context22) {
+          while (1) switch (_context22.prev = _context22.next) {
             case 0:
-              _context24.prev = 0;
-              _context24.next = 3;
+              _context22.prev = 0;
+              _context22.next = 3;
               return this.dbManager.getAll('pay_method');
             case 3:
-              payMethods = _context24.sent;
-              return _context24.abrupt("return", payMethods.find(function (method) {
+              payMethods = _context22.sent;
+              return _context22.abrupt("return", payMethods.find(function (method) {
                 return method.code === PaymentMethodType.Eftpos;
               }) || null);
             case 7:
-              _context24.prev = 7;
-              _context24.t0 = _context24["catch"](0);
-              console.error('[PaymentModule] 获取Eftpos支付方式失败', _context24.t0);
-              return _context24.abrupt("return", null);
+              _context22.prev = 7;
+              _context22.t0 = _context22["catch"](0);
+              console.error('[PaymentModule] 获取Eftpos支付方式失败', _context22.t0);
+              return _context22.abrupt("return", null);
             case 11:
             case "end":
-              return _context24.stop();
+              return _context22.stop();
           }
-        }, _callee24, this, [[0, 7]]);
+        }, _callee22, this, [[0, 7]]);
       }));
       function getEftposPaymentMethod() {
         return _getEftposPaymentMethod.apply(this, arguments);
@@ -2006,29 +1828,29 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getWalletPaymentMethod",
     value: (function () {
-      var _getWalletPaymentMethod = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee25() {
+      var _getWalletPaymentMethod = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee23() {
         var payMethods;
-        return _regeneratorRuntime().wrap(function _callee25$(_context25) {
-          while (1) switch (_context25.prev = _context25.next) {
+        return _regeneratorRuntime().wrap(function _callee23$(_context23) {
+          while (1) switch (_context23.prev = _context23.next) {
             case 0:
-              _context25.prev = 0;
-              _context25.next = 3;
+              _context23.prev = 0;
+              _context23.next = 3;
               return this.dbManager.getAll('pay_method');
             case 3:
-              payMethods = _context25.sent;
-              return _context25.abrupt("return", payMethods.find(function (method) {
+              payMethods = _context23.sent;
+              return _context23.abrupt("return", payMethods.find(function (method) {
                 return method.code === PaymentMethodType.Wallet;
               }) || null);
             case 7:
-              _context25.prev = 7;
-              _context25.t0 = _context25["catch"](0);
-              console.error('[PaymentModule] 获取钱包支付方式失败', _context25.t0);
-              return _context25.abrupt("return", null);
+              _context23.prev = 7;
+              _context23.t0 = _context23["catch"](0);
+              console.error('[PaymentModule] 获取钱包支付方式失败', _context23.t0);
+              return _context23.abrupt("return", null);
             case 11:
             case "end":
-              return _context25.stop();
+              return _context23.stop();
           }
-        }, _callee25, this, [[0, 7]]);
+        }, _callee23, this, [[0, 7]]);
       }));
       function getWalletPaymentMethod() {
         return _getWalletPaymentMethod.apply(this, arguments);
@@ -2038,42 +1860,43 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
     /**
      * 确保支付模块所需的数据库表已创建
      */
+    /** @deprecated */
     )
   }, {
     key: "ensurePaymentTables",
     value: (function () {
-      var _ensurePaymentTables = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee26() {
-        return _regeneratorRuntime().wrap(function _callee26$(_context26) {
-          while (1) switch (_context26.prev = _context26.next) {
+      var _ensurePaymentTables = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee24() {
+        return _regeneratorRuntime().wrap(function _callee24$(_context24) {
+          while (1) switch (_context24.prev = _context24.next) {
             case 0:
-              _context26.prev = 0;
-              _context26.next = 3;
+              _context24.prev = 0;
+              _context24.next = 3;
               return this.dbManager.getAll('pay_method');
             case 3:
-              _context26.next = 9;
+              _context24.next = 9;
               break;
             case 5:
-              _context26.prev = 5;
-              _context26.t0 = _context26["catch"](0);
+              _context24.prev = 5;
+              _context24.t0 = _context24["catch"](0);
               console.warn('[PaymentModule] pay_method 表不存在，请在数据库配置中添加以下配置：');
               console.warn('{ name: "pay_method", keyPath: "id" }');
             case 9:
-              _context26.prev = 9;
-              _context26.next = 12;
+              _context24.prev = 9;
+              _context24.next = 12;
               return this.dbManager.getAll('order');
             case 12:
-              _context26.next = 18;
+              _context24.next = 18;
               break;
             case 14:
-              _context26.prev = 14;
-              _context26.t1 = _context26["catch"](9);
+              _context24.prev = 14;
+              _context24.t1 = _context24["catch"](9);
               console.warn('[PaymentModule] order 表不存在，请在数据库配置中添加以下配置：');
               console.warn('{ name: "order", keyPath: "uuid" }');
             case 18:
             case "end":
-              return _context26.stop();
+              return _context24.stop();
           }
-        }, _callee26, this, [[0, 5], [9, 14]]);
+        }, _callee24, this, [[0, 5], [9, 14]]);
       }));
       function ensurePaymentTables() {
         return _ensurePaymentTables.apply(this, arguments);
@@ -2083,33 +1906,34 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
     /**
      * 获取部分支付的订单
      */
+    /** @deprecated */
     )
   }, {
     key: "getPartiallyPaidOrdersAsync",
     value: (function () {
-      var _getPartiallyPaidOrdersAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee27() {
+      var _getPartiallyPaidOrdersAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee25() {
         var allOrders;
-        return _regeneratorRuntime().wrap(function _callee27$(_context27) {
-          while (1) switch (_context27.prev = _context27.next) {
+        return _regeneratorRuntime().wrap(function _callee25$(_context25) {
+          while (1) switch (_context25.prev = _context25.next) {
             case 0:
-              _context27.prev = 0;
-              _context27.next = 3;
+              _context25.prev = 0;
+              _context25.next = 3;
               return this.dbManager.getAll('order');
             case 3:
-              allOrders = _context27.sent;
-              return _context27.abrupt("return", allOrders.filter(function (order) {
+              allOrders = _context25.sent;
+              return _context25.abrupt("return", allOrders.filter(function (order) {
                 return order.payment_status === PaymentStatus.PartiallyPaid;
               }));
             case 7:
-              _context27.prev = 7;
-              _context27.t0 = _context27["catch"](0);
-              console.error('[PaymentModule] 获取部分支付订单失败', _context27.t0);
-              return _context27.abrupt("return", []);
+              _context25.prev = 7;
+              _context25.t0 = _context25["catch"](0);
+              console.error('[PaymentModule] 获取部分支付订单失败', _context25.t0);
+              return _context25.abrupt("return", []);
             case 11:
             case "end":
-              return _context27.stop();
+              return _context25.stop();
           }
-        }, _callee27, this, [[0, 7]]);
+        }, _callee25, this, [[0, 7]]);
       }));
       function getPartiallyPaidOrdersAsync() {
         return _getPartiallyPaidOrdersAsync.apply(this, arguments);
@@ -2130,17 +1954,17 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "roundAmountAsync",
     value: function () {
-      var _roundAmountAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee28(originalAmount, interval, rule) {
+      var _roundAmountAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee26(originalAmount, interval, rule) {
         var amount, roundingInterval, supportedIntervals, intervalValue, baseValue, roundedValue, finalAmount, originalAmountStr, roundedAmountStr, roundingDifference, roundingDifferenceStr;
-        return _regeneratorRuntime().wrap(function _callee28$(_context28) {
-          while (1) switch (_context28.prev = _context28.next) {
+        return _regeneratorRuntime().wrap(function _callee26$(_context26) {
+          while (1) switch (_context26.prev = _context26.next) {
             case 0:
-              _context28.prev = 0;
+              _context26.prev = 0;
               // 参数验证
               amount = new Decimal(originalAmount);
               roundingInterval = new Decimal(interval);
               if (!roundingInterval.lte(0)) {
-                _context28.next = 5;
+                _context26.next = 5;
                 break;
               }
               throw new Error('舍入间隔必须大于 0');
@@ -2154,61 +1978,64 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
 
               // 计算基础值：x / interval
               baseValue = amount.div(roundingInterval);
-              _context28.t0 = rule;
-              _context28.next = _context28.t0 === RoundingRule.Standard ? 12 : _context28.t0 === 'standard' ? 12 : _context28.t0 === RoundingRule.StandardDown ? 14 : _context28.t0 === 'standard_down' ? 14 : _context28.t0 === RoundingRule.AlwaysUp ? 16 : _context28.t0 === 'always_up' ? 16 : _context28.t0 === RoundingRule.AlwaysDown ? 18 : _context28.t0 === 'always_down' ? 18 : 20;
+              console.log("[PaymentModule] \u820D\u5165\u8BA1\u7B97 - \u539F\u59CB\u91D1\u989D: ".concat(amount.toString(), ", \u95F4\u9694: ").concat(intervalValue, ", \u57FA\u7840\u503C: ").concat(baseValue.toString(), ", \u89C4\u5219: ").concat(rule));
+              _context26.t0 = rule;
+              _context26.next = _context26.t0 === RoundingRule.Standard ? 13 : _context26.t0 === 'standard' ? 13 : _context26.t0 === RoundingRule.StandardDown ? 15 : _context26.t0 === 'standard_down' ? 15 : _context26.t0 === RoundingRule.AlwaysUp ? 17 : _context26.t0 === 'always_up' ? 17 : _context26.t0 === RoundingRule.AlwaysDown ? 19 : _context26.t0 === 'always_down' ? 19 : 21;
               break;
-            case 12:
+            case 13:
               // 标准舍入（中点向上）
               roundedValue = this.standardRound(baseValue, true);
-              return _context28.abrupt("break", 21);
-            case 14:
+              return _context26.abrupt("break", 22);
+            case 15:
               // 标准舍入（中点向下）
               roundedValue = this.standardRound(baseValue, false);
-              return _context28.abrupt("break", 21);
-            case 16:
+              return _context26.abrupt("break", 22);
+            case 17:
               // 总是向上舍入
               roundedValue = baseValue.ceil();
-              return _context28.abrupt("break", 21);
-            case 18:
+              return _context26.abrupt("break", 22);
+            case 19:
               // 总是向下舍入
               roundedValue = baseValue.floor();
-              return _context28.abrupt("break", 21);
-            case 20:
-              throw new Error("\u4E0D\u652F\u6301\u7684\u820D\u5165\u89C4\u5219: ".concat(rule));
+              return _context26.abrupt("break", 22);
             case 21:
+              throw new Error("\u4E0D\u652F\u6301\u7684\u820D\u5165\u89C4\u5219: ".concat(rule));
+            case 22:
               // 计算最终金额：roundedValue * interval
               finalAmount = roundedValue.mul(roundingInterval);
               originalAmountStr = amount.toFixed(2); // 如果最终金额是 0 元，则不采用舍入金额，返回原始金额
               if (!finalAmount.eq(0)) {
-                _context28.next = 25;
+                _context26.next = 27;
                 break;
               }
-              return _context28.abrupt("return", {
+              console.log("[PaymentModule] \u6700\u7EC8\u91D1\u989D\u4E3A0\uFF0C\u8FD4\u56DE\u539F\u59CB\u91D1\u989D: ".concat(originalAmountStr));
+              return _context26.abrupt("return", {
                 originalAmount: originalAmountStr,
                 roundedAmount: originalAmountStr,
                 roundingDifference: '0.00'
               });
-            case 25:
+            case 27:
               roundedAmountStr = finalAmount.toFixed(2); // 计算舍入差额
               roundingDifference = finalAmount.sub(amount);
               roundingDifferenceStr = roundingDifference.toFixed(2);
-              return _context28.abrupt("return", {
+              console.log("[PaymentModule] \u820D\u5165\u7ED3\u679C - \u539F\u59CB\u91D1\u989D: ".concat(originalAmountStr, ", \u820D\u5165\u540E\u91D1\u989D: ").concat(roundedAmountStr, ", \u820D\u5165\u5DEE\u989D: ").concat(roundingDifferenceStr));
+              return _context26.abrupt("return", {
                 originalAmount: originalAmountStr,
                 roundedAmount: roundedAmountStr,
                 roundingDifference: roundingDifferenceStr
               });
-            case 31:
-              _context28.prev = 31;
-              _context28.t1 = _context28["catch"](0);
-              console.error('[PaymentModule] 金额舍入失败:', _context28.t1);
-              throw new Error("\u91D1\u989D\u820D\u5165\u5931\u8D25: ".concat(_context28.t1 instanceof Error ? _context28.t1.message : String(_context28.t1)));
-            case 35:
+            case 34:
+              _context26.prev = 34;
+              _context26.t1 = _context26["catch"](0);
+              console.error('[PaymentModule] 金额舍入失败:', _context26.t1);
+              throw new Error("\u91D1\u989D\u820D\u5165\u5931\u8D25: ".concat(_context26.t1 instanceof Error ? _context26.t1.message : String(_context26.t1)));
+            case 38:
             case "end":
-              return _context28.stop();
+              return _context26.stop();
           }
-        }, _callee28, this, [[0, 31]]);
+        }, _callee26, this, [[0, 34]]);
       }));
-      function roundAmountAsync(_x29, _x30, _x31) {
+      function roundAmountAsync(_x27, _x28, _x29) {
         return _roundAmountAsync.apply(this, arguments);
       }
       return roundAmountAsync;