@pisell/pisellos 0.0.479 → 0.0.481

package/dist/modules/Payment/index.js

@@ -1,12 +1,12 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
@@ -102,6 +102,7 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
     // IndexDBManager 实例
     _defineProperty(_assertThisInitialized(_this), "logger", void 0);
     // LoggerManager 实例
+    _defineProperty(_assertThisInitialized(_this), "voucherUpdateLockByOrderUuid", new Map());
     _defineProperty(_assertThisInitialized(_this), "otherParams", {});
     // 支付方式实例
     _defineProperty(_assertThisInitialized(_this), "cash", void 0);
@@ -113,6 +114,50 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
     return _this;
   }
   _createClass(PaymentModule, [{
+    key: "runVoucherUpdateLocked",
+    value: function runVoucherUpdateLocked(orderUuid, task) {
+      var _this2 = this;
+      var previous = this.voucherUpdateLockByOrderUuid.get(orderUuid) || Promise.resolve();
+      var next = previous.catch(function () {
+        return undefined;
+      }).then(task).finally(function () {
+        if (_this2.voucherUpdateLockByOrderUuid.get(orderUuid) === next) {
+          _this2.voucherUpdateLockByOrderUuid.delete(orderUuid);
+        }
+      });
+      this.voucherUpdateLockByOrderUuid.set(orderUuid, next);
+      return next;
+    }
+  }, {
+    key: "normalizeVoucherPaymentItems",
+    value: function normalizeVoucherPaymentItems(voucherPaymentItems) {
+      var normalized = new Map();
+      var _iterator = _createForOfIteratorHelper(voucherPaymentItems || []),
+        _step;
+      try {
+        for (_iterator.s(); !(_step = _iterator.n()).done;) {
+          var item = _step.value;
+          if (!(item !== null && item !== void 0 && item.voucher_id)) {
+            throw new Error("\u4EE3\u91D1\u5238\u652F\u4ED8\u9879\u7F3A\u5C11 voucher_id: ".concat(JSON.stringify(item)));
+          }
+          var orderPaymentType = item.order_payment_type || 'normal';
+          var key = "".concat(item.voucher_id, "|").concat(orderPaymentType);
+          normalized.set(key, _objectSpread(_objectSpread({}, item), {}, {
+            order_payment_type: orderPaymentType
+          }));
+        }
+      } catch (err) {
+        _iterator.e(err);
+      } finally {
+        _iterator.f();
+      }
+      return {
+        items: Array.from(normalized.values()),
+        originalCount: (voucherPaymentItems === null || voucherPaymentItems === void 0 ? void 0 : voucherPaymentItems.length) || 0,
+        normalizedCount: normalized.size
+      };
+    }
+  }, {
     key: "initialize",
     value: function () {
       var _initialize = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(core, options) {
@@ -248,7 +293,7 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "registerNetworkHandlers",
     value: function registerNetworkHandlers() {
-      var _this2 = this;
+      var _this3 = this;
       var network = this.app.plugins.get('network');
       this.logInfo('Registering network status listener');
       network === null || network === void 0 || network.addListener('networkStatusChange', /*#__PURE__*/function () {
@@ -257,12 +302,12 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
             while (1) switch (_context2.prev = _context2.next) {
               case 0:
                 console.log('网络状态:', status.connected);
-                _this2.logInfo('Network status changed', {
+                _this3.logInfo('Network status changed', {
                   connected: status.connected,
                   previousStatus: status.previousStatus
                 });
                 if (status.connected) {
-                  _this2.logInfo('Network reconnected');
+                  _this3.logInfo('Network reconnected');
                   // 网络恢复时的处理逻辑可以在这里添加
                 }
               case 3:
@@ -276,105 +321,142 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
         };
       }());
     }
-
+  }, {
+    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 _callee3() {
-        var cachedMethods, hasCache, response, payMethods, _iterator, _step, method;
-        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-          while (1) switch (_context3.prev = _context3.next) {
+      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) {
             case 0:
               this.logInfo('Starting getPayMethodListAsync');
-              _context3.prev = 1;
+              _context4.prev = 1;
               // 先尝试从 IndexDB 获取缓存
               cachedMethods = [];
-              _context3.prev = 3;
-              _context3.next = 6;
+              _context4.prev = 3;
+              _context4.next = 6;
               return this.dbManager.getAll('pay_method');
             case 6:
-              cachedMethods = _context3.sent;
-              _context3.next = 12;
+              cachedMethods = _context4.sent;
+              _context4.next = 12;
               break;
             case 9:
-              _context3.prev = 9;
-              _context3.t0 = _context3["catch"](3);
+              _context4.prev = 9;
+              _context4.t0 = _context4["catch"](3);
               console.warn('[PaymentModule] pay_method 表不存在，将从服务器获取数据');
             case 12:
               // 如果有缓存，先返回缓存数据
               hasCache = cachedMethods.length > 0;
               if (!hasCache) {
-                _context3.next = 16;
+                _context4.next = 16;
                 break;
               }
               // 后台异步获取最新数据
               this.refreshPaymentMethodsInBackground(cachedMethods);
-              return _context3.abrupt("return", cachedMethods);
+              return _context4.abrupt("return", cachedMethods);
             case 16:
-              _context3.next = 18;
-              return this.request.get('/pay/custom-payment/available', {
-                channel: 'pos'
-              });
+              _context4.next = 18;
+              return this.request.get('/pay/custom-payment/all');
             case 18:
-              response = _context3.sent;
+              response = _context4.sent;
+              response.data = this.filterPayMethods(response.data);
               payMethods = response.data || []; // 尝试缓存到 IndexDB
-              _context3.prev = 20;
-              _iterator = _createForOfIteratorHelper(payMethods);
-              _context3.prev = 22;
-              _iterator.s();
-            case 24:
-              if ((_step = _iterator.n()).done) {
-                _context3.next = 30;
+              _context4.prev = 21;
+              _iterator2 = _createForOfIteratorHelper(payMethods);
+              _context4.prev = 23;
+              _iterator2.s();
+            case 25:
+              if ((_step2 = _iterator2.n()).done) {
+                _context4.next = 31;
                 break;
               }
-              method = _step.value;
-              _context3.next = 28;
+              method = _step2.value;
+              _context4.next = 29;
               return this.dbManager.update('pay_method', method);
-            case 28:
-              _context3.next = 24;
+            case 29:
+              _context4.next = 25;
               break;
-            case 30:
-              _context3.next = 35;
+            case 31:
+              _context4.next = 36;
               break;
-            case 32:
-              _context3.prev = 32;
-              _context3.t1 = _context3["catch"](22);
-              _iterator.e(_context3.t1);
-            case 35:
-              _context3.prev = 35;
-              _iterator.f();
-              return _context3.finish(35);
-            case 38:
-              _context3.next = 43;
+            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 40:
-              _context3.prev = 40;
-              _context3.t2 = _context3["catch"](20);
+            case 41:
+              _context4.prev = 41;
+              _context4.t2 = _context4["catch"](21);
               console.warn('[PaymentModule] 无法缓存支付方式，pay_method 表不存在');
-            case 43:
-              _context3.next = 45;
+            case 44:
+              _context4.next = 46;
               return this.core.effects.emit("".concat(this.name, ":onPaymentMethodsLoaded"), payMethods);
-            case 45:
+            case 46:
               this.logInfo('getPayMethodListAsync completed successfully', {
-                methodCount: payMethods.length,
-                hasCache: cachedMethods.length > 0
+                payMethods: payMethods
               });
-              return _context3.abrupt("return", payMethods);
-            case 49:
-              _context3.prev = 49;
-              _context3.t3 = _context3["catch"](1);
-              console.error('[PaymentModule] 获取支付方式列表失败', _context3.t3);
-              this.logError('getPayMethodListAsync failed', _context3.t3);
+              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", []);
-            case 54:
+              return _context4.abrupt("return", []);
+            case 55:
             case "end":
-              return _context3.stop();
+              return _context4.stop();
           }
-        }, _callee3, this, [[1, 49], [3, 9], [20, 40], [22, 32, 35, 38]]);
+        }, _callee4, this, [[1, 50], [3, 9], [21, 41], [23, 33, 36, 39]]);
       }));
       function getPayMethodListAsync() {
         return _getPayMethodListAsync.apply(this, arguments);
@@ -388,28 +470,27 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "refreshPaymentMethodsInBackground",
     value: (function () {
-      var _refreshPaymentMethodsInBackground = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(cachedMethods) {
-        var response, newPayMethods, hasChanges, _iterator2, _step2, method, _iterator3, _step3, _method, eventData;
-        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-          while (1) switch (_context4.prev = _context4.next) {
+      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
               });
-              _context4.prev = 1;
+              _context5.prev = 1;
               console.log('[PaymentModule] 后台刷新支付方式列表...');
 
               // 从服务器获取最新数据
-              _context4.next = 5;
-              return this.request.get('/pay/custom-payment/available', {
-                channel: 'pos'
-              });
+              _context5.next = 5;
+              return this.request.get('/pay/custom-payment/all');
             case 5:
-              response = _context4.sent;
+              response = _context5.sent;
+              response.data = this.filterPayMethods(response.data);
               newPayMethods = response.data || []; // 检查是否有变化
               hasChanges = this.hasPaymentMethodsChanged(cachedMethods, newPayMethods);
               if (!hasChanges) {
-                _context4.next = 56;
+                _context5.next = 57;
                 break;
               }
               console.log('[PaymentModule] 支付方式列表已更新');
@@ -419,94 +500,94 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
               });
 
               // 更新缓存
-              _context4.prev = 11;
+              _context5.prev = 12;
               // 先清除旧数据
-              _iterator2 = _createForOfIteratorHelper(cachedMethods);
-              _context4.prev = 13;
-              _iterator2.s();
-            case 15:
-              if ((_step2 = _iterator2.n()).done) {
-                _context4.next = 21;
+              _iterator3 = _createForOfIteratorHelper(cachedMethods);
+              _context5.prev = 14;
+              _iterator3.s();
+            case 16:
+              if ((_step3 = _iterator3.n()).done) {
+                _context5.next = 22;
                 break;
               }
-              method = _step2.value;
-              _context4.next = 19;
+              method = _step3.value;
+              _context5.next = 20;
               return this.dbManager.delete('pay_method', method.id);
-            case 19:
-              _context4.next = 15;
+            case 20:
+              _context5.next = 16;
               break;
-            case 21:
-              _context4.next = 26;
+            case 22:
+              _context5.next = 27;
               break;
-            case 23:
-              _context4.prev = 23;
-              _context4.t0 = _context4["catch"](13);
-              _iterator2.e(_context4.t0);
-            case 26:
-              _context4.prev = 26;
-              _iterator2.f();
-              return _context4.finish(26);
-            case 29:
+            case 24:
+              _context5.prev = 24;
+              _context5.t0 = _context5["catch"](14);
+              _iterator3.e(_context5.t0);
+            case 27:
+              _context5.prev = 27;
+              _iterator3.f();
+              return _context5.finish(27);
+            case 30:
               // 添加新数据
-              _iterator3 = _createForOfIteratorHelper(newPayMethods);
-              _context4.prev = 30;
-              _iterator3.s();
-            case 32:
-              if ((_step3 = _iterator3.n()).done) {
-                _context4.next = 38;
+              _iterator4 = _createForOfIteratorHelper(newPayMethods);
+              _context5.prev = 31;
+              _iterator4.s();
+            case 33:
+              if ((_step4 = _iterator4.n()).done) {
+                _context5.next = 39;
                 break;
               }
-              _method = _step3.value;
-              _context4.next = 36;
+              _method = _step4.value;
+              _context5.next = 37;
               return this.dbManager.update('pay_method', _method);
-            case 36:
-              _context4.next = 32;
+            case 37:
+              _context5.next = 33;
               break;
-            case 38:
-              _context4.next = 43;
+            case 39:
+              _context5.next = 44;
               break;
-            case 40:
-              _context4.prev = 40;
-              _context4.t1 = _context4["catch"](30);
-              _iterator3.e(_context4.t1);
-            case 43:
-              _context4.prev = 43;
-              _iterator3.f();
-              return _context4.finish(43);
-            case 46:
-              _context4.next = 51;
+            case 41:
+              _context5.prev = 41;
+              _context5.t1 = _context5["catch"](31);
+              _iterator4.e(_context5.t1);
+            case 44:
+              _context5.prev = 44;
+              _iterator4.f();
+              return _context5.finish(44);
+            case 47:
+              _context5.next = 52;
               break;
-            case 48:
-              _context4.prev = 48;
-              _context4.t2 = _context4["catch"](11);
-              console.warn('[PaymentModule] 无法更新支付方式缓存', _context4.t2);
-            case 51:
+            case 49:
+              _context5.prev = 49;
+              _context5.t2 = _context5["catch"](12);
+              console.warn('[PaymentModule] 无法更新支付方式缓存', _context5.t2);
+            case 52:
               // 通知外部支付方式已变化
               eventData = {
                 oldMethods: cachedMethods,
                 newMethods: newPayMethods
               };
-              _context4.next = 54;
+              _context5.next = 55;
               return this.core.effects.emit("".concat(this.name, ":onPaymentMethodsChanged"), eventData);
-            case 54:
-              _context4.next = 57;
+            case 55:
+              _context5.next = 58;
               break;
-            case 56:
-              console.log('[PaymentModule] 支付方式列表无变化');
             case 57:
-              _context4.next = 62;
+              console.log('[PaymentModule] 支付方式列表无变化');
+            case 58:
+              _context5.next = 63;
               break;
-            case 59:
-              _context4.prev = 59;
-              _context4.t3 = _context4["catch"](1);
-              console.error('[PaymentModule] 后台刷新支付方式失败', _context4.t3);
-            case 62:
+            case 60:
+              _context5.prev = 60;
+              _context5.t3 = _context5["catch"](1);
+              console.error('[PaymentModule] 后台刷新支付方式失败', _context5.t3);
+            case 63:
             case "end":
-              return _context4.stop();
+              return _context5.stop();
           }
-        }, _callee4, this, [[1, 59], [11, 48], [13, 23, 26, 29], [30, 40, 43, 46]]);
+        }, _callee5, this, [[1, 60], [12, 49], [14, 24, 27, 30], [31, 41, 44, 47]]);
       }));
-      function refreshPaymentMethodsInBackground(_x4) {
+      function refreshPaymentMethodsInBackground(_x5) {
         return _refreshPaymentMethodsInBackground.apply(this, arguments);
       }
       return refreshPaymentMethodsInBackground;
@@ -528,11 +609,11 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
       }));
 
       // 检查每个新方法是否与旧方法相同
-      var _iterator4 = _createForOfIteratorHelper(newMethods),
-        _step4;
+      var _iterator5 = _createForOfIteratorHelper(newMethods),
+        _step5;
       try {
-        for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
-          var newMethod = _step4.value;
+        for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
+          var newMethod = _step5.value;
           var oldMethod = oldMethodsMap.get(newMethod.id);
           if (!oldMethod) {
             return true; // 新增方法
@@ -601,9 +682,9 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
           }
         }
       } catch (err) {
-        _iterator4.e(err);
+        _iterator5.e(err);
       } finally {
-        _iterator4.f();
+        _iterator5.f();
       }
       return false;
     }
@@ -614,25 +695,25 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getOrderListAsync",
     value: (function () {
-      var _getOrderListAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
-        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
-          while (1) switch (_context5.prev = _context5.next) {
+      var _getOrderListAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
+        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+          while (1) switch (_context6.prev = _context6.next) {
             case 0:
-              _context5.prev = 0;
-              _context5.next = 3;
+              _context6.prev = 0;
+              _context6.next = 3;
               return this.dbManager.getAll('order');
             case 3:
-              return _context5.abrupt("return", _context5.sent);
+              return _context6.abrupt("return", _context6.sent);
             case 6:
-              _context5.prev = 6;
-              _context5.t0 = _context5["catch"](0);
-              console.error('[PaymentModule] 获取订单列表失败', _context5.t0);
-              return _context5.abrupt("return", []);
+              _context6.prev = 6;
+              _context6.t0 = _context6["catch"](0);
+              console.error('[PaymentModule] 获取订单列表失败', _context6.t0);
+              return _context6.abrupt("return", []);
             case 10:
             case "end":
-              return _context5.stop();
+              return _context6.stop();
           }
-        }, _callee5, this, [[0, 6]]);
+        }, _callee6, this, [[0, 6]]);
       }));
       function getOrderListAsync() {
         return _getOrderListAsync.apply(this, arguments);
@@ -646,27 +727,27 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getPaymentOrderByUuidAsync",
     value: (function () {
-      var _getPaymentOrderByUuidAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(orderUuid) {
-        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
-          while (1) switch (_context6.prev = _context6.next) {
+      var _getPaymentOrderByUuidAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(orderUuid) {
+        return _regeneratorRuntime().wrap(function _callee7$(_context7) {
+          while (1) switch (_context7.prev = _context7.next) {
             case 0:
-              _context6.prev = 0;
-              _context6.next = 3;
+              _context7.prev = 0;
+              _context7.next = 3;
               return this.dbManager.get('order', orderUuid, true);
             case 3:
-              return _context6.abrupt("return", _context6.sent);
+              return _context7.abrupt("return", _context7.sent);
             case 6:
-              _context6.prev = 6;
-              _context6.t0 = _context6["catch"](0);
-              console.error('[PaymentModule] 获取支付订单失败', _context6.t0);
-              return _context6.abrupt("return", null);
+              _context7.prev = 6;
+              _context7.t0 = _context7["catch"](0);
+              console.error('[PaymentModule] 获取支付订单失败', _context7.t0);
+              return _context7.abrupt("return", null);
             case 10:
             case "end":
-              return _context6.stop();
+              return _context7.stop();
           }
-        }, _callee6, this, [[0, 6]]);
+        }, _callee7, this, [[0, 6]]);
       }));
-      function getPaymentOrderByUuidAsync(_x5) {
+      function getPaymentOrderByUuidAsync(_x6) {
         return _getPaymentOrderByUuidAsync.apply(this, arguments);
       }
       return getPaymentOrderByUuidAsync;
@@ -678,17 +759,17 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "createPaymentOrderAsync",
     value: (function () {
-      var _createPaymentOrderAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(params) {
-        var _this3 = this;
+      var _createPaymentOrderAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(params) {
+        var _this4 = this;
         var newOrder, currentTime, dbAddStartTime, dbAddDuration;
-        return _regeneratorRuntime().wrap(function _callee7$(_context7) {
-          while (1) switch (_context7.prev = _context7.next) {
+        return _regeneratorRuntime().wrap(function _callee8$(_context8) {
+          while (1) switch (_context8.prev = _context8.next) {
             case 0:
               this.logInfo('Starting createPaymentOrderAsync', {
                 orderId: params.order_id,
                 totalAmount: params.total_amount
               });
-              _context7.prev = 1;
+              _context8.prev = 1;
               // 检测是否有重复的 order_id
               // console.time('createLocalOrderAsync: getExistingOrder')
               // const existingOrder = await this.dbManager.get('order', params.order_id);
@@ -774,7 +855,7 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
 
               // 🚀 性能监控：记录数据库添加操作耗时
               dbAddStartTime = Date.now();
-              _context7.next = 7;
+              _context8.next = 7;
               return this.dbManager.add('order', newOrder, true);
             case 7:
               dbAddDuration = Date.now() - dbAddStartTime;
@@ -787,24 +868,24 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                 performance: dbAddDuration > 100 ? 'slow' : dbAddDuration > 50 ? 'medium' : 'fast'
               });
               setTimeout(function () {
-                _this3.core.effects.emit("".concat(_this3.name, ":onOrderAdded"), newOrder);
+                _this4.core.effects.emit("".concat(_this4.name, ":onOrderAdded"), newOrder);
               }, 0);
-              return _context7.abrupt("return", newOrder);
+              return _context8.abrupt("return", newOrder);
             case 13:
-              _context7.prev = 13;
-              _context7.t0 = _context7["catch"](1);
-              console.error('[PaymentModule] 创建支付订单失败', _context7.t0);
-              this.logError('createPaymentOrderAsync failed', _context7.t0, {
+              _context8.prev = 13;
+              _context8.t0 = _context8["catch"](1);
+              console.error('[PaymentModule] 创建支付订单失败', _context8.t0);
+              this.logError('createPaymentOrderAsync failed', _context8.t0, {
                 orderId: params.order_id
               });
-              throw _context7.t0;
+              throw _context8.t0;
             case 18:
             case "end":
-              return _context7.stop();
+              return _context8.stop();
           }
-        }, _callee7, this, [[1, 13]]);
+        }, _callee8, this, [[1, 13]]);
       }));
-      function createPaymentOrderAsync(_x6) {
+      function createPaymentOrderAsync(_x7) {
         return _createPaymentOrderAsync.apply(this, arguments);
       }
       return createPaymentOrderAsync;
@@ -816,42 +897,42 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "deletePaymentOrderAsync",
     value: (function () {
-      var _deletePaymentOrderAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(orderUuid) {
+      var _deletePaymentOrderAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(orderUuid) {
         var order;
-        return _regeneratorRuntime().wrap(function _callee8$(_context8) {
-          while (1) switch (_context8.prev = _context8.next) {
+        return _regeneratorRuntime().wrap(function _callee9$(_context9) {
+          while (1) switch (_context9.prev = _context9.next) {
             case 0:
-              _context8.prev = 0;
-              _context8.next = 3;
+              _context9.prev = 0;
+              _context9.next = 3;
               return this.dbManager.get('order', orderUuid);
             case 3:
-              order = _context8.sent;
+              order = _context9.sent;
               if (!order) {
-                _context8.next = 10;
+                _context9.next = 10;
                 break;
               }
-              _context8.next = 7;
+              _context9.next = 7;
               return this.dbManager.delete('order', orderUuid);
             case 7:
-              _context8.next = 9;
+              _context9.next = 9;
               return this.core.effects.emit("".concat(this.name, ":onOrderDeleted"), order);
             case 9:
               console.log('[PaymentModule] 支付订单删除成功:', orderUuid);
             case 10:
-              _context8.next = 16;
+              _context9.next = 16;
               break;
             case 12:
-              _context8.prev = 12;
-              _context8.t0 = _context8["catch"](0);
-              console.error('[PaymentModule] 删除支付订单失败', _context8.t0);
-              throw _context8.t0;
+              _context9.prev = 12;
+              _context9.t0 = _context9["catch"](0);
+              console.error('[PaymentModule] 删除支付订单失败', _context9.t0);
+              throw _context9.t0;
             case 16:
             case "end":
-              return _context8.stop();
+              return _context9.stop();
           }
-        }, _callee8, this, [[0, 12]]);
+        }, _callee9, this, [[0, 12]]);
       }));
-      function deletePaymentOrderAsync(_x7) {
+      function deletePaymentOrderAsync(_x8) {
         return _deletePaymentOrderAsync.apply(this, arguments);
       }
       return deletePaymentOrderAsync;
@@ -863,49 +944,49 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "updateOrderAsync",
     value: (function () {
-      var _updateOrderAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(orderUuid, params) {
+      var _updateOrderAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(orderUuid, params) {
         var order, updatedOrder;
-        return _regeneratorRuntime().wrap(function _callee9$(_context9) {
-          while (1) switch (_context9.prev = _context9.next) {
+        return _regeneratorRuntime().wrap(function _callee10$(_context10) {
+          while (1) switch (_context10.prev = _context10.next) {
             case 0:
-              _context9.prev = 0;
-              _context9.next = 3;
+              _context10.prev = 0;
+              _context10.next = 3;
               return this.dbManager.get('order', orderUuid);
             case 3:
-              order = _context9.sent;
+              order = _context10.sent;
               if (!order) {
-                _context9.next = 13;
+                _context10.next = 13;
                 break;
               }
               updatedOrder = _objectSpread(_objectSpread({}, order), params);
               this.recalculateOrderAmount(updatedOrder);
-              _context9.next = 9;
+              _context10.next = 9;
               return this.dbManager.update('order', updatedOrder);
             case 9:
-              _context9.next = 11;
+              _context10.next = 11;
               return this.core.effects.emit("".concat(this.name, ":onOrderUpdated"), updatedOrder);
             case 11:
-              _context9.next = 13;
+              _context10.next = 13;
               return this.core.effects.emit("".concat(this.name, ":onOrderChanged"), {
                 action: 'update',
                 order: updatedOrder,
                 originalOrder: order
               });
             case 13:
-              _context9.next = 19;
+              _context10.next = 19;
               break;
             case 15:
-              _context9.prev = 15;
-              _context9.t0 = _context9["catch"](0);
-              console.error('[PaymentModule] 更新订单失败', _context9.t0);
-              throw _context9.t0;
+              _context10.prev = 15;
+              _context10.t0 = _context10["catch"](0);
+              console.error('[PaymentModule] 更新订单失败', _context10.t0);
+              throw _context10.t0;
             case 19:
             case "end":
-              return _context9.stop();
+              return _context10.stop();
           }
-        }, _callee9, this, [[0, 15]]);
+        }, _callee10, this, [[0, 15]]);
       }));
-      function updateOrderAsync(_x8, _x9) {
+      function updateOrderAsync(_x9, _x10) {
         return _updateOrderAsync.apply(this, arguments);
       }
       return updateOrderAsync;
@@ -924,38 +1005,38 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "replaceOrderIdByUuidAsync",
     value: (function () {
-      var _replaceOrderIdByUuidAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(orderUuid, newOrderId) {
+      var _replaceOrderIdByUuidAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11(orderUuid, newOrderId) {
         var existingOrder, allOrders, duplicateOrder, originalOrderId, updatedOrder;
-        return _regeneratorRuntime().wrap(function _callee10$(_context10) {
-          while (1) switch (_context10.prev = _context10.next) {
+        return _regeneratorRuntime().wrap(function _callee11$(_context11) {
+          while (1) switch (_context11.prev = _context11.next) {
             case 0:
               this.logInfo('Starting replaceOrderIdByUuidAsync', {
                 orderUuid: orderUuid,
                 newOrderId: newOrderId
               });
-              _context10.prev = 1;
-              _context10.next = 4;
+              _context11.prev = 1;
+              _context11.next = 4;
               return this.dbManager.get('order', orderUuid);
             case 4:
-              existingOrder = _context10.sent;
+              existingOrder = _context11.sent;
               if (existingOrder) {
-                _context10.next = 8;
+                _context11.next = 8;
                 break;
               }
               this.logWarning('Order not found for UUID replacement', {
                 orderUuid: orderUuid
               });
-              return _context10.abrupt("return", null);
+              return _context11.abrupt("return", null);
             case 8:
-              _context10.next = 10;
+              _context11.next = 10;
               return this.dbManager.getAll('order');
             case 10:
-              allOrders = _context10.sent;
+              allOrders = _context11.sent;
               duplicateOrder = allOrders.find(function (order) {
                 return String(order.order_id) === String(newOrderId) && order.uuid !== orderUuid;
               });
               if (!duplicateOrder) {
-                _context10.next = 15;
+                _context11.next = 15;
                 break;
               }
               this.logWarning('New order ID already exists', {
@@ -977,13 +1058,13 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                   updated_at: new Date().toISOString()
                 })
               }); // 更新到数据库
-              _context10.next = 19;
+              _context11.next = 19;
               return this.dbManager.update('order', updatedOrder);
             case 19:
-              _context10.next = 21;
+              _context11.next = 21;
               return this.core.effects.emit("".concat(this.name, ":onOrderUpdated"), updatedOrder);
             case 21:
-              _context10.next = 23;
+              _context11.next = 23;
               return this.core.effects.emit("".concat(this.name, ":onOrderChanged"), {
                 action: 'order_id_replaced',
                 order: updatedOrder,
@@ -1000,23 +1081,23 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                 newOrderId: newOrderId
               });
               console.log("[PaymentModule] \u8BA2\u5355ID\u66FF\u6362\u6210\u529F: ".concat(originalOrderId, " \u2192 ").concat(newOrderId));
-              return _context10.abrupt("return", updatedOrder);
+              return _context11.abrupt("return", updatedOrder);
             case 28:
-              _context10.prev = 28;
-              _context10.t0 = _context10["catch"](1);
-              console.error('[PaymentModule] 替换订单ID失败', _context10.t0);
-              this.logError('replaceOrderIdByUuidAsync failed', _context10.t0, {
+              _context11.prev = 28;
+              _context11.t0 = _context11["catch"](1);
+              console.error('[PaymentModule] 替换订单ID失败', _context11.t0);
+              this.logError('replaceOrderIdByUuidAsync failed', _context11.t0, {
                 orderUuid: orderUuid,
                 newOrderId: newOrderId
               });
-              throw _context10.t0;
+              throw _context11.t0;
             case 33:
             case "end":
-              return _context10.stop();
+              return _context11.stop();
           }
-        }, _callee10, this, [[1, 28]]);
+        }, _callee11, this, [[1, 28]]);
       }));
-      function replaceOrderIdByUuidAsync(_x10, _x11) {
+      function replaceOrderIdByUuidAsync(_x11, _x12) {
         return _replaceOrderIdByUuidAsync.apply(this, arguments);
       }
       return replaceOrderIdByUuidAsync;
@@ -1032,42 +1113,42 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getPaymentItemsAsync",
     value: (function () {
-      var _getPaymentItemsAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11(orderUuid) {
+      var _getPaymentItemsAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12(orderUuid) {
         var includeVoided,
           order,
           allPayments,
-          _args11 = arguments;
-        return _regeneratorRuntime().wrap(function _callee11$(_context11) {
-          while (1) switch (_context11.prev = _context11.next) {
+          _args12 = arguments;
+        return _regeneratorRuntime().wrap(function _callee12$(_context12) {
+          while (1) switch (_context12.prev = _context12.next) {
             case 0:
-              includeVoided = _args11.length > 1 && _args11[1] !== undefined ? _args11[1] : false;
+              includeVoided = _args12.length > 1 && _args12[1] !== undefined ? _args12[1] : false;
               if (orderUuid) {
-                _context11.next = 3;
+                _context12.next = 3;
                 break;
               }
               throw new Error('orderUuid is required');
             case 3:
-              _context11.next = 5;
+              _context12.next = 5;
               return this.getPaymentOrderByUuidAsync(orderUuid);
             case 5:
-              order = _context11.sent;
+              order = _context12.sent;
               allPayments = (order === null || order === void 0 ? void 0 : order.payment) || [];
               if (!includeVoided) {
-                _context11.next = 9;
+                _context12.next = 9;
                 break;
               }
-              return _context11.abrupt("return", allPayments);
+              return _context12.abrupt("return", allPayments);
             case 9:
-              return _context11.abrupt("return", allPayments.filter(function (payment) {
+              return _context12.abrupt("return", allPayments.filter(function (payment) {
                 return payment.status !== 'voided';
               }));
             case 10:
             case "end":
-              return _context11.stop();
+              return _context12.stop();
           }
-        }, _callee11, this);
+        }, _callee12, this);
       }));
-      function getPaymentItemsAsync(_x12) {
+      function getPaymentItemsAsync(_x13) {
         return _getPaymentItemsAsync.apply(this, arguments);
       }
       return getPaymentItemsAsync;
@@ -1082,18 +1163,18 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getAllPaymentItemsAsync",
     value: (function () {
-      var _getAllPaymentItemsAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12(orderUuid) {
-        return _regeneratorRuntime().wrap(function _callee12$(_context12) {
-          while (1) switch (_context12.prev = _context12.next) {
+      var _getAllPaymentItemsAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13(orderUuid) {
+        return _regeneratorRuntime().wrap(function _callee13$(_context13) {
+          while (1) switch (_context13.prev = _context13.next) {
             case 0:
-              return _context12.abrupt("return", this.getPaymentItemsAsync(orderUuid, true));
+              return _context13.abrupt("return", this.getPaymentItemsAsync(orderUuid, true));
             case 1:
             case "end":
-              return _context12.stop();
+              return _context13.stop();
           }
-        }, _callee12, this);
+        }, _callee13, this);
       }));
-      function getAllPaymentItemsAsync(_x13) {
+      function getAllPaymentItemsAsync(_x14) {
         return _getAllPaymentItemsAsync.apply(this, arguments);
       }
       return getAllPaymentItemsAsync;
@@ -1105,10 +1186,10 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "addPaymentItemAsync",
     value: (function () {
-      var _addPaymentItemAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13(orderUuid, paymentItem) {
+      var _addPaymentItemAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14(orderUuid, paymentItem) {
         var _paymentItem$metadata, _newPaymentItem$metad, _newPaymentItem$metad2, _newPaymentItem$metad3, order, expectAmount, paidDepositAmount, expectedDepositAmount, warningMessage, paymentUuid, currentTime, newPaymentItem;
-        return _regeneratorRuntime().wrap(function _callee13$(_context13) {
-          while (1) switch (_context13.prev = _context13.next) {
+        return _regeneratorRuntime().wrap(function _callee14$(_context14) {
+          while (1) switch (_context14.prev = _context14.next) {
             case 0:
               this.logInfo('Starting addPaymentItemAsync', {
                 orderUuid: orderUuid,
@@ -1116,20 +1197,20 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                 paymentCode: paymentItem.code,
                 orderPaymentType: paymentItem.order_payment_type
               });
-              _context13.prev = 1;
+              _context14.prev = 1;
               this.logInfo('准备获取订单', {
                 orderUuid: orderUuid
               });
-              _context13.next = 5;
+              _context14.next = 5;
               return this.getPaymentOrderByUuidAsync(orderUuid);
             case 5:
-              order = _context13.sent;
+              order = _context14.sent;
               this.logInfo('获取订单信息成功', {
                 orderUuid: orderUuid,
                 order: order
               });
               if (order) {
-                _context13.next = 9;
+                _context14.next = 9;
                 break;
               }
               throw new Error("Order not found: ".concat(orderUuid));
@@ -1144,7 +1225,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))) {
-                _context13.next = 17;
+                _context14.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");
@@ -1199,7 +1280,7 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                 orderUuid: orderUuid,
                 order: order
               });
-              _context13.next = 25;
+              _context14.next = 25;
               return this.dbManager.update('order', order, true);
             case 25:
               this.logInfo('更新订单支付项完成', {
@@ -1222,24 +1303,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
               });
-              _context13.next = 35;
+              _context14.next = 35;
               break;
             case 30:
-              _context13.prev = 30;
-              _context13.t0 = _context13["catch"](1);
-              console.error('[PaymentModule] 添加支付项失败', _context13.t0);
-              this.logError('addPaymentItemAsync failed', _context13.t0, {
+              _context14.prev = 30;
+              _context14.t0 = _context14["catch"](1);
+              console.error('[PaymentModule] 添加支付项失败', _context14.t0);
+              this.logError('addPaymentItemAsync failed', _context14.t0, {
                 orderUuid: orderUuid,
                 paymentItem: paymentItem
               });
-              throw _context13.t0;
+              throw _context14.t0;
             case 35:
             case "end":
-              return _context13.stop();
+              return _context14.stop();
           }
-        }, _callee13, this, [[1, 30]]);
+        }, _callee14, this, [[1, 30]]);
       }));
-      function addPaymentItemAsync(_x14, _x15) {
+      function addPaymentItemAsync(_x15, _x16) {
         return _addPaymentItemAsync.apply(this, arguments);
       }
       return addPaymentItemAsync;
@@ -1251,22 +1332,22 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "deletePaymentAsync",
     value: (function () {
-      var _deletePaymentAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14(orderUuid, paymentUuid) {
+      var _deletePaymentAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee15(orderUuid, paymentUuid) {
         var order, paymentItem;
-        return _regeneratorRuntime().wrap(function _callee14$(_context14) {
-          while (1) switch (_context14.prev = _context14.next) {
+        return _regeneratorRuntime().wrap(function _callee15$(_context15) {
+          while (1) switch (_context15.prev = _context15.next) {
             case 0:
               this.logInfo('Starting deletePaymentAsync (mark as voided)', {
                 orderUuid: orderUuid,
                 paymentUuid: paymentUuid
               });
-              _context14.prev = 1;
-              _context14.next = 4;
+              _context15.prev = 1;
+              _context15.next = 4;
               return this.dbManager.get('order', orderUuid);
             case 4:
-              order = _context14.sent;
+              order = _context15.sent;
               if (order) {
-                _context14.next = 7;
+                _context15.next = 7;
                 break;
               }
               throw new Error('订单不存在');
@@ -1275,17 +1356,17 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                 return payment.uuid === paymentUuid;
               });
               if (paymentItem) {
-                _context14.next = 10;
+                _context15.next = 10;
                 break;
               }
               throw new Error("\u652F\u4ED8\u9879\u4E0D\u5B58\u5728: ".concat(paymentUuid));
             case 10:
               if (!(paymentItem.status === 'voided')) {
-                _context14.next = 13;
+                _context15.next = 13;
                 break;
               }
               console.warn("[PaymentModule] \u652F\u4ED8\u9879 ".concat(paymentUuid, " \u5DF2\u7ECF\u88AB\u5220\u9664\uFF0C\u8DF3\u8FC7\u64CD\u4F5C"));
-              return _context14.abrupt("return");
+              return _context15.abrupt("return");
             case 13:
               // 标记删除而不是物理删除
               paymentItem.status = 'voided';
@@ -1302,16 +1383,16 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
               this.recalculateOrderAmount(order);
 
               // 更新到 IndexDB
-              _context14.next = 20;
+              _context15.next = 20;
               return this.dbManager.update('order', order);
             case 20:
-              _context14.next = 22;
+              _context15.next = 22;
               return this.core.effects.emit("".concat(this.name, ":onPaymentDeleted"), {
                 order: order,
                 paymentItem: paymentItem
               });
             case 22:
-              _context14.next = 24;
+              _context15.next = 24;
               return this.core.effects.emit("".concat(this.name, ":onOrderChanged"), {
                 action: 'payment_delete',
                 order: order,
@@ -1324,24 +1405,24 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                 originalAmount: paymentItem.origin_amount,
                 newExpectAmount: order.expect_amount
               });
-              _context14.next = 32;
+              _context15.next = 32;
               break;
             case 27:
-              _context14.prev = 27;
-              _context14.t0 = _context14["catch"](1);
-              console.error('[PaymentModule] 删除支付项失败', _context14.t0);
-              this.logError('deletePaymentAsync failed', _context14.t0, {
+              _context15.prev = 27;
+              _context15.t0 = _context15["catch"](1);
+              console.error('[PaymentModule] 删除支付项失败', _context15.t0);
+              this.logError('deletePaymentAsync failed', _context15.t0, {
                 orderUuid: orderUuid,
                 paymentUuid: paymentUuid
               });
-              throw _context14.t0;
+              throw _context15.t0;
             case 32:
             case "end":
-              return _context14.stop();
+              return _context15.stop();
           }
-        }, _callee14, this, [[1, 27]]);
+        }, _callee15, this, [[1, 27]]);
       }));
-      function deletePaymentAsync(_x16, _x17) {
+      function deletePaymentAsync(_x17, _x18) {
         return _deletePaymentAsync.apply(this, arguments);
       }
       return deletePaymentAsync;
@@ -1356,159 +1437,202 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "updateVoucherPaymentItemsAsync",
     value: (function () {
-      var _updateVoucherPaymentItemsAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee15(orderUuid, voucherPaymentItems) {
-        var order, existingVoucherItems, _iterator5, _step5, voucherItem, _iterator6, _step6, _voucherItem, updatedOrder;
-        return _regeneratorRuntime().wrap(function _callee15$(_context15) {
-          while (1) switch (_context15.prev = _context15.next) {
+      var _updateVoucherPaymentItemsAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee17(orderUuid, voucherPaymentItems) {
+        var _this5 = this;
+        return _regeneratorRuntime().wrap(function _callee17$(_context17) {
+          while (1) switch (_context17.prev = _context17.next) {
             case 0:
-              this.logInfo('Starting updateVoucherPaymentItemsAsync', {
-                orderUuid: orderUuid,
-                newVoucherCount: voucherPaymentItems.length,
-                voucherItems: voucherPaymentItems.map(function (item) {
-                  return {
-                    code: item.code,
-                    amount: item.amount,
-                    voucher_id: item.voucher_id,
-                    order_payment_type: item.order_payment_type
-                  };
-                })
-              });
-              _context15.prev = 1;
-              _context15.next = 4;
-              return this.getPaymentOrderByUuidAsync(orderUuid);
-            case 4:
-              order = _context15.sent;
-              if (order) {
-                _context15.next = 7;
-                break;
-              }
-              throw new Error("\u8BA2\u5355\u4E0D\u5B58\u5728: ".concat(orderUuid));
-            case 7:
-              // 1. 查找所有现有的代金券类支付项（带 voucher_id 且状态不是 voided)并且还没有同步给后端
-              // 如果同步给了后端的voucher 不允许删除
-              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
-                  };
-                })
-              });
+              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) {
+                    case 0:
+                      _this5$normalizeVouch = _this5.normalizeVoucherPaymentItems(voucherPaymentItems), normalizedVoucherItems = _this5$normalizeVouch.items, originalCount = _this5$normalizeVouch.originalCount, normalizedCount = _this5$normalizeVouch.normalizedCount;
+                      _this5.logInfo('Starting updateVoucherPaymentItemsAsync', {
+                        orderUuid: orderUuid,
+                        originalVoucherCount: originalCount,
+                        normalizedVoucherCount: normalizedCount,
+                        voucherItems: normalizedVoucherItems.map(function (item) {
+                          return {
+                            code: item.code,
+                            amount: item.amount,
+                            voucher_id: item.voucher_id,
+                            order_payment_type: item.order_payment_type
+                          };
+                        })
+                      });
+                      if (originalCount !== normalizedCount) {
+                        console.warn('[PaymentModule] voucherPaymentItems detected duplicates (deduped by voucher_id + order_payment_type)', {
+                          orderUuid: orderUuid,
+                          originalCount: originalCount,
+                          normalizedCount: normalizedCount
+                        });
+                      }
+                      _context16.prev = 3;
+                      _context16.next = 6;
+                      return _this5.getPaymentOrderByUuidAsync(orderUuid);
+                    case 6:
+                      order = _context16.sent;
+                      if (order) {
+                        _context16.next = 9;
+                        break;
+                      }
+                      throw new Error("\u8BA2\u5355\u4E0D\u5B58\u5728: ".concat(orderUuid));
+                    case 9:
+                      // 1. 查找所有现有的代金券类支付项（带 voucher_id 且状态不是 voided)并且还没有同步给后端
+                      // 如果同步给了后端的voucher 不允许删除
+                      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. 删除所有现有的代金券支付项
-              _iterator5 = _createForOfIteratorHelper(existingVoucherItems);
-              _context15.prev = 10;
-              _iterator5.s();
-            case 12:
-              if ((_step5 = _iterator5.n()).done) {
-                _context15.next = 19;
-                break;
-              }
-              voucherItem = _step5.value;
-              console.log("[PaymentModule] \u5220\u9664\u73B0\u6709\u4EE3\u91D1\u5238\u652F\u4ED8\u9879: ".concat(voucherItem.uuid));
-              _context15.next = 17;
-              return this.deletePaymentAsync(orderUuid, voucherItem.uuid);
-            case 17:
-              _context15.next = 12;
-              break;
-            case 19:
-              _context15.next = 24;
-              break;
-            case 21:
-              _context15.prev = 21;
-              _context15.t0 = _context15["catch"](10);
-              _iterator5.e(_context15.t0);
-            case 24:
-              _context15.prev = 24;
-              _iterator5.f();
-              return _context15.finish(24);
-            case 27:
-              // 3. 添加新的代金券支付项
-              console.log('[PaymentModule] 添加新的代金券支付项:', {
-                orderUuid: orderUuid,
-                newItemCount: voucherPaymentItems.length
-              });
-              _iterator6 = _createForOfIteratorHelper(voucherPaymentItems);
-              _context15.prev = 29;
-              _iterator6.s();
-            case 31:
-              if ((_step6 = _iterator6.n()).done) {
-                _context15.next = 40;
-                break;
-              }
-              _voucherItem = _step6.value;
-              if (_voucherItem.voucher_id) {
-                _context15.next = 35;
-                break;
-              }
-              throw new Error("\u4EE3\u91D1\u5238\u652F\u4ED8\u9879\u7F3A\u5C11 voucher_id: ".concat(JSON.stringify(_voucherItem)));
-            case 35:
-              console.log("[PaymentModule] \u6DFB\u52A0\u4EE3\u91D1\u5238\u652F\u4ED8\u9879:", {
-                code: _voucherItem.code,
-                amount: _voucherItem.amount,
-                voucher_id: _voucherItem.voucher_id,
-                order_payment_type: _voucherItem.order_payment_type
-              });
-              _context15.next = 38;
-              return this.addPaymentItemAsync(orderUuid, _voucherItem);
-            case 38:
-              _context15.next = 31;
-              break;
-            case 40:
-              _context15.next = 45;
-              break;
-            case 42:
-              _context15.prev = 42;
-              _context15.t1 = _context15["catch"](29);
-              _iterator6.e(_context15.t1);
-            case 45:
-              _context15.prev = 45;
-              _iterator6.f();
-              return _context15.finish(45);
-            case 48:
-              _context15.next = 50;
-              return this.getPaymentOrderByUuidAsync(orderUuid);
-            case 50:
-              updatedOrder = _context15.sent;
-              _context15.next = 53;
-              return this.core.effects.emit("".concat(this.name, ":onPaymentAdded"), {
-                orderUuid: orderUuid,
-                order: updatedOrder,
-                payment: null // 批量操作不提供单个支付项
-              });
-            case 53:
-              this.logInfo('updateVoucherPaymentItemsAsync completed successfully', {
-                orderUuid: orderUuid,
-                removedVoucherCount: existingVoucherItems.length,
-                addedVoucherCount: voucherPaymentItems.length,
-                finalExpectAmount: updatedOrder === null || updatedOrder === void 0 ? void 0 : updatedOrder.expect_amount
-              });
-              _context15.next = 61;
-              break;
-            case 56:
-              _context15.prev = 56;
-              _context15.t2 = _context15["catch"](1);
-              console.error('[PaymentModule] 批量更新代金券支付项失败:', _context15.t2);
-              this.logError('updateVoucherPaymentItemsAsync failed', _context15.t2, {
-                orderUuid: orderUuid,
-                voucherPaymentItems: voucherPaymentItems
-              });
-              throw _context15.t2;
-            case 61:
+                      // 2. 删除所有现有的代金券支付项（仅删除未同步的）
+                      _iterator6 = _createForOfIteratorHelper(existingVoucherItems);
+                      _context16.prev = 12;
+                      _iterator6.s();
+                    case 14:
+                      if ((_step6 = _iterator6.n()).done) {
+                        _context16.next = 21;
+                        break;
+                      }
+                      voucherItem = _step6.value;
+                      console.log("[PaymentModule] \u5220\u9664\u73B0\u6709\u4EE3\u91D1\u5238\u652F\u4ED8\u9879: ".concat(voucherItem.uuid));
+                      _context16.next = 19;
+                      return _this5.deletePaymentAsync(orderUuid, voucherItem.uuid);
+                    case 19:
+                      _context16.next = 14;
+                      break;
+                    case 21:
+                      _context16.next = 26;
+                      break;
+                    case 23:
+                      _context16.prev = 23;
+                      _context16.t0 = _context16["catch"](12);
+                      _iterator6.e(_context16.t0);
+                    case 26:
+                      _context16.prev = 26;
+                      _iterator6.f();
+                      return _context16.finish(26);
+                    case 29:
+                      _context16.next = 31;
+                      return _this5.getPaymentOrderByUuidAsync(orderUuid);
+                    case 31:
+                      orderAfterDelete = _context16.sent;
+                      if (orderAfterDelete) {
+                        _context16.next = 34;
+                        break;
+                      }
+                      throw new Error("\u8BA2\u5355\u4E0D\u5B58\u5728: ".concat(orderUuid));
+                    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');
+                      }));
+                      console.log('[PaymentModule] 添加新的代金券支付项:', {
+                        orderUuid: orderUuid,
+                        newItemCount: normalizedVoucherItems.length
+                      });
+                      _iterator7 = _createForOfIteratorHelper(normalizedVoucherItems);
+                      _context16.prev = 37;
+                      _iterator7.s();
+                    case 39:
+                      if ((_step7 = _iterator7.n()).done) {
+                        _context16.next = 52;
+                        break;
+                      }
+                      _voucherItem = _step7.value;
+                      orderPaymentType = _voucherItem.order_payment_type || 'normal';
+                      key = "".concat(_voucherItem.voucher_id, "|").concat(orderPaymentType);
+                      if (!existingActiveVoucherKeys.has(key)) {
+                        _context16.next = 46;
+                        break;
+                      }
+                      console.warn('[PaymentModule] Skip adding voucher payment item because it already exists (active)', {
+                        orderUuid: orderUuid,
+                        voucher_id: _voucherItem.voucher_id,
+                        order_payment_type: orderPaymentType
+                      });
+                      return _context16.abrupt("continue", 50);
+                    case 46:
+                      console.log("[PaymentModule] \u6DFB\u52A0\u4EE3\u91D1\u5238\u652F\u4ED8\u9879:", {
+                        code: _voucherItem.code,
+                        amount: _voucherItem.amount,
+                        voucher_id: _voucherItem.voucher_id,
+                        order_payment_type: orderPaymentType
+                      });
+                      _context16.next = 49;
+                      return _this5.addPaymentItemAsync(orderUuid, _voucherItem);
+                    case 49:
+                      existingActiveVoucherKeys.add(key);
+                    case 50:
+                      _context16.next = 39;
+                      break;
+                    case 52:
+                      _context16.next = 57;
+                      break;
+                    case 54:
+                      _context16.prev = 54;
+                      _context16.t1 = _context16["catch"](37);
+                      _iterator7.e(_context16.t1);
+                    case 57:
+                      _context16.prev = 57;
+                      _iterator7.f();
+                      return _context16.finish(57);
+                    case 60:
+                      _context16.next = 62;
+                      return _this5.getPaymentOrderByUuidAsync(orderUuid);
+                    case 62:
+                      updatedOrder = _context16.sent;
+                      _context16.next = 65;
+                      return _this5.core.effects.emit("".concat(_this5.name, ":onPaymentAdded"), {
+                        orderUuid: orderUuid,
+                        order: updatedOrder,
+                        payment: null // 批量操作不提供单个支付项
+                      });
+                    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 = 73;
+                      break;
+                    case 68:
+                      _context16.prev = 68;
+                      _context16.t2 = _context16["catch"](3);
+                      console.error('[PaymentModule] 批量更新代金券支付项失败:', _context16.t2);
+                      _this5.logError('updateVoucherPaymentItemsAsync failed', _context16.t2, {
+                        orderUuid: orderUuid,
+                        voucherPaymentItems: voucherPaymentItems
+                      });
+                      throw _context16.t2;
+                    case 73:
+                    case "end":
+                      return _context16.stop();
+                  }
+                }, _callee16, null, [[3, 68], [12, 23, 26, 29], [37, 54, 57, 60]]);
+              }))));
+            case 1:
             case "end":
-              return _context15.stop();
+              return _context17.stop();
           }
-        }, _callee15, this, [[1, 56], [10, 21, 24, 27], [29, 42, 45, 48]]);
+        }, _callee17, this);
       }));
-      function updateVoucherPaymentItemsAsync(_x18, _x19) {
+      function updateVoucherPaymentItemsAsync(_x19, _x20) {
         return _updateVoucherPaymentItemsAsync.apply(this, arguments);
       }
       return updateVoucherPaymentItemsAsync;
@@ -1520,18 +1644,18 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "updatePaymentAsync",
     value: (function () {
-      var _updatePaymentAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16(orderUuid, paymentUuid, params) {
+      var _updatePaymentAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18(orderUuid, paymentUuid, params) {
         var order, paymentItem, formattedParams;
-        return _regeneratorRuntime().wrap(function _callee16$(_context16) {
-          while (1) switch (_context16.prev = _context16.next) {
+        return _regeneratorRuntime().wrap(function _callee18$(_context18) {
+          while (1) switch (_context18.prev = _context18.next) {
             case 0:
-              _context16.prev = 0;
-              _context16.next = 3;
+              _context18.prev = 0;
+              _context18.next = 3;
               return this.dbManager.get('order', orderUuid);
             case 3:
-              order = _context16.sent;
+              order = _context18.sent;
               if (order) {
-                _context16.next = 6;
+                _context18.next = 6;
                 break;
               }
               throw new Error('订单不存在');
@@ -1540,7 +1664,7 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                 return payment.uuid === paymentUuid;
               });
               if (!paymentItem) {
-                _context16.next = 18;
+                _context18.next = 18;
                 break;
               }
               // 如果更新参数中包含 amount，先格式化
@@ -1554,36 +1678,36 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
               this.recalculateOrderAmount(order);
 
               // 更新到 IndexDB
-              _context16.next = 14;
+              _context18.next = 14;
               return this.dbManager.update('order', order);
             case 14:
-              _context16.next = 16;
+              _context18.next = 16;
               return this.core.effects.emit("".concat(this.name, ":onPaymentUpdated"), {
                 order: order,
                 paymentItem: paymentItem
               });
             case 16:
-              _context16.next = 18;
+              _context18.next = 18;
               return this.core.effects.emit("".concat(this.name, ":onOrderChanged"), {
                 action: 'payment_update',
                 order: order,
                 paymentItem: paymentItem
               });
             case 18:
-              _context16.next = 24;
+              _context18.next = 24;
               break;
             case 20:
-              _context16.prev = 20;
-              _context16.t0 = _context16["catch"](0);
-              console.error('[PaymentModule] 更新支付项失败', _context16.t0);
-              throw _context16.t0;
+              _context18.prev = 20;
+              _context18.t0 = _context18["catch"](0);
+              console.error('[PaymentModule] 更新支付项失败', _context18.t0);
+              throw _context18.t0;
             case 24:
             case "end":
-              return _context16.stop();
+              return _context18.stop();
           }
-        }, _callee16, this, [[0, 20]]);
+        }, _callee18, this, [[0, 20]]);
       }));
-      function updatePaymentAsync(_x20, _x21, _x22) {
+      function updatePaymentAsync(_x21, _x22, _x23) {
         return _updatePaymentAsync.apply(this, arguments);
       }
       return updatePaymentAsync;
@@ -1595,61 +1719,61 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "submitPayAsync",
     value: (function () {
-      var _submitPayAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee17(orderUuid) {
-        var orderToSubmit, order, allOrders, _iterator7, _step7, _order, result;
-        return _regeneratorRuntime().wrap(function _callee17$(_context17) {
-          while (1) switch (_context17.prev = _context17.next) {
+      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) {
             case 0:
               this.logInfo('Starting submitPayAsync', {
                 orderUuid: orderUuid
               });
-              _context17.prev = 1;
+              _context19.prev = 1;
               if (!orderUuid) {
-                _context17.next = 9;
+                _context19.next = 9;
                 break;
               }
-              _context17.next = 5;
+              _context19.next = 5;
               return this.dbManager.get('order', orderUuid);
             case 5:
-              order = _context17.sent;
+              order = _context19.sent;
               orderToSubmit = order ? [order] : [];
-              _context17.next = 13;
+              _context19.next = 13;
               break;
             case 9:
-              _context17.next = 11;
+              _context19.next = 11;
               return this.dbManager.getAll('order');
             case 11:
-              allOrders = _context17.sent;
+              allOrders = _context19.sent;
               // 包括正在处理中的订单和部分支付的订单（可能添加了新的支付项）
               orderToSubmit = allOrders.filter(function (order) {
                 return order.payment_status === PaymentStatus.Processing || order.payment_status === PaymentStatus.PartiallyPaid;
               });
             case 13:
-              _iterator7 = _createForOfIteratorHelper(orderToSubmit);
-              _context17.prev = 14;
-              _iterator7.s();
+              _iterator8 = _createForOfIteratorHelper(orderToSubmit);
+              _context19.prev = 14;
+              _iterator8.s();
             case 16:
-              if ((_step7 = _iterator7.n()).done) {
-                _context17.next = 22;
+              if ((_step8 = _iterator8.n()).done) {
+                _context19.next = 22;
                 break;
               }
-              _order = _step7.value;
-              _context17.next = 20;
+              _order = _step8.value;
+              _context19.next = 20;
               return this.submitSingleOrderPayment(_order);
             case 20:
-              _context17.next = 16;
+              _context19.next = 16;
               break;
             case 22:
-              _context17.next = 27;
+              _context19.next = 27;
               break;
             case 24:
-              _context17.prev = 24;
-              _context17.t0 = _context17["catch"](14);
-              _iterator7.e(_context17.t0);
+              _context19.prev = 24;
+              _context19.t0 = _context19["catch"](14);
+              _iterator8.e(_context19.t0);
             case 27:
-              _context17.prev = 27;
-              _iterator7.f();
-              return _context17.finish(27);
+              _context19.prev = 27;
+              _iterator8.f();
+              return _context19.finish(27);
             case 30:
               result = {
                 status: 'success'
@@ -1658,24 +1782,24 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                 result: result.status,
                 processedOrdersCount: orderToSubmit.length
               });
-              return _context17.abrupt("return", result);
+              return _context19.abrupt("return", result);
             case 35:
-              _context17.prev = 35;
-              _context17.t1 = _context17["catch"](1);
-              console.error('[PaymentModule] 提交支付失败', _context17.t1);
-              this.logError('submitPayAsync failed', _context17.t1, {
+              _context19.prev = 35;
+              _context19.t1 = _context19["catch"](1);
+              console.error('[PaymentModule] 提交支付失败', _context19.t1);
+              this.logError('submitPayAsync failed', _context19.t1, {
                 orderUuid: orderUuid
               });
-              return _context17.abrupt("return", {
+              return _context19.abrupt("return", {
                 status: 'failed'
               });
             case 40:
             case "end":
-              return _context17.stop();
+              return _context19.stop();
           }
-        }, _callee17, this, [[1, 35], [14, 24, 27, 30]]);
+        }, _callee19, this, [[1, 35], [14, 24, 27, 30]]);
       }));
-      function submitPayAsync(_x23) {
+      function submitPayAsync(_x24) {
         return _submitPayAsync.apply(this, arguments);
       }
       return submitPayAsync;
@@ -1687,12 +1811,12 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "submitSingleOrderPayment",
     value: (function () {
-      var _submitSingleOrderPayment = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18(order) {
+      var _submitSingleOrderPayment = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee20(order) {
         var paymentData, totalPaidAmount, orderTotalAmount;
-        return _regeneratorRuntime().wrap(function _callee18$(_context18) {
-          while (1) switch (_context18.prev = _context18.next) {
+        return _regeneratorRuntime().wrap(function _callee20$(_context20) {
+          while (1) switch (_context20.prev = _context20.next) {
             case 0:
-              _context18.prev = 0;
+              _context20.prev = 0;
               paymentData = {
                 payments: order.payment.map(function (payment) {
                   return {
@@ -1728,11 +1852,11 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
               paymentData.payment_status = order.payment_status === PaymentStatus.Finished ? 'paid' : 'partially_paid';
 
               // 更新订单状态到数据库
-              _context18.next = 8;
+              _context20.next = 8;
               return this.dbManager.update('order', order);
             case 8:
               if (!(paymentData.payments.length === 0)) {
-                _context18.next = 12;
+                _context20.next = 12;
                 break;
               }
               console.log("[PaymentModule] \u8BA2\u5355 ".concat(order.uuid, " \u652F\u4ED8\u5217\u8868\u4E3A\u7A7A\uFF0C\u8DF3\u8FC7\u652F\u4ED8\u5904\u7406"));
@@ -1740,31 +1864,31 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                 orderUuid: order.uuid,
                 orderId: order.order_id
               });
-              return _context18.abrupt("return");
+              return _context20.abrupt("return");
             case 12:
-              _context18.next = 14;
+              _context20.next = 14;
               return this.core.effects.emit("".concat(this.name, ":onPaymentSubmitted"), order);
             case 14:
-              _context18.next = 16;
+              _context20.next = 16;
               return this.core.effects.emit("".concat(this.name, ":onOrderChanged"), {
                 action: 'submit',
                 order: order
               });
             case 16:
-              _context18.next = 22;
+              _context20.next = 22;
               break;
             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;
+              _context20.prev = 18;
+              _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 22:
             case "end":
-              return _context18.stop();
+              return _context20.stop();
           }
-        }, _callee18, this, [[0, 18]]);
+        }, _callee20, this, [[0, 18]]);
       }));
-      function submitSingleOrderPayment(_x24) {
+      function submitSingleOrderPayment(_x25) {
         return _submitSingleOrderPayment.apply(this, arguments);
       }
       return submitSingleOrderPayment;
@@ -1776,29 +1900,29 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getRemainingOrderAmountAsync",
     value: (function () {
-      var _getRemainingOrderAmountAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee19(orderUuid) {
+      var _getRemainingOrderAmountAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee21(orderUuid) {
         var order;
-        return _regeneratorRuntime().wrap(function _callee19$(_context19) {
-          while (1) switch (_context19.prev = _context19.next) {
+        return _regeneratorRuntime().wrap(function _callee21$(_context21) {
+          while (1) switch (_context21.prev = _context21.next) {
             case 0:
-              _context19.next = 2;
+              _context21.next = 2;
               return this.getPaymentOrderByUuidAsync(orderUuid);
             case 2:
-              order = _context19.sent;
+              order = _context21.sent;
               if (order) {
-                _context19.next = 5;
+                _context21.next = 5;
                 break;
               }
               throw new Error('订单不存在');
             case 5:
-              return _context19.abrupt("return", new Decimal(order.expect_amount).toNumber());
+              return _context21.abrupt("return", new Decimal(order.expect_amount).toNumber());
             case 6:
             case "end":
-              return _context19.stop();
+              return _context21.stop();
           }
-        }, _callee19, this);
+        }, _callee21, this);
       }));
-      function getRemainingOrderAmountAsync(_x25) {
+      function getRemainingOrderAmountAsync(_x26) {
         return _getRemainingOrderAmountAsync.apply(this, arguments);
       }
       return getRemainingOrderAmountAsync;
@@ -1810,65 +1934,65 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getRemainingOrderAmountWithInputAsync",
     value: (function () {
-      var _getRemainingOrderAmountWithInputAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee20(inputAmount, orderUuid) {
+      var _getRemainingOrderAmountWithInputAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee22(inputAmount, orderUuid) {
         var order, inputDecimal;
-        return _regeneratorRuntime().wrap(function _callee20$(_context20) {
-          while (1) switch (_context20.prev = _context20.next) {
+        return _regeneratorRuntime().wrap(function _callee22$(_context22) {
+          while (1) switch (_context22.prev = _context22.next) {
             case 0:
-              _context20.next = 2;
+              _context22.next = 2;
               return this.getPaymentOrderByUuidAsync(orderUuid);
             case 2:
-              order = _context20.sent;
+              order = _context22.sent;
               if (order) {
-                _context20.next = 5;
+                _context22.next = 5;
                 break;
               }
               throw new Error('订单不存在');
             case 5:
               if (!(inputAmount === null || inputAmount === undefined)) {
-                _context20.next = 7;
+                _context22.next = 7;
                 break;
               }
-              return _context20.abrupt("return", new Decimal(order.expect_amount).toNumber());
+              return _context22.abrupt("return", new Decimal(order.expect_amount).toNumber());
             case 7:
               if (!(typeof inputAmount === 'string')) {
-                _context20.next = 10;
+                _context22.next = 10;
                 break;
               }
               if (!(inputAmount.trim() === '')) {
-                _context20.next = 10;
+                _context22.next = 10;
                 break;
               }
-              return _context20.abrupt("return", new Decimal(order.expect_amount).toNumber());
+              return _context22.abrupt("return", new Decimal(order.expect_amount).toNumber());
             case 10:
               if (!(typeof inputAmount === 'number')) {
-                _context20.next = 14;
+                _context22.next = 14;
                 break;
               }
               if (!(isNaN(inputAmount) || !isFinite(inputAmount))) {
-                _context20.next = 14;
+                _context22.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 _context20.abrupt("return", new Decimal(order.expect_amount).toNumber());
+              return _context22.abrupt("return", new Decimal(order.expect_amount).toNumber());
             case 14:
-              _context20.prev = 14;
+              _context22.prev = 14;
               inputDecimal = new Decimal(inputAmount);
-              return _context20.abrupt("return", new Decimal(order.expect_amount).minus(inputDecimal).toNumber());
+              return _context22.abrupt("return", new Decimal(order.expect_amount).minus(inputDecimal).toNumber());
             case 19:
-              _context20.prev = 19;
-              _context20.t0 = _context20["catch"](14);
+              _context22.prev = 19;
+              _context22.t0 = _context22["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 _context20.abrupt("return", new Decimal(order.expect_amount).toNumber());
+              return _context22.abrupt("return", new Decimal(order.expect_amount).toNumber());
             case 23:
             case "end":
-              return _context20.stop();
+              return _context22.stop();
           }
-        }, _callee20, this, [[14, 19]]);
+        }, _callee22, this, [[14, 19]]);
       }));
-      function getRemainingOrderAmountWithInputAsync(_x26, _x27) {
+      function getRemainingOrderAmountWithInputAsync(_x27, _x28) {
         return _getRemainingOrderAmountWithInputAsync.apply(this, arguments);
       }
       return getRemainingOrderAmountWithInputAsync;
@@ -1891,9 +2015,10 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
           // 计算有效支付金额：支付金额 + 抹零金额的绝对值
           // 当 rounding_amount 为负数时，表示抹掉的金额，按绝对值计算有效支付
           // 例如：amount=15, rounding_amount=-0.2，有效支付=15.2（抹掉0.2元零头）
+          // 例2：amount=15,rounding_amount=0.2,有效支付 14.8 
           var paymentAmount = new Decimal(payment.amount || 0);
           var roundingAmount = new Decimal(payment.rounding_amount || 0);
-          var effectiveAmount = paymentAmount.plus(roundingAmount.isNegative() ? roundingAmount.abs() : 0);
+          var effectiveAmount = paymentAmount.minus(roundingAmount);
           return sum.plus(effectiveAmount);
         } catch (error) {
           console.warn("[PaymentModule] \u65E0\u6548\u7684\u652F\u4ED8\u91D1\u989D: amount=".concat(payment.amount, ", rounding_amount=").concat(payment.rounding_amount, "\uFF0C\u8DF3\u8FC7\u8BA1\u7B97"));
@@ -1921,7 +2046,7 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
             code: p.code,
             amount: p.amount,
             rounding_amount: p.rounding_amount || '0.00',
-            effective_amount: new Decimal(p.amount || 0).plus(new Decimal(Number(p.rounding_amount) > 0 ? 0 : p.rounding_amount || 0).abs()).toFixed(2)
+            effective_amount: new Decimal(p.amount || 0).minus(new Decimal(p.rounding_amount || 0)).toFixed(2)
           };
         }),
         说明: '有效支付金额包含抹零计算（amount + |rounding_amount|）'
@@ -1934,29 +2059,29 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getCashPaymentMethod",
     value: (function () {
-      var _getCashPaymentMethod = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee21() {
+      var _getCashPaymentMethod = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee23() {
         var payMethods;
-        return _regeneratorRuntime().wrap(function _callee21$(_context21) {
-          while (1) switch (_context21.prev = _context21.next) {
+        return _regeneratorRuntime().wrap(function _callee23$(_context23) {
+          while (1) switch (_context23.prev = _context23.next) {
             case 0:
-              _context21.prev = 0;
-              _context21.next = 3;
+              _context23.prev = 0;
+              _context23.next = 3;
               return this.dbManager.getAll('pay_method');
             case 3:
-              payMethods = _context21.sent;
-              return _context21.abrupt("return", payMethods.find(function (method) {
+              payMethods = _context23.sent;
+              return _context23.abrupt("return", payMethods.find(function (method) {
                 return method.code === PaymentMethodType.Cash;
               }) || null);
             case 7:
-              _context21.prev = 7;
-              _context21.t0 = _context21["catch"](0);
-              console.error('[PaymentModule] 获取现金支付方式失败', _context21.t0);
-              return _context21.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 _context21.stop();
+              return _context23.stop();
           }
-        }, _callee21, this, [[0, 7]]);
+        }, _callee23, this, [[0, 7]]);
       }));
       function getCashPaymentMethod() {
         return _getCashPaymentMethod.apply(this, arguments);
@@ -1970,29 +2095,29 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getEftposPaymentMethod",
     value: (function () {
-      var _getEftposPaymentMethod = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee22() {
+      var _getEftposPaymentMethod = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee24() {
         var payMethods;
-        return _regeneratorRuntime().wrap(function _callee22$(_context22) {
-          while (1) switch (_context22.prev = _context22.next) {
+        return _regeneratorRuntime().wrap(function _callee24$(_context24) {
+          while (1) switch (_context24.prev = _context24.next) {
             case 0:
-              _context22.prev = 0;
-              _context22.next = 3;
+              _context24.prev = 0;
+              _context24.next = 3;
               return this.dbManager.getAll('pay_method');
             case 3:
-              payMethods = _context22.sent;
-              return _context22.abrupt("return", payMethods.find(function (method) {
+              payMethods = _context24.sent;
+              return _context24.abrupt("return", payMethods.find(function (method) {
                 return method.code === PaymentMethodType.Eftpos;
               }) || null);
             case 7:
-              _context22.prev = 7;
-              _context22.t0 = _context22["catch"](0);
-              console.error('[PaymentModule] 获取Eftpos支付方式失败', _context22.t0);
-              return _context22.abrupt("return", null);
+              _context24.prev = 7;
+              _context24.t0 = _context24["catch"](0);
+              console.error('[PaymentModule] 获取Eftpos支付方式失败', _context24.t0);
+              return _context24.abrupt("return", null);
             case 11:
             case "end":
-              return _context22.stop();
+              return _context24.stop();
           }
-        }, _callee22, this, [[0, 7]]);
+        }, _callee24, this, [[0, 7]]);
       }));
       function getEftposPaymentMethod() {
         return _getEftposPaymentMethod.apply(this, arguments);
@@ -2006,29 +2131,29 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getWalletPaymentMethod",
     value: (function () {
-      var _getWalletPaymentMethod = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee23() {
+      var _getWalletPaymentMethod = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee25() {
         var payMethods;
-        return _regeneratorRuntime().wrap(function _callee23$(_context23) {
-          while (1) switch (_context23.prev = _context23.next) {
+        return _regeneratorRuntime().wrap(function _callee25$(_context25) {
+          while (1) switch (_context25.prev = _context25.next) {
             case 0:
-              _context23.prev = 0;
-              _context23.next = 3;
+              _context25.prev = 0;
+              _context25.next = 3;
               return this.dbManager.getAll('pay_method');
             case 3:
-              payMethods = _context23.sent;
-              return _context23.abrupt("return", payMethods.find(function (method) {
+              payMethods = _context25.sent;
+              return _context25.abrupt("return", payMethods.find(function (method) {
                 return method.code === PaymentMethodType.Wallet;
               }) || null);
             case 7:
-              _context23.prev = 7;
-              _context23.t0 = _context23["catch"](0);
-              console.error('[PaymentModule] 获取钱包支付方式失败', _context23.t0);
-              return _context23.abrupt("return", null);
+              _context25.prev = 7;
+              _context25.t0 = _context25["catch"](0);
+              console.error('[PaymentModule] 获取钱包支付方式失败', _context25.t0);
+              return _context25.abrupt("return", null);
             case 11:
             case "end":
-              return _context23.stop();
+              return _context25.stop();
           }
-        }, _callee23, this, [[0, 7]]);
+        }, _callee25, this, [[0, 7]]);
       }));
       function getWalletPaymentMethod() {
         return _getWalletPaymentMethod.apply(this, arguments);
@@ -2042,38 +2167,38 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "ensurePaymentTables",
     value: (function () {
-      var _ensurePaymentTables = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee24() {
-        return _regeneratorRuntime().wrap(function _callee24$(_context24) {
-          while (1) switch (_context24.prev = _context24.next) {
+      var _ensurePaymentTables = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee26() {
+        return _regeneratorRuntime().wrap(function _callee26$(_context26) {
+          while (1) switch (_context26.prev = _context26.next) {
             case 0:
-              _context24.prev = 0;
-              _context24.next = 3;
+              _context26.prev = 0;
+              _context26.next = 3;
               return this.dbManager.getAll('pay_method');
             case 3:
-              _context24.next = 9;
+              _context26.next = 9;
               break;
             case 5:
-              _context24.prev = 5;
-              _context24.t0 = _context24["catch"](0);
+              _context26.prev = 5;
+              _context26.t0 = _context26["catch"](0);
               console.warn('[PaymentModule] pay_method 表不存在，请在数据库配置中添加以下配置：');
               console.warn('{ name: "pay_method", keyPath: "id" }');
             case 9:
-              _context24.prev = 9;
-              _context24.next = 12;
+              _context26.prev = 9;
+              _context26.next = 12;
               return this.dbManager.getAll('order');
             case 12:
-              _context24.next = 18;
+              _context26.next = 18;
               break;
             case 14:
-              _context24.prev = 14;
-              _context24.t1 = _context24["catch"](9);
+              _context26.prev = 14;
+              _context26.t1 = _context26["catch"](9);
               console.warn('[PaymentModule] order 表不存在，请在数据库配置中添加以下配置：');
               console.warn('{ name: "order", keyPath: "uuid" }');
             case 18:
             case "end":
-              return _context24.stop();
+              return _context26.stop();
           }
-        }, _callee24, this, [[0, 5], [9, 14]]);
+        }, _callee26, this, [[0, 5], [9, 14]]);
       }));
       function ensurePaymentTables() {
         return _ensurePaymentTables.apply(this, arguments);
@@ -2087,29 +2212,29 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getPartiallyPaidOrdersAsync",
     value: (function () {
-      var _getPartiallyPaidOrdersAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee25() {
+      var _getPartiallyPaidOrdersAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee27() {
         var allOrders;
-        return _regeneratorRuntime().wrap(function _callee25$(_context25) {
-          while (1) switch (_context25.prev = _context25.next) {
+        return _regeneratorRuntime().wrap(function _callee27$(_context27) {
+          while (1) switch (_context27.prev = _context27.next) {
             case 0:
-              _context25.prev = 0;
-              _context25.next = 3;
+              _context27.prev = 0;
+              _context27.next = 3;
               return this.dbManager.getAll('order');
             case 3:
-              allOrders = _context25.sent;
-              return _context25.abrupt("return", allOrders.filter(function (order) {
+              allOrders = _context27.sent;
+              return _context27.abrupt("return", allOrders.filter(function (order) {
                 return order.payment_status === PaymentStatus.PartiallyPaid;
               }));
             case 7:
-              _context25.prev = 7;
-              _context25.t0 = _context25["catch"](0);
-              console.error('[PaymentModule] 获取部分支付订单失败', _context25.t0);
-              return _context25.abrupt("return", []);
+              _context27.prev = 7;
+              _context27.t0 = _context27["catch"](0);
+              console.error('[PaymentModule] 获取部分支付订单失败', _context27.t0);
+              return _context27.abrupt("return", []);
             case 11:
             case "end":
-              return _context25.stop();
+              return _context27.stop();
           }
-        }, _callee25, this, [[0, 7]]);
+        }, _callee27, this, [[0, 7]]);
       }));
       function getPartiallyPaidOrdersAsync() {
         return _getPartiallyPaidOrdersAsync.apply(this, arguments);
@@ -2130,17 +2255,17 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "roundAmountAsync",
     value: function () {
-      var _roundAmountAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee26(originalAmount, interval, rule) {
+      var _roundAmountAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee28(originalAmount, interval, rule) {
         var amount, roundingInterval, supportedIntervals, intervalValue, baseValue, roundedValue, finalAmount, originalAmountStr, roundedAmountStr, roundingDifference, roundingDifferenceStr;
-        return _regeneratorRuntime().wrap(function _callee26$(_context26) {
-          while (1) switch (_context26.prev = _context26.next) {
+        return _regeneratorRuntime().wrap(function _callee28$(_context28) {
+          while (1) switch (_context28.prev = _context28.next) {
             case 0:
-              _context26.prev = 0;
+              _context28.prev = 0;
               // 参数验证
               amount = new Decimal(originalAmount);
               roundingInterval = new Decimal(interval);
               if (!roundingInterval.lte(0)) {
-                _context26.next = 5;
+                _context28.next = 5;
                 break;
               }
               throw new Error('舍入间隔必须大于 0');
@@ -2155,25 +2280,25 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
               // 计算基础值：x / interval
               baseValue = amount.div(roundingInterval);
               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;
+              _context28.t0 = rule;
+              _context28.next = _context28.t0 === RoundingRule.Standard ? 13 : _context28.t0 === 'standard' ? 13 : _context28.t0 === RoundingRule.StandardDown ? 15 : _context28.t0 === 'standard_down' ? 15 : _context28.t0 === RoundingRule.AlwaysUp ? 17 : _context28.t0 === 'always_up' ? 17 : _context28.t0 === RoundingRule.AlwaysDown ? 19 : _context28.t0 === 'always_down' ? 19 : 21;
               break;
             case 13:
               // 标准舍入（中点向上）
               roundedValue = this.standardRound(baseValue, true);
-              return _context26.abrupt("break", 22);
+              return _context28.abrupt("break", 22);
             case 15:
               // 标准舍入（中点向下）
               roundedValue = this.standardRound(baseValue, false);
-              return _context26.abrupt("break", 22);
+              return _context28.abrupt("break", 22);
             case 17:
               // 总是向上舍入
               roundedValue = baseValue.ceil();
-              return _context26.abrupt("break", 22);
+              return _context28.abrupt("break", 22);
             case 19:
               // 总是向下舍入
               roundedValue = baseValue.floor();
-              return _context26.abrupt("break", 22);
+              return _context28.abrupt("break", 22);
             case 21:
               throw new Error("\u4E0D\u652F\u6301\u7684\u820D\u5165\u89C4\u5219: ".concat(rule));
             case 22:
@@ -2181,11 +2306,11 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
               finalAmount = roundedValue.mul(roundingInterval);
               originalAmountStr = amount.toFixed(2); // 如果最终金额是 0 元，则不采用舍入金额，返回原始金额
               if (!finalAmount.eq(0)) {
-                _context26.next = 27;
+                _context28.next = 27;
                 break;
               }
               console.log("[PaymentModule] \u6700\u7EC8\u91D1\u989D\u4E3A0\uFF0C\u8FD4\u56DE\u539F\u59CB\u91D1\u989D: ".concat(originalAmountStr));
-              return _context26.abrupt("return", {
+              return _context28.abrupt("return", {
                 originalAmount: originalAmountStr,
                 roundedAmount: originalAmountStr,
                 roundingDifference: '0.00'
@@ -2195,23 +2320,23 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
               roundingDifference = finalAmount.sub(amount);
               roundingDifferenceStr = roundingDifference.toFixed(2);
               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", {
+              return _context28.abrupt("return", {
                 originalAmount: originalAmountStr,
                 roundedAmount: roundedAmountStr,
                 roundingDifference: roundingDifferenceStr
               });
             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)));
+              _context28.prev = 34;
+              _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 38:
             case "end":
-              return _context26.stop();
+              return _context28.stop();
           }
-        }, _callee26, this, [[0, 34]]);
+        }, _callee28, this, [[0, 34]]);
       }));
-      function roundAmountAsync(_x28, _x29, _x30) {
+      function roundAmountAsync(_x29, _x30, _x31) {
         return _roundAmountAsync.apply(this, arguments);
       }
       return roundAmountAsync;