@pisell/pisellos 2.1.28 → 2.1.29

package/dist/modules/Payment/index.js

@@ -1808,7 +1808,7 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
           // 例如：amount=15, rounding_amount=-0.2，有效支付=15.2（抹掉0.2元零头）
           var paymentAmount = new Decimal(payment.amount || 0);
           var roundingAmount = new Decimal(payment.rounding_amount || 0);
-          var effectiveAmount = paymentAmount.plus(roundingAmount.abs());
+          var effectiveAmount = paymentAmount.plus(roundingAmount.isNegative() ? roundingAmount.abs() : 0);
           return sum.plus(effectiveAmount);
         } catch (error) {
           console.warn("[PaymentModule] \u65E0\u6548\u7684\u652F\u4ED8\u91D1\u989D: amount=".concat(payment.amount, ", rounding_amount=").concat(payment.rounding_amount, "\uFF0C\u8DF3\u8FC7\u8BA1\u7B97"));
@@ -1836,7 +1836,7 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
             code: p.code,
             amount: p.amount,
             rounding_amount: p.rounding_amount || '0.00',
-            effective_amount: new Decimal(p.amount || 0).plus(new Decimal(p.rounding_amount || 0).abs()).toFixed(2)
+            effective_amount: new Decimal(p.amount || 0).plus(new Decimal(Number(p.rounding_amount) > 0 ? 0 : p.rounding_amount || 0).abs()).toFixed(2)
           };
         }),
         说明: '有效支付金额包含抹零计算（amount + |rounding_amount|）'

package/dist/solution/Checkout/index.d.ts

@@ -310,6 +310,10 @@ export declare class CheckoutImpl extends BaseModule implements Module, Checkout
      * 计算剩余未支付金额（从 Payment 模块获取最新数据）
      */
     private calculateRemainingAmountAsync;
+    /**
+     * 计算剩余未支付金额（排除定金计算，始终使用订单总金额）
+     */
+    private calculateRemainingTotalAmountAsync;
     /**
      * 更新 balanceDueAmount 为当前剩余未支付金额（系统内部计算）
      */

package/dist/solution/Checkout/index.js

@@ -740,7 +740,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               });
               paidAmount = activePayments.reduce(function (sum, p) {
                 var amt = new Decimal(p.amount || '0');
-                var rounding = new Decimal(p.rounding_amount || '0').abs();
+                var rounding = new Decimal(Number(p.rounding_amount) > 0 ? 0 : p.rounding_amount || '0').abs();
                 return sum.plus(amt).plus(rounding);
               }, new Decimal(0));
               remaining = Decimal.max(0, totalAmount.minus(paidAmount)).toFixed(2); // 计算是否需要支付定金，如果需要默认切换到定金模式，以及记录定金总金额，并把当前默认待付金额调整为定金总金额
@@ -795,7 +795,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               // 需要减去已经同步给后端的支付过的钱
               syncedAmount = activePayments.reduce(function (sum, p) {
                 var amt = new Decimal(p.amount || '0');
-                var rounding = new Decimal(p.rounding_amount || '0').abs();
+                var rounding = new Decimal(Number(p.rounding_amount) > 0 ? 0 : p.rounding_amount || '0').abs();
                 return sum.plus(amt).plus(rounding);
               }, new Decimal(0));
               remainingExpectAmount = Decimal.max(0, totalAmount.minus(syncedAmount)).toFixed(2); // 要计算一个总价的差值和一个定金的差值，如果定金的差值>0，则需要使用定金的差值，否则使用总价的差值
@@ -2777,7 +2777,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 // 使用 Decimal.js 计算实际支付有效金额：
                 // 当 rounding_amount 为负数时，表示抹掉的金额，应该按绝对值加到实际支付中
                 // 例如：amount=15, rounding_amount=-0.2，实际相当于支付了15.2（抹掉了0.2元的零头）
-                var effectiveAmount = amount.add(roundingAmount.abs());
+                var effectiveAmount = amount.add(roundingAmount.isNegative() ? roundingAmount.abs() : 0);
                 console.log("[Checkout] \u8BA1\u7B97\u652F\u4ED8\u9879: ".concat(payment.code), {
                   originalAmount: amount.toFixed(2),
                   roundingAmount: roundingAmount.toFixed(2),
@@ -2860,60 +2860,107 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
       return calculateRemainingAmountAsync;
     }()
     /**
-     * 更新 balanceDueAmount 为当前剩余未支付金额（系统内部计算）
+     * 计算剩余未支付金额（排除定金计算，始终使用订单总金额）
      */
     )
   }, {
-    key: "updateBalanceDueAmount",
+    key: "calculateRemainingTotalAmountAsync",
     value: (function () {
-      var _updateBalanceDueAmount = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee33() {
-        var remainingAmount, currentBalanceDueAmount;
+      var _calculateRemainingTotalAmountAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee33() {
+        var totalAmount, paidAmountStr, paidAmount, remainingAmount, result;
         return _regeneratorRuntime().wrap(function _callee33$(_context33) {
           while (1) switch (_context33.prev = _context33.next) {
             case 0:
-              _context33.prev = 0;
-              _context33.next = 3;
+              if (this.store.currentOrder) {
+                _context33.next = 3;
+                break;
+              }
+              this.logWarning('calculateRemainingTotalAmountAsync: 没有当前订单');
+              return _context33.abrupt("return", '0.00');
+            case 3:
+              // 使用 Decimal.js 进行安全的金额计算
+              // 始终使用订单总金额，不进行定金相关的计算
+              totalAmount = new Decimal(this.store.currentOrder.total_amount || '0');
+              _context33.next = 6;
+              return this.calculatePaidAmountAsync();
+            case 6:
+              paidAmountStr = _context33.sent;
+              paidAmount = new Decimal(paidAmountStr);
+              remainingAmount = totalAmount.sub(paidAmount); // 确保剩余金额不为负数
+              result = Decimal.max(0, remainingAmount).toFixed(2);
+              this.logInfo('calculateRemainingTotalAmountAsync: 计算=', result);
+              return _context33.abrupt("return", result);
+            case 12:
+            case "end":
+              return _context33.stop();
+          }
+        }, _callee33, this);
+      }));
+      function calculateRemainingTotalAmountAsync() {
+        return _calculateRemainingTotalAmountAsync.apply(this, arguments);
+      }
+      return calculateRemainingTotalAmountAsync;
+    }()
+    /**
+     * 更新 balanceDueAmount 为当前剩余未支付金额（系统内部计算）
+     */
+    )
+  }, {
+    key: "updateBalanceDueAmount",
+    value: (function () {
+      var _updateBalanceDueAmount = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee34() {
+        var remainingAmount, remainingTotalAmount, currentBalanceDueAmount;
+        return _regeneratorRuntime().wrap(function _callee34$(_context34) {
+          while (1) switch (_context34.prev = _context34.next) {
+            case 0:
+              _context34.prev = 0;
+              _context34.next = 3;
               return this.calculateRemainingAmountAsync();
             case 3:
-              remainingAmount = _context33.sent;
+              remainingAmount = _context34.sent;
+              _context34.next = 6;
+              return this.calculateRemainingTotalAmountAsync();
+            case 6:
+              remainingTotalAmount = _context34.sent;
               currentBalanceDueAmount = this.store.balanceDueAmount; // 只有当剩余金额与当前 balanceDueAmount 不同时才更新
               if (!(remainingAmount !== currentBalanceDueAmount)) {
-                _context33.next = 12;
+                _context34.next = 15;
                 break;
               }
               this.store.balanceDueAmount = remainingAmount;
 
               // 发出 balanceDueAmount 变更事件
-              _context33.next = 9;
+              _context34.next = 12;
               return this.core.effects.emit(CheckoutHooks.OnBalanceDueAmountChanged, {
                 oldAmount: currentBalanceDueAmount,
                 newAmount: remainingAmount,
-                timestamp: Date.now()
+                timestamp: Date.now(),
+                totalAmount: remainingTotalAmount
               });
-            case 9:
+            case 12:
               this.logInfo('balanceDueAmount 已自动更新:', {
                 oldAmount: currentBalanceDueAmount,
                 newAmount: remainingAmount
               });
-              _context33.next = 13;
+              _context34.next = 16;
               break;
-            case 12:
+            case 15:
               this.logInfo('balanceDueAmount 无需更新，当前值已是最新:', {
                 balanceDueAmount: currentBalanceDueAmount,
                 remainingAmount: remainingAmount
               });
-            case 13:
-              _context33.next = 18;
+            case 16:
+              _context34.next = 21;
               break;
-            case 15:
-              _context33.prev = 15;
-              _context33.t0 = _context33["catch"](0);
-              this.logError('更新 balanceDueAmount 失败:', _context33.t0);
             case 18:
+              _context34.prev = 18;
+              _context34.t0 = _context34["catch"](0);
+              this.logError('更新 balanceDueAmount 失败:', _context34.t0);
+            case 21:
             case "end":
-              return _context33.stop();
+              return _context34.stop();
           }
-        }, _callee33, this, [[0, 15]]);
+        }, _callee34, this, [[0, 18]]);
       }));
       function updateBalanceDueAmount() {
         return _updateBalanceDueAmount.apply(this, arguments);
@@ -2927,7 +2974,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "updateStateAmountToRemaining",
     value: (function () {
-      var _updateStateAmountToRemaining = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee34() {
+      var _updateStateAmountToRemaining = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee35() {
         var checkOrder,
           _this$store$currentOr23,
           _this$store$currentOr24,
@@ -2936,21 +2983,22 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
           depositPaidAmount,
           _this$store$currentOr26,
           remainingAmount,
+          remainingTotalAmount,
           currentStateAmount,
-          _args34 = arguments;
-        return _regeneratorRuntime().wrap(function _callee34$(_context34) {
-          while (1) switch (_context34.prev = _context34.next) {
+          _args35 = arguments;
+        return _regeneratorRuntime().wrap(function _callee35$(_context35) {
+          while (1) switch (_context35.prev = _context35.next) {
             case 0:
-              checkOrder = _args34.length > 0 && _args34[0] !== undefined ? _args34[0] : true;
-              _context34.prev = 1;
+              checkOrder = _args35.length > 0 && _args35[0] !== undefined ? _args35[0] : true;
+              _context35.prev = 1;
               if (!(((_this$store$currentOr23 = this.store.currentOrder) === null || _this$store$currentOr23 === void 0 ? void 0 : _this$store$currentOr23.is_deposit) === 1)) {
-                _context34.next = 11;
+                _context35.next = 11;
                 break;
               }
-              _context34.next = 5;
+              _context35.next = 5;
               return this.payment.getPaymentItemsAsync((_this$store$currentOr24 = this.store.currentOrder) === null || _this$store$currentOr24 === void 0 ? void 0 : _this$store$currentOr24.uuid);
             case 5:
-              paymentItems = _context34.sent;
+              paymentItems = _context35.sent;
               depositPaidAmount = paymentItems.filter(function (item) {
                 return item.order_payment_type === 'deposit' && item.status !== 'voided';
               }).reduce(function (sum, item) {
@@ -2960,24 +3008,28 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 }
                 var amount = new Decimal(item.amount || '0');
                 var roundingAmount = new Decimal(item.rounding_amount || '0');
-                return sum.add(amount.add(roundingAmount.abs()));
+                return sum.add(amount.add(roundingAmount.isNegative() ? roundingAmount.abs() : 0));
               }, new Decimal(0));
               if (!depositPaidAmount.gte((_this$store$currentOr25 = this.store.currentOrder) === null || _this$store$currentOr25 === void 0 ? void 0 : _this$store$currentOr25.deposit_amount)) {
-                _context34.next = 11;
+                _context35.next = 11;
                 break;
               }
               this.store.currentOrder = _objectSpread(_objectSpread({}, this.store.currentOrder), {}, {
                 is_deposit: 0
               });
-              _context34.next = 11;
+              _context35.next = 11;
               return this.payment.updateOrderAsync((_this$store$currentOr26 = this.store.currentOrder) === null || _this$store$currentOr26 === void 0 ? void 0 : _this$store$currentOr26.uuid, {
                 is_deposit: 0
               });
             case 11:
-              _context34.next = 13;
+              _context35.next = 13;
               return this.calculateRemainingAmountAsync();
             case 13:
-              remainingAmount = _context34.sent;
+              remainingAmount = _context35.sent;
+              _context35.next = 16;
+              return this.calculateRemainingTotalAmountAsync();
+            case 16:
+              remainingTotalAmount = _context35.sent;
               currentStateAmount = this.store.stateAmount; // 只有当剩余金额与当前 stateAmount 不同时才更新
               if (remainingAmount !== currentStateAmount) {
                 this.store.stateAmount = remainingAmount;
@@ -2986,7 +3038,8 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 this.core.effects.emit(CheckoutHooks.OnStateAmountChanged, {
                   oldAmount: currentStateAmount,
                   newAmount: remainingAmount,
-                  timestamp: Date.now()
+                  timestamp: Date.now(),
+                  totalAmount: remainingTotalAmount
                 });
                 this.logInfo('stateAmount 已自动更新为剩余金额:', {
                   oldAmount: currentStateAmount,
@@ -2999,32 +3052,32 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 });
               }
               // 同步更新系统内部的 balanceDueAmount
-              _context34.next = 18;
+              _context35.next = 21;
               return this.updateBalanceDueAmount();
-            case 18:
+            case 21:
               if (!checkOrder) {
-                _context34.next = 23;
+                _context35.next = 26;
                 break;
               }
-              _context34.next = 21;
+              _context35.next = 24;
               return this.checkOrderPaymentCompletion();
-            case 21:
-              _context34.next = 24;
-              break;
-            case 23:
-              this.logInfo('外部传入无需 checkOrder，不执行订单支付完成检测和同步');
             case 24:
-              _context34.next = 29;
+              _context35.next = 27;
               break;
             case 26:
-              _context34.prev = 26;
-              _context34.t0 = _context34["catch"](1);
-              this.logError('更新 stateAmount 为剩余金额失败:', _context34.t0);
+              this.logInfo('外部传入无需 checkOrder，不执行订单支付完成检测和同步');
+            case 27:
+              _context35.next = 32;
+              break;
             case 29:
+              _context35.prev = 29;
+              _context35.t0 = _context35["catch"](1);
+              this.logError('更新 stateAmount 为剩余金额失败:', _context35.t0);
+            case 32:
             case "end":
-              return _context34.stop();
+              return _context35.stop();
           }
-        }, _callee34, this, [[1, 26]]);
+        }, _callee35, this, [[1, 29]]);
       }));
       function updateStateAmountToRemaining() {
         return _updateStateAmountToRemaining.apply(this, arguments);
@@ -3040,32 +3093,32 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "checkOrderPaymentCompletion",
     value: (function () {
-      var _checkOrderPaymentCompletion = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee35() {
+      var _checkOrderPaymentCompletion = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee36() {
         var remainingAmount, remainingValue, totalAmount, paidAmount, currentPayments, hasPaymentItems, allPaymentsHaveVoucherId, shouldAutoSync;
-        return _regeneratorRuntime().wrap(function _callee35$(_context35) {
-          while (1) switch (_context35.prev = _context35.next) {
+        return _regeneratorRuntime().wrap(function _callee36$(_context36) {
+          while (1) switch (_context36.prev = _context36.next) {
             case 0:
-              _context35.prev = 0;
+              _context36.prev = 0;
               if (this.store.currentOrder) {
-                _context35.next = 3;
+                _context36.next = 3;
                 break;
               }
-              return _context35.abrupt("return");
+              return _context36.abrupt("return");
             case 3:
-              _context35.next = 5;
+              _context36.next = 5;
               return this.calculateRemainingAmountAsync();
             case 5:
-              remainingAmount = _context35.sent;
+              remainingAmount = _context36.sent;
               remainingValue = new Decimal(remainingAmount); // 当剩余金额小于等于0时，认为订单已完成支付
               if (!remainingValue.lte(0)) {
-                _context35.next = 29;
+                _context36.next = 29;
                 break;
               }
               totalAmount = this.store.currentOrder.total_amount;
-              _context35.next = 11;
+              _context36.next = 11;
               return this.calculatePaidAmountAsync();
             case 11:
-              paidAmount = _context35.sent;
+              paidAmount = _context36.sent;
               this.logInfo('检测到订单支付完成:', {
                 orderUuid: this.store.currentOrder.uuid,
                 orderId: this.store.currentOrder.order_id,
@@ -3076,11 +3129,11 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               });
 
               // 从 Payment 模块获取最新支付项，检查自动同步条件
-              _context35.next = 15;
+              _context36.next = 15;
               return this.payment.getPaymentItemsAsync(this.store.currentOrder.uuid, false // 不包括已撤销的支付项
               );
             case 15:
-              currentPayments = _context35.sent;
+              currentPayments = _context36.sent;
               // 检查自动同步条件：
               // 1. 待付金额为 0 ✓ (已在上面检查)
               // 2. 需要有支付项
@@ -3107,21 +3160,21 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                     code: p.code,
                     amount: p.amount,
                     rounding_amount: p.rounding_amount,
-                    effective_amount: (parseFloat(p.amount || '0') + Math.abs(parseFloat(p.rounding_amount || '0'))).toFixed(2),
+                    effective_amount: (parseFloat(p.amount || '0') + Math.abs(parseFloat(Number(p.rounding_amount) > 0 ? '0' : p.rounding_amount || '0'))).toFixed(2),
                     voucher_id: p.voucher_id,
                     status: p.status
                   };
                 })
               });
               if (!shouldAutoSync) {
-                _context35.next = 26;
+                _context36.next = 26;
                 break;
               }
               this.logInfo('满足自动同步条件，开始同步订单到后端...');
-              _context35.next = 24;
+              _context36.next = 24;
               return this.syncOrderToBackendWithReturn(false);
             case 24:
-              _context35.next = 27;
+              _context36.next = 27;
               break;
             case 26:
               if (!hasPaymentItems) {
@@ -3130,7 +3183,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 this.logInfo('所有支付项均为代金券类型，跳过订单同步');
               }
             case 27:
-              _context35.next = 29;
+              _context36.next = 29;
               return this.core.effects.emit(CheckoutHooks.OnOrderPaymentCompleted, {
                 orderUuid: this.store.currentOrder.uuid,
                 orderId: this.store.currentOrder.order_id,
@@ -3140,17 +3193,17 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 timestamp: Date.now()
               });
             case 29:
-              _context35.next = 34;
+              _context36.next = 34;
               break;
             case 31:
-              _context35.prev = 31;
-              _context35.t0 = _context35["catch"](0);
-              this.logError('检查订单支付完成状态失败:', _context35.t0);
+              _context36.prev = 31;
+              _context36.t0 = _context36["catch"](0);
+              this.logError('检查订单支付完成状态失败:', _context36.t0);
             case 34:
             case "end":
-              return _context35.stop();
+              return _context36.stop();
           }
-        }, _callee35, this, [[0, 31]]);
+        }, _callee36, this, [[0, 31]]);
       }));
       function checkOrderPaymentCompletion() {
         return _checkOrderPaymentCompletion.apply(this, arguments);
@@ -3168,7 +3221,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "syncOrderToBackendWithReturn",
     value: (function () {
-      var _syncOrderToBackendWithReturn = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee36() {
+      var _syncOrderToBackendWithReturn = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee37() {
         var _this4 = this,
           _this$store$currentOr27,
           _this$store$currentOr28,
@@ -3208,14 +3261,14 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
           _iterator3,
           _step3,
           paymentUuid,
-          _args36 = arguments;
-        return _regeneratorRuntime().wrap(function _callee36$(_context36) {
-          while (1) switch (_context36.prev = _context36.next) {
+          _args37 = arguments;
+        return _regeneratorRuntime().wrap(function _callee37$(_context37) {
+          while (1) switch (_context37.prev = _context37.next) {
             case 0:
-              isManual = _args36.length > 0 && _args36[0] !== undefined ? _args36[0] : false;
-              customPaymentItems = _args36.length > 1 ? _args36[1] : undefined;
+              isManual = _args37.length > 0 && _args37[0] !== undefined ? _args37[0] : false;
+              customPaymentItems = _args37.length > 1 ? _args37[1] : undefined;
               if (!(!this.store.localOrderData || !this.store.currentOrder)) {
-                _context36.next = 4;
+                _context37.next = 4;
                 break;
               }
               throw new Error('缺少必要的订单数据，无法同步到后端');
@@ -3234,17 +3287,17 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               });
 
               // 获取当前订单的支付项
-              _context36.t0 = customPaymentItems;
-              if (_context36.t0) {
-                _context36.next = 13;
+              _context37.t0 = customPaymentItems;
+              if (_context37.t0) {
+                _context37.next = 13;
                 break;
               }
-              _context36.next = 12;
+              _context37.next = 12;
               return this.payment.getPaymentItemsAsync(this.store.currentOrder.uuid);
             case 12:
-              _context36.t0 = _context36.sent;
+              _context37.t0 = _context37.sent;
             case 13:
-              paymentItems = _context36.t0;
+              paymentItems = _context37.t0;
               // 处理支付项数据，确保包含完整的 metadata
               processedPaymentItems = paymentItems.map(function (item) {
                 var _item$metadata, _item$metadata2;
@@ -3368,7 +3421,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
 
               // 发送下单接口请求开始事件
               startTime = Date.now();
-              _context36.next = 27;
+              _context37.next = 27;
               return this.core.effects.emit(CheckoutHooks.OnOrderSubmitStart, {
                 orderUuid: this.store.currentOrder.uuid,
                 operation: isUpdateOperation ? 'update' : 'create',
@@ -3378,7 +3431,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               });
             case 27:
               submitSuccess = false;
-              _context36.prev = 28;
+              _context37.prev = 28;
               // 记录接口调用参数
               this.logInfo('Calling backend checkout API', _objectSpread({
                 url: '/order/checkout',
@@ -3386,23 +3439,23 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               }, orderParams));
 
               // 调用 Order 模块的专用 createOrderByCheckout 方法
-              _context36.next = 32;
+              _context37.next = 32;
               return this.order.createOrderByCheckout(orderParams);
             case 32:
-              checkoutResponse = _context36.sent;
+              checkoutResponse = _context37.sent;
               submitSuccess = true;
               this.logInfo('下单接口调用成功', checkoutResponse);
-              _context36.next = 45;
+              _context37.next = 45;
               break;
             case 37:
-              _context36.prev = 37;
-              _context36.t1 = _context36["catch"](28);
+              _context37.prev = 37;
+              _context37.t1 = _context37["catch"](28);
               submitSuccess = false;
-              submitError = _context36.t1 instanceof Error ? _context36.t1.message : String(_context36.t1);
+              submitError = _context37.t1 instanceof Error ? _context37.t1.message : String(_context37.t1);
               this.logError('下单接口调用失败:', submitError);
 
               // 发送订单同步失败事件（网络错误或请求失败）
-              _context36.next = 44;
+              _context37.next = 44;
               return this.core.effects.emit(CheckoutHooks.OnOrderSyncFailed, {
                 orderUuid: this.store.currentOrder.uuid,
                 operation: isUpdateOperation ? 'update' : 'create',
@@ -3413,10 +3466,10 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 timestamp: Date.now()
               });
             case 44:
-              throw _context36.t1;
+              throw _context37.t1;
             case 45:
-              _context36.prev = 45;
-              _context36.next = 48;
+              _context37.prev = 45;
+              _context37.next = 48;
               return this.core.effects.emit(CheckoutHooks.OnOrderSubmitEnd, {
                 success: submitSuccess,
                 orderUuid: this.store.currentOrder.uuid,
@@ -3428,17 +3481,17 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 timestamp: Date.now()
               });
             case 48:
-              return _context36.finish(45);
+              return _context37.finish(45);
             case 49:
               // 检查响应状态是否为成功状态
               responseStatus = (_checkoutResponse3 = checkoutResponse) === null || _checkoutResponse3 === void 0 ? void 0 : _checkoutResponse3.status;
               isSuccessResponse = responseStatus === true || responseStatus === 200 || responseStatus === 'success' || responseStatus === 1 && ((_checkoutResponse4 = checkoutResponse) === null || _checkoutResponse4 === void 0 ? void 0 : _checkoutResponse4.code) === 200;
               if (isSuccessResponse) {
-                _context36.next = 56;
+                _context37.next = 56;
                 break;
               }
               errorMessage = ((_checkoutResponse5 = checkoutResponse) === null || _checkoutResponse5 === void 0 ? void 0 : _checkoutResponse5.message) || '订单同步失败，后端返回非成功状态'; // 发送订单同步失败事件
-              _context36.next = 55;
+              _context37.next = 55;
               return this.core.effects.emit(CheckoutHooks.OnOrderSyncFailed, {
                 orderUuid: this.store.currentOrder.uuid,
                 operation: isUpdateOperation ? 'update' : 'create',
@@ -3453,12 +3506,12 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               throw new Error(errorMessage);
             case 56:
               if (!isUpdateOperation) {
-                _context36.next = 60;
+                _context37.next = 60;
                 break;
               }
               // 更新操作：使用现有的订单ID
               realOrderId = currentOrderId;
-              _context36.next = 79;
+              _context37.next = 79;
               break;
             case 60:
               // 创建操作：从响应中提取新的订单ID
@@ -3482,11 +3535,11 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 oldOrderId: this.store.currentOrder.order_id,
                 newOrderId: realOrderId
               });
-              _context36.prev = 66;
-              _context36.next = 69;
+              _context37.prev = 66;
+              _context37.next = 69;
               return this.payment.replaceOrderIdByUuidAsync(this.store.currentOrder.uuid, realOrderId);
             case 69:
-              updatedOrder = _context36.sent;
+              updatedOrder = _context37.sent;
               this.logInfo('Payment模块替换订单ID结果:', {
                 wasSuccessful: !!updatedOrder,
                 returnedOrderId: updatedOrder === null || updatedOrder === void 0 ? void 0 : updatedOrder.order_id,
@@ -3512,66 +3565,66 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                   目标ID: realOrderId
                 });
               }
-              _context36.next = 79;
+              _context37.next = 79;
               break;
             case 74:
-              _context36.prev = 74;
-              _context36.t2 = _context36["catch"](66);
-              this.logError('调用Payment模块替换订单ID时发生错误:', _context36.t2);
+              _context37.prev = 74;
+              _context37.t2 = _context37["catch"](66);
+              this.logError('调用Payment模块替换订单ID时发生错误:', _context37.t2);
 
               // 发生错误时也进行手动替换
               this.store.currentOrder.order_id = realOrderId;
               this.logInfo('错误恢复：手动设置订单ID:', realOrderId);
             case 79:
-              _context36.prev = 79;
+              _context37.prev = 79;
               syncedPaymentUuids = processedPaymentItems.filter(function (item) {
                 return item.status !== 'voided';
               }).map(function (item) {
                 return item.uuid;
               }).filter(Boolean);
               _iterator3 = _createForOfIteratorHelper(syncedPaymentUuids);
-              _context36.prev = 82;
+              _context37.prev = 82;
               _iterator3.s();
             case 84:
               if ((_step3 = _iterator3.n()).done) {
-                _context36.next = 90;
+                _context37.next = 90;
                 break;
               }
               paymentUuid = _step3.value;
-              _context36.next = 88;
+              _context37.next = 88;
               return this.payment.updatePaymentAsync(this.store.currentOrder.uuid, paymentUuid, {
                 isSynced: true,
                 syncError: undefined
               });
             case 88:
-              _context36.next = 84;
+              _context37.next = 84;
               break;
             case 90:
-              _context36.next = 95;
+              _context37.next = 95;
               break;
             case 92:
-              _context36.prev = 92;
-              _context36.t3 = _context36["catch"](82);
-              _iterator3.e(_context36.t3);
+              _context37.prev = 92;
+              _context37.t3 = _context37["catch"](82);
+              _iterator3.e(_context37.t3);
             case 95:
-              _context36.prev = 95;
+              _context37.prev = 95;
               _iterator3.f();
-              return _context36.finish(95);
+              return _context37.finish(95);
             case 98:
-              _context36.next = 103;
+              _context37.next = 103;
               break;
             case 100:
-              _context36.prev = 100;
-              _context36.t4 = _context36["catch"](79);
+              _context37.prev = 100;
+              _context37.t4 = _context37["catch"](79);
               this.logWarning('标记支付项已同步失败（不阻塞主流程）', {
-                error: _context36.t4
+                error: _context37.t4
               });
             case 103:
               // 标记订单已同步
               this.store.isOrderSynced = true;
 
               // 触发订单同步完成事件
-              _context36.next = 106;
+              _context37.next = 106;
               return this.core.effects.emit(CheckoutHooks.OnOrderSynced, {
                 orderUuid: this.store.currentOrder.uuid,
                 realOrderId: realOrderId,
@@ -3581,7 +3634,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 response: checkoutResponse
               });
             case 106:
-              return _context36.abrupt("return", {
+              return _context37.abrupt("return", {
                 success: true,
                 orderId: realOrderId,
                 orderUuid: this.store.currentOrder.uuid,
@@ -3589,9 +3642,9 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               });
             case 107:
             case "end":
-              return _context36.stop();
+              return _context37.stop();
           }
-        }, _callee36, this, [[28, 37, 45, 49], [66, 74], [79, 100], [82, 92, 95, 98]]);
+        }, _callee37, this, [[28, 37, 45, 49], [66, 74], [79, 100], [82, 92, 95, 98]]);
       }));
       function syncOrderToBackendWithReturn() {
         return _syncOrderToBackendWithReturn.apply(this, arguments);
@@ -3601,15 +3654,15 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "setOtherParams",
     value: function () {
-      var _setOtherParams = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee37(params) {
+      var _setOtherParams = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee38(params) {
         var _ref5,
           _ref5$cover,
           cover,
-          _args37 = arguments;
-        return _regeneratorRuntime().wrap(function _callee37$(_context37) {
-          while (1) switch (_context37.prev = _context37.next) {
+          _args38 = arguments;
+        return _regeneratorRuntime().wrap(function _callee38$(_context38) {
+          while (1) switch (_context38.prev = _context38.next) {
             case 0:
-              _ref5 = _args37.length > 1 && _args37[1] !== undefined ? _args37[1] : {}, _ref5$cover = _ref5.cover, cover = _ref5$cover === void 0 ? false : _ref5$cover;
+              _ref5 = _args38.length > 1 && _args38[1] !== undefined ? _args38[1] : {}, _ref5$cover = _ref5.cover, cover = _ref5$cover === void 0 ? false : _ref5$cover;
               if (cover) {
                 this.otherParams = params;
               } else {
@@ -3617,9 +3670,9 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               }
             case 2:
             case "end":
-              return _context37.stop();
+              return _context38.stop();
           }
-        }, _callee37, this);
+        }, _callee38, this);
       }));
       function setOtherParams(_x27) {
         return _setOtherParams.apply(this, arguments);
@@ -3638,22 +3691,22 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "editOrderNoteByOrderIdAsync",
     value: (function () {
-      var _editOrderNoteByOrderIdAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee38(orderId, note) {
+      var _editOrderNoteByOrderIdAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee39(orderId, note) {
         var response, previousNote, errorMessage, _errorMessage;
-        return _regeneratorRuntime().wrap(function _callee38$(_context38) {
-          while (1) switch (_context38.prev = _context38.next) {
+        return _regeneratorRuntime().wrap(function _callee39$(_context39) {
+          while (1) switch (_context39.prev = _context39.next) {
             case 0:
               this.logInfo('editOrderNoteByOrderIdAsync called', {
                 orderId: orderId,
                 note: note,
                 noteLength: note.length
               });
-              _context38.prev = 1;
+              _context39.prev = 1;
               if (orderId) {
-                _context38.next = 4;
+                _context39.next = 4;
                 break;
               }
-              return _context38.abrupt("return", {
+              return _context39.abrupt("return", {
                 success: false,
                 message: '订单ID不能为空',
                 orderId: orderId
@@ -3669,12 +3722,12 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               });
 
               // 调用后端API修改订单备注
-              _context38.next = 7;
+              _context39.next = 7;
               return this.request.put("/order/order/".concat(orderId, "/note"), {
                 note: note
               });
             case 7:
-              response = _context38.sent;
+              response = _context39.sent;
               this.logInfo('订单备注编辑响应:', {
                 orderId: orderId,
                 status: response.status,
@@ -3684,11 +3737,11 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
 
               // 检查响应状态
               if (!(response.status === true || response.status === 200)) {
-                _context38.next = 18;
+                _context39.next = 18;
                 break;
               }
               if (!(this.store.currentOrder && (String(this.store.currentOrder.order_id) === String(orderId) || String(this.store.currentOrder.id) === String(orderId)))) {
-                _context38.next = 15;
+                _context39.next = 15;
                 break;
               }
               // 获取修改前的备注用于事件
@@ -3698,7 +3751,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               }
 
               // 触发订单备注变更事件
-              _context38.next = 15;
+              _context39.next = 15;
               return this.core.effects.emit(CheckoutHooks.OnOrderNoteChanged, {
                 orderUuid: this.store.currentOrder.uuid,
                 oldNote: previousNote,
@@ -3706,7 +3759,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 timestamp: Date.now()
               });
             case 15:
-              return _context38.abrupt("return", {
+              return _context39.abrupt("return", {
                 success: true,
                 message: response.message || '订单备注修改成功',
                 orderId: orderId
@@ -3715,29 +3768,29 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               // API返回失败状态
               errorMessage = response.message || '订单备注修改失败';
               this.logError("\u8BA2\u5355 ".concat(orderId, " \u5907\u6CE8\u4FEE\u6539\u5931\u8D25:"), errorMessage);
-              return _context38.abrupt("return", {
+              return _context39.abrupt("return", {
                 success: false,
                 message: errorMessage,
                 orderId: orderId
               });
             case 21:
-              _context38.next = 28;
+              _context39.next = 28;
               break;
             case 23:
-              _context38.prev = 23;
-              _context38.t0 = _context38["catch"](1);
-              this.logError('编辑订单备注失败:', _context38.t0);
-              _errorMessage = _context38.t0 instanceof Error ? _context38.t0.message : '网络错误或服务器异常';
-              return _context38.abrupt("return", {
+              _context39.prev = 23;
+              _context39.t0 = _context39["catch"](1);
+              this.logError('编辑订单备注失败:', _context39.t0);
+              _errorMessage = _context39.t0 instanceof Error ? _context39.t0.message : '网络错误或服务器异常';
+              return _context39.abrupt("return", {
                 success: false,
                 message: "\u7F16\u8F91\u8BA2\u5355\u5907\u6CE8\u5931\u8D25: ".concat(_errorMessage),
                 orderId: orderId
               });
             case 28:
             case "end":
-              return _context38.stop();
+              return _context39.stop();
           }
-        }, _callee38, this, [[1, 23]]);
+        }, _callee39, this, [[1, 23]]);
       }));
       function editOrderNoteByOrderIdAsync(_x28, _x29) {
         return _editOrderNoteByOrderIdAsync.apply(this, arguments);
@@ -3756,11 +3809,11 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "sendCustomerPayLinkAsync",
     value: (function () {
-      var _sendCustomerPayLinkAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee39(params) {
+      var _sendCustomerPayLinkAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee40(params) {
         var _params$order_ids, _params$emails;
         var emailRegex, invalidEmails, requestBody, response, errorMessage, _errorMessage2;
-        return _regeneratorRuntime().wrap(function _callee39$(_context39) {
-          while (1) switch (_context39.prev = _context39.next) {
+        return _regeneratorRuntime().wrap(function _callee40$(_context40) {
+          while (1) switch (_context40.prev = _context40.next) {
             case 0:
               this.logInfo('sendCustomerPayLinkAsync called', {
                 orderIds: params.order_ids,
@@ -3769,21 +3822,21 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 emailsCount: ((_params$emails = params.emails) === null || _params$emails === void 0 ? void 0 : _params$emails.length) || 0,
                 notifyAction: params.notify_action || 'order_payment_reminder'
               });
-              _context39.prev = 1;
+              _context40.prev = 1;
               if (!(!params.order_ids || params.order_ids.length === 0)) {
-                _context39.next = 4;
+                _context40.next = 4;
                 break;
               }
-              return _context39.abrupt("return", {
+              return _context40.abrupt("return", {
                 success: false,
                 message: '订单ID列表不能为空'
               });
             case 4:
               if (!(!params.emails || params.emails.length === 0)) {
-                _context39.next = 6;
+                _context40.next = 6;
                 break;
               }
-              return _context39.abrupt("return", {
+              return _context40.abrupt("return", {
                 success: false,
                 message: '邮箱地址列表不能为空'
               });
@@ -3794,10 +3847,10 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 return !emailRegex.test(email);
               });
               if (!(invalidEmails.length > 0)) {
-                _context39.next = 10;
+                _context40.next = 10;
                 break;
               }
-              return _context39.abrupt("return", {
+              return _context40.abrupt("return", {
                 success: false,
                 message: "\u90AE\u7BB1\u683C\u5F0F\u65E0\u6548: ".concat(invalidEmails.join(', '))
               });
@@ -3813,10 +3866,10 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               }, requestBody));
 
               // 调用后端API发送邮件
-              _context39.next = 14;
+              _context40.next = 14;
               return this.request.post('/order/batch-email', requestBody);
             case 14:
-              response = _context39.sent;
+              response = _context40.sent;
               this.logInfo('支付链接邮件发送响应:', {
                 status: response.status,
                 message: response.message,
@@ -3826,10 +3879,10 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
 
               // 检查响应状态
               if (!(response.status === true || response.status === 200)) {
-                _context39.next = 20;
+                _context40.next = 20;
                 break;
               }
-              return _context39.abrupt("return", {
+              return _context40.abrupt("return", {
                 success: true,
                 message: response.message || '支付链接邮件发送成功'
               });
@@ -3837,27 +3890,27 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               // API返回失败状态
               errorMessage = response.message || '支付链接邮件发送失败';
               console.error('[Checkout] 支付链接邮件发送失败:', errorMessage);
-              return _context39.abrupt("return", {
+              return _context40.abrupt("return", {
                 success: false,
                 message: errorMessage
               });
             case 23:
-              _context39.next = 30;
+              _context40.next = 30;
               break;
             case 25:
-              _context39.prev = 25;
-              _context39.t0 = _context39["catch"](1);
-              this.logError('发送客户支付链接邮件失败:', _context39.t0);
-              _errorMessage2 = _context39.t0 instanceof Error ? _context39.t0.message : '网络错误或服务器异常';
-              return _context39.abrupt("return", {
+              _context40.prev = 25;
+              _context40.t0 = _context40["catch"](1);
+              this.logError('发送客户支付链接邮件失败:', _context40.t0);
+              _errorMessage2 = _context40.t0 instanceof Error ? _context40.t0.message : '网络错误或服务器异常';
+              return _context40.abrupt("return", {
                 success: false,
                 message: "\u53D1\u9001\u652F\u4ED8\u94FE\u63A5\u90AE\u4EF6\u5931\u8D25: ".concat(_errorMessage2)
               });
             case 30:
             case "end":
-              return _context39.stop();
+              return _context40.stop();
           }
-        }, _callee39, this, [[1, 25]]);
+        }, _callee40, this, [[1, 25]]);
       }));
       function sendCustomerPayLinkAsync(_x30) {
         return _sendCustomerPayLinkAsync.apply(this, arguments);
@@ -3874,22 +3927,36 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "roundAmountAsync",
     value: (function () {
-      var _roundAmountAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee40(amount) {
-        var _this$otherParams$ord, _this$otherParams$ord2;
-        var result;
-        return _regeneratorRuntime().wrap(function _callee40$(_context40) {
-          while (1) switch (_context40.prev = _context40.next) {
+      var _roundAmountAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee41(amount) {
+        var _cashManualPayment$me, _this$otherParams$ord, _this$otherParams$ord2;
+        var cashManualPayment, result;
+        return _regeneratorRuntime().wrap(function _callee41$(_context41) {
+          while (1) switch (_context41.prev = _context41.next) {
             case 0:
-              _context40.next = 2;
+              // 检查 CASHMANUAL 的支付项是否开启了舍入，如果没开直接返回 amount
+              cashManualPayment = this.store.paymentMethods.find(function (p) {
+                return p.code === 'CASHMANUAL';
+              });
+              if (cashManualPayment !== null && cashManualPayment !== void 0 && (_cashManualPayment$me = cashManualPayment.metadata) !== null && _cashManualPayment$me !== void 0 && _cashManualPayment$me.order_rounding_switch) {
+                _context41.next = 3;
+                break;
+              }
+              return _context41.abrupt("return", {
+                originalAmount: amount.toString(),
+                roundedAmount: amount.toString(),
+                roundingDifference: '0.00'
+              });
+            case 3:
+              _context41.next = 5;
               return this.payment.roundAmountAsync(amount, (_this$otherParams$ord = this.otherParams.order_rounding_setting) === null || _this$otherParams$ord === void 0 ? void 0 : _this$otherParams$ord.interval, (_this$otherParams$ord2 = this.otherParams.order_rounding_setting) === null || _this$otherParams$ord2 === void 0 ? void 0 : _this$otherParams$ord2.type);
-            case 2:
-              result = _context40.sent;
-              return _context40.abrupt("return", result);
-            case 4:
+            case 5:
+              result = _context41.sent;
+              return _context41.abrupt("return", result);
+            case 7:
             case "end":
-              return _context40.stop();
+              return _context41.stop();
           }
-        }, _callee40, this);
+        }, _callee41, this);
       }));
       function roundAmountAsync(_x31) {
         return _roundAmountAsync.apply(this, arguments);
@@ -3899,10 +3966,10 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "destroy",
     value: function () {
-      var _destroy = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee41() {
+      var _destroy = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee42() {
         var _this$order, _this$order$destroy, _this$payment, _this$payment$destroy;
-        return _regeneratorRuntime().wrap(function _callee41$(_context41) {
-          while (1) switch (_context41.prev = _context41.next) {
+        return _regeneratorRuntime().wrap(function _callee42$(_context42) {
+          while (1) switch (_context42.prev = _context42.next) {
             case 0:
               // 清理钱包模块的所有缓存数据
               this.payment.wallet.clearAllCache();
@@ -3911,10 +3978,10 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               this.core.effects.offByModuleDestroy(this.name);
 
               // 销毁子模块
-              _context41.next = 4;
+              _context42.next = 4;
               return (_this$order = this.order) === null || _this$order === void 0 || (_this$order$destroy = _this$order.destroy) === null || _this$order$destroy === void 0 ? void 0 : _this$order$destroy.call(_this$order);
             case 4:
-              _context41.next = 6;
+              _context42.next = 6;
               return (_this$payment = this.payment) === null || _this$payment === void 0 || (_this$payment$destroy = _this$payment.destroy) === null || _this$payment$destroy === void 0 ? void 0 : _this$payment$destroy.call(_this$payment);
             case 6:
               // 取消注册模块
@@ -3922,9 +3989,9 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               console.log('[Checkout] 已销毁');
             case 8:
             case "end":
-              return _context41.stop();
+              return _context42.stop();
           }
-        }, _callee41, this);
+        }, _callee42, this);
       }));
       function destroy() {
         return _destroy.apply(this, arguments);
@@ -3939,12 +4006,12 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "resetStoreStateAsync",
     value: (function () {
-      var _resetStoreStateAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee42() {
+      var _resetStoreStateAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee43() {
         var prevOrderInfo;
-        return _regeneratorRuntime().wrap(function _callee42$(_context42) {
-          while (1) switch (_context42.prev = _context42.next) {
+        return _regeneratorRuntime().wrap(function _callee43$(_context43) {
+          while (1) switch (_context43.prev = _context43.next) {
             case 0:
-              _context42.prev = 0;
+              _context43.prev = 0;
               prevOrderInfo = this.store.currentOrder ? {
                 uuid: this.store.currentOrder.uuid,
                 orderId: this.store.currentOrder.order_id
@@ -3973,26 +4040,26 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
 
               // 触发订单清理事件（如果之前有订单）
               if (!prevOrderInfo) {
-                _context42.next = 17;
+                _context43.next = 17;
                 break;
               }
-              _context42.next = 17;
+              _context43.next = 17;
               return this.core.effects.emit(CheckoutHooks.OnOrderCleared, {
                 previousOrder: prevOrderInfo,
                 timestamp: Date.now()
               });
             case 17:
-              _context42.next = 22;
+              _context43.next = 22;
               break;
             case 19:
-              _context42.prev = 19;
-              _context42.t0 = _context42["catch"](0);
-              console.error('[Checkout] 重置 store 状态失败:', _context42.t0);
+              _context43.prev = 19;
+              _context43.t0 = _context43["catch"](0);
+              console.error('[Checkout] 重置 store 状态失败:', _context43.t0);
             case 22:
             case "end":
-              return _context42.stop();
+              return _context43.stop();
           }
-        }, _callee42, this, [[0, 19]]);
+        }, _callee43, this, [[0, 19]]);
       }));
       function resetStoreStateAsync() {
         return _resetStoreStateAsync.apply(this, arguments);

package/lib/modules/Payment/index.js

@@ -913,7 +913,7 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
           }
           const paymentAmount = new import_decimal.Decimal(payment.amount || 0);
           const roundingAmount = new import_decimal.Decimal(payment.rounding_amount || 0);
-          const effectiveAmount = paymentAmount.plus(roundingAmount.abs());
+          const effectiveAmount = paymentAmount.plus(roundingAmount.isNegative() ? roundingAmount.abs() : 0);
           return sum.plus(effectiveAmount);
         } catch (error) {
           console.warn(`[PaymentModule] 无效的支付金额: amount=${payment.amount}, rounding_amount=${payment.rounding_amount}，跳过计算`);
@@ -935,7 +935,7 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
         code: p.code,
         amount: p.amount,
         rounding_amount: p.rounding_amount || "0.00",
-        effective_amount: new import_decimal.Decimal(p.amount || 0).plus(new import_decimal.Decimal(p.rounding_amount || 0).abs()).toFixed(2)
+        effective_amount: new import_decimal.Decimal(p.amount || 0).plus(new import_decimal.Decimal(Number(p.rounding_amount) > 0 ? 0 : p.rounding_amount || 0).abs()).toFixed(2)
       })),
       说明: "有效支付金额包含抹零计算（amount + |rounding_amount|）"
     });

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

@@ -310,6 +310,10 @@ export declare class CheckoutImpl extends BaseModule implements Module, Checkout
      * 计算剩余未支付金额（从 Payment 模块获取最新数据）
      */
     private calculateRemainingAmountAsync;
+    /**
+     * 计算剩余未支付金额（排除定金计算，始终使用订单总金额）
+     */
+    private calculateRemainingTotalAmountAsync;
     /**
      * 更新 balanceDueAmount 为当前剩余未支付金额（系统内部计算）
      */

package/lib/solution/Checkout/index.js

@@ -475,7 +475,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
       );
       const paidAmount = activePayments.reduce((sum, p) => {
         const amt = new import_decimal.default(p.amount || "0");
-        const rounding = new import_decimal.default(p.rounding_amount || "0").abs();
+        const rounding = new import_decimal.default(Number(p.rounding_amount) > 0 ? 0 : p.rounding_amount || "0").abs();
         return sum.plus(amt).plus(rounding);
       }, new import_decimal.default(0));
       const remaining = import_decimal.default.max(0, totalAmount.minus(paidAmount)).toFixed(
@@ -524,7 +524,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
       });
       const syncedAmount = activePayments.reduce((sum, p) => {
         const amt = new import_decimal.default(p.amount || "0");
-        const rounding = new import_decimal.default(p.rounding_amount || "0").abs();
+        const rounding = new import_decimal.default(Number(p.rounding_amount) > 0 ? 0 : p.rounding_amount || "0").abs();
         return sum.plus(amt).plus(rounding);
       }, new import_decimal.default(0));
       const remainingExpectAmount = import_decimal.default.max(0, totalAmount.minus(syncedAmount)).toFixed(
@@ -1773,7 +1773,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
       const paidAmount = payments.filter((payment) => payment.status !== "voided").reduce((sum, payment) => {
         const amount = new import_decimal.default(payment.amount || "0");
         const roundingAmount = new import_decimal.default(payment.rounding_amount || "0");
-        const effectiveAmount = amount.add(roundingAmount.abs());
+        const effectiveAmount = amount.add(roundingAmount.isNegative() ? roundingAmount.abs() : 0);
         console.log(`[Checkout] 计算支付项: ${payment.code}`, {
           originalAmount: amount.toFixed(2),
           roundingAmount: roundingAmount.toFixed(2),
@@ -1818,19 +1818,37 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
     this.logInfo("calculateRemainingAmountAsync: 计算=", result);
     return result;
   }
+  /**
+   * 计算剩余未支付金额（排除定金计算，始终使用订单总金额）
+   */
+  async calculateRemainingTotalAmountAsync() {
+    if (!this.store.currentOrder) {
+      this.logWarning("calculateRemainingTotalAmountAsync: 没有当前订单");
+      return "0.00";
+    }
+    const totalAmount = new import_decimal.default(this.store.currentOrder.total_amount || "0");
+    const paidAmountStr = await this.calculatePaidAmountAsync();
+    const paidAmount = new import_decimal.default(paidAmountStr);
+    const remainingAmount = totalAmount.sub(paidAmount);
+    const result = import_decimal.default.max(0, remainingAmount).toFixed(2);
+    this.logInfo("calculateRemainingTotalAmountAsync: 计算=", result);
+    return result;
+  }
   /**
    * 更新 balanceDueAmount 为当前剩余未支付金额（系统内部计算）
    */
   async updateBalanceDueAmount() {
     try {
       const remainingAmount = await this.calculateRemainingAmountAsync();
+      const remainingTotalAmount = await this.calculateRemainingTotalAmountAsync();
       const currentBalanceDueAmount = this.store.balanceDueAmount;
       if (remainingAmount !== currentBalanceDueAmount) {
         this.store.balanceDueAmount = remainingAmount;
         await this.core.effects.emit(import_types.CheckoutHooks.OnBalanceDueAmountChanged, {
           oldAmount: currentBalanceDueAmount,
           newAmount: remainingAmount,
-          timestamp: Date.now()
+          timestamp: Date.now(),
+          totalAmount: remainingTotalAmount
         });
         this.logInfo("balanceDueAmount 已自动更新:", {
           oldAmount: currentBalanceDueAmount,
@@ -1864,7 +1882,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
           }
           const amount = new import_decimal.default(item.amount || "0");
           const roundingAmount = new import_decimal.default(item.rounding_amount || "0");
-          return sum.add(amount.add(roundingAmount.abs()));
+          return sum.add(amount.add(roundingAmount.isNegative() ? roundingAmount.abs() : 0));
         }, new import_decimal.default(0));
         if (depositPaidAmount.gte((_c = this.store.currentOrder) == null ? void 0 : _c.deposit_amount)) {
           this.store.currentOrder = {
@@ -1877,13 +1895,15 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
         }
       }
       const remainingAmount = await this.calculateRemainingAmountAsync();
+      const remainingTotalAmount = await this.calculateRemainingTotalAmountAsync();
       const currentStateAmount = this.store.stateAmount;
       if (remainingAmount !== currentStateAmount) {
         this.store.stateAmount = remainingAmount;
         this.core.effects.emit(import_types.CheckoutHooks.OnStateAmountChanged, {
           oldAmount: currentStateAmount,
           newAmount: remainingAmount,
-          timestamp: Date.now()
+          timestamp: Date.now(),
+          totalAmount: remainingTotalAmount
         });
         this.logInfo("stateAmount 已自动更新为剩余金额:", {
           oldAmount: currentStateAmount,
@@ -1950,7 +1970,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
             code: p.code,
             amount: p.amount,
             rounding_amount: p.rounding_amount,
-            effective_amount: (parseFloat(p.amount || "0") + Math.abs(parseFloat(p.rounding_amount || "0"))).toFixed(2),
+            effective_amount: (parseFloat(p.amount || "0") + Math.abs(parseFloat(Number(p.rounding_amount) > 0 ? "0" : p.rounding_amount || "0"))).toFixed(2),
             voucher_id: p.voucher_id,
             status: p.status
           }))
@@ -2433,11 +2453,19 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
    * @returns 舍入结果详情，包含原始金额、舍入后金额和舍入差额
    */
   async roundAmountAsync(amount) {
-    var _a, _b;
+    var _a, _b, _c;
+    const cashManualPayment = this.store.paymentMethods.find((p) => p.code === "CASHMANUAL");
+    if (!((_a = cashManualPayment == null ? void 0 : cashManualPayment.metadata) == null ? void 0 : _a.order_rounding_switch)) {
+      return {
+        originalAmount: amount.toString(),
+        roundedAmount: amount.toString(),
+        roundingDifference: "0.00"
+      };
+    }
     const result = await this.payment.roundAmountAsync(
       amount,
-      (_a = this.otherParams.order_rounding_setting) == null ? void 0 : _a.interval,
-      (_b = this.otherParams.order_rounding_setting) == null ? void 0 : _b.type
+      (_b = this.otherParams.order_rounding_setting) == null ? void 0 : _b.interval,
+      (_c = this.otherParams.order_rounding_setting) == null ? void 0 : _c.type
     );
     return result;
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@pisell/pisellos",
-  "version": "2.1.28",
+  "version": "2.1.29",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",