@pisell/pisellos 0.0.318 → 0.0.319

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.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),
@@ -2960,7 +2960,7 @@ 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;
@@ -3107,7 +3107,7 @@ 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
                   };
@@ -3875,17 +3875,31 @@ 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;
+        var _cashManualPayment$me, _this$otherParams$ord, _this$otherParams$ord2;
+        var cashManualPayment, result;
         return _regeneratorRuntime().wrap(function _callee40$(_context40) {
           while (1) switch (_context40.prev = _context40.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) {
+                _context40.next = 3;
+                break;
+              }
+              return _context40.abrupt("return", {
+                originalAmount: amount.toString(),
+                roundedAmount: amount.toString(),
+                roundingDifference: '0.00'
+              });
+            case 3:
+              _context40.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:
+            case 5:
               result = _context40.sent;
               return _context40.abrupt("return", result);
-            case 4:
+            case 7:
             case "end":
               return _context40.stop();
           }

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.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),
@@ -1864,7 +1864,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 = {
@@ -1950,7 +1950,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 +2433,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": "0.0.318",
+  "version": "0.0.319",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",