@pisell/pisellos 2.2.108 → 2.2.109

package/dist/solution/Checkout/index.js

@@ -2748,7 +2748,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
     key: "processCashPaymentItem",
     value: (function () {
       var _processCashPaymentItem = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee28(paymentItem) {
-        var cashPayment, remainingAmountStr, remainingAmount, cashAmount, changeAmount, processedPaymentItem;
+        var cashPayment, remainingAmountStr, remainingAmount, cashAmount, roundingAmount, chargeAmount, changeAmount, processedPaymentItem;
         return _regeneratorRuntime().wrap(function _callee28$(_context28) {
           while (1) switch (_context28.prev = _context28.next) {
             case 0:
@@ -2766,41 +2766,35 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
             case 6:
               remainingAmountStr = _context28.sent;
               remainingAmount = new Decimal(remainingAmountStr);
-              cashAmount = new Decimal(String(paymentItem.amount)); // 如果现金金额小于等于剩余待付金额，无需找零
+              cashAmount = new Decimal(String(paymentItem.amount));
+              roundingAmount = new Decimal(String(paymentItem.rounding_amount || '0')); // 如果现金金额小于等于剩余待付金额，无需找零
               if (!cashAmount.lte(remainingAmount)) {
-                _context28.next = 11;
+                _context28.next = 12;
                 break;
               }
               return _context28.abrupt("return", paymentItem);
-            case 11:
-              // 使用 Decimal.js 安全计算找零金额
-              changeAmount = cashAmount.sub(remainingAmount); // 如果还有 rounding_amount 的配置，要判断是否和 changeAmount 相等
-              if (!(Number(paymentItem.rounding_amount) > 0)) {
-                _context28.next = 18;
-                break;
-              }
-              if (!(Number(paymentItem.rounding_amount) === changeAmount.toNumber())) {
-                _context28.next = 17;
+            case 12:
+              // 超付场景使用 rounding 回算应收金额（兼容 UI 已做抹零 + 允许超付）
+              chargeAmount = Decimal.max(remainingAmount.add(roundingAmount), new Decimal(0));
+              if (!cashAmount.lte(chargeAmount)) {
+                _context28.next = 15;
                 break;
               }
               return _context28.abrupt("return", paymentItem);
-            case 17:
-              // 如果不等于，则remainingAmount需要加上 rounding_amount，避免这里被改为未舍入金额
-              remainingAmount = remainingAmount.add(new Decimal(paymentItem.rounding_amount || '0'));
-            case 18:
-              // 创建包含找零信息的支付项
+            case 15:
+              changeAmount = cashAmount.sub(chargeAmount); // 创建包含找零信息的支付项
               processedPaymentItem = _objectSpread(_objectSpread({}, paymentItem), {}, {
-                amount: remainingAmount.toFixed(2),
-                // 将 amount 设置为剩余待付金额，保留2位小数
+                amount: chargeAmount.toFixed(2),
                 metadata: _objectSpread(_objectSpread({}, paymentItem.metadata), {}, {
                   actual_paid_amount: cashAmount.toNumber(),
-                  // 实付金额
-                  change_given_amount: changeAmount.toNumber() // 找零金额
+                  change_given_amount: changeAmount.toNumber()
                 })
               });
               this.logInfo('Cash payment with change processed', {
                 originalAmount: cashAmount.toFixed(2),
-                chargedAmount: remainingAmount.toFixed(2),
+                remainingAmount: remainingAmount.toFixed(2),
+                roundingAmount: roundingAmount.toFixed(2),
+                chargedAmount: chargeAmount.toFixed(2),
                 changeAmount: changeAmount.toFixed(2),
                 paymentCode: paymentItem.code,
                 paymentType: paymentItem.type,
@@ -2808,21 +2802,23 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 decimalPrecisionCheck: {
                   cashAmountPrecise: cashAmount.toString(),
                   remainingAmountPrecise: remainingAmount.toString(),
+                  roundingAmountPrecise: roundingAmount.toString(),
+                  chargeAmountPrecise: chargeAmount.toString(),
                   changeAmountPrecise: changeAmount.toString()
                 }
               });
               return _context28.abrupt("return", processedPaymentItem);
-            case 23:
-              _context28.prev = 23;
+            case 21:
+              _context28.prev = 21;
               _context28.t0 = _context28["catch"](3);
               this.logError('处理现金支付项时出错:', _context28.t0);
               // 出错时返回原始支付项，避免中断支付流程
               return _context28.abrupt("return", paymentItem);
-            case 27:
+            case 25:
             case "end":
               return _context28.stop();
           }
-        }, _callee28, this, [[3, 23]]);
+        }, _callee28, this, [[3, 21]]);
       }));
       function processCashPaymentItem(_x27) {
         return _processCashPaymentItem.apply(this, arguments);

package/lib/solution/Checkout/index.js

@@ -1835,36 +1835,34 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
     }
     try {
       const remainingAmountStr = await this.calculateRemainingAmountAsync();
-      let remainingAmount = new import_decimal.default(remainingAmountStr);
+      const remainingAmount = new import_decimal.default(remainingAmountStr);
       const cashAmount = new import_decimal.default(String(paymentItem.amount));
+      const roundingAmount = new import_decimal.default(String(paymentItem.rounding_amount || "0"));
       if (cashAmount.lte(remainingAmount)) {
         return paymentItem;
       }
-      const changeAmount = cashAmount.sub(remainingAmount);
-      if (Number(paymentItem.rounding_amount) > 0) {
-        if (Number(paymentItem.rounding_amount) === changeAmount.toNumber()) {
-          return paymentItem;
-        } else {
-          remainingAmount = remainingAmount.add(
-            new import_decimal.default(paymentItem.rounding_amount || "0")
-          );
-        }
+      const chargeAmount = import_decimal.default.max(
+        remainingAmount.add(roundingAmount),
+        new import_decimal.default(0)
+      );
+      if (cashAmount.lte(chargeAmount)) {
+        return paymentItem;
       }
+      const changeAmount = cashAmount.sub(chargeAmount);
       const processedPaymentItem = {
         ...paymentItem,
-        amount: remainingAmount.toFixed(2),
-        // 将 amount 设置为剩余待付金额，保留2位小数
+        amount: chargeAmount.toFixed(2),
         metadata: {
           ...paymentItem.metadata,
           actual_paid_amount: cashAmount.toNumber(),
-          // 实付金额
           change_given_amount: changeAmount.toNumber()
-          // 找零金额
         }
       };
       this.logInfo("Cash payment with change processed", {
         originalAmount: cashAmount.toFixed(2),
-        chargedAmount: remainingAmount.toFixed(2),
+        remainingAmount: remainingAmount.toFixed(2),
+        roundingAmount: roundingAmount.toFixed(2),
+        chargedAmount: chargeAmount.toFixed(2),
         changeAmount: changeAmount.toFixed(2),
         paymentCode: paymentItem.code,
         paymentType: paymentItem.type,
@@ -1872,6 +1870,8 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
         decimalPrecisionCheck: {
           cashAmountPrecise: cashAmount.toString(),
           remainingAmountPrecise: remainingAmount.toString(),
+          roundingAmountPrecise: roundingAmount.toString(),
+          chargeAmountPrecise: chargeAmount.toString(),
           changeAmountPrecise: changeAmount.toString()
         }
       });

package/package.json

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