@pisell/pisellos 0.0.306 → 0.0.308

package/dist/modules/Payment/index.js

@@ -1068,13 +1068,13 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
               // 🔒 支付锁检查：如果订单待付金额已经为0，不允许继续添加支付项
               expectAmount = new Decimal(order.expect_amount);
               paidDepositAmount = order.payment.reduce(function (sum, payment) {
-                if (payment.order_payment_type === 'deposit') {
+                if (payment.order_payment_type === 'deposit' && payment.status !== 'voided') {
                   return sum.plus(new Decimal(payment.amount));
                 }
                 return sum;
               }, new Decimal(0));
-              expectedDepositAmount = new Decimal(order.deposit_amount || '0').sub(paidDepositAmount); // 有一种特殊情况,订单金额为 0，但是定金金额>0，且此时是定金状态的，允许添加支付项
-              if (!(expectAmount.lte(0) && expectedDepositAmount.lte(0))) {
+              expectedDepositAmount = new Decimal(order.deposit_amount || '0').sub(paidDepositAmount); // 有一种特殊情况,订单金额为 0，但是定金金额不等于0，且此时是定金状态的，允许添加支付项
+              if (!(expectAmount.lte(0) && expectedDepositAmount.eq(0))) {
                 _context13.next = 15;
                 break;
               }

package/dist/solution/Checkout/index.js

@@ -677,7 +677,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
     value: (function () {
       var _updateLocalOrderAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(params) {
         var _params$orderData6, _params$orderData7, _params$cartSummary2, _params$totalInfo5, _params$totalInfo6, _params$totalInfo7, _params$totalInfo8;
-        var validation, amountInfo, customerInfo, allOrders, existingOrder, _updated$payment, totalAmount, activePayments, paidAmount, remaining, _isNeedDeposit, updated, isNeedDeposit, created;
+        var validation, amountInfo, customerInfo, allOrders, existingOrder, _updated$payment, totalAmount, activePayments, paidAmount, remaining, _isNeedDeposit, updated, syncedAmount, remainingExpectAmount, isNeedDeposit, created;
         return _regeneratorRuntime().wrap(function _callee10$(_context10) {
           while (1) switch (_context10.prev = _context10.next) {
             case 0:
@@ -730,7 +730,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 return String(o.id) === String(params.orderId) || String(o.order_id) === String(params.orderId);
               });
               if (!existingOrder) {
-                _context10.next = 40;
+                _context10.next = 42;
                 break;
               }
               // 基于现有支付项计算新的 expect_amount
@@ -792,14 +792,21 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 timestamp: Date.now()
               });
             case 38:
+              // 需要减去已经同步给后端的支付过的钱
+              syncedAmount = activePayments.reduce(function (sum, p) {
+                var amt = new Decimal(p.amount || '0');
+                var rounding = new Decimal(p.rounding_amount || '0');
+                return sum.plus(amt).plus(rounding);
+              }, new Decimal(0));
+              remainingExpectAmount = Decimal.max(0, totalAmount.minus(syncedAmount)).toFixed(2);
               this.initWalletData({
-                order_wait_pay_amount: Number(updated.expect_amount)
+                order_wait_pay_amount: Number(remainingExpectAmount)
               });
               return _context10.abrupt("return", updated);
-            case 40:
+            case 42:
               // 计算是否需要支付定金，如果需要默认切换到定金模式，以及记录定金总金额，并把当前默认待付金额调整为定金总金额
               isNeedDeposit = this.checkIsNeedDepositAsync(params.orderData.bookings, params.orderData.relation_products); // 没找到现有订单时，回退为创建逻辑（用于异常兜底）
-              _context10.next = 43;
+              _context10.next = 45;
               return this.payment.createPaymentOrderAsync({
                 order_id: String(params.orderId),
                 total_amount: amountInfo.totalAmount,
@@ -816,15 +823,15 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                   amount_breakdown: amountInfo
                 }
               });
-            case 43:
+            case 45:
               created = _context10.sent;
               this.store.currentOrder = created;
-              _context10.next = 47;
+              _context10.next = 49;
               return this.updateStateAmountToRemaining();
-            case 47:
+            case 49:
               this.initWalletData();
               return _context10.abrupt("return", created);
-            case 49:
+            case 51:
             case "end":
               return _context10.stop();
           }

package/lib/modules/Payment/index.js

@@ -529,13 +529,13 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
       }
       const expectAmount = new import_decimal.Decimal(order.expect_amount);
       const paidDepositAmount = order.payment.reduce((sum, payment) => {
-        if (payment.order_payment_type === "deposit") {
+        if (payment.order_payment_type === "deposit" && payment.status !== "voided") {
           return sum.plus(new import_decimal.Decimal(payment.amount));
         }
         return sum;
       }, new import_decimal.Decimal(0));
       const expectedDepositAmount = new import_decimal.Decimal(order.deposit_amount || "0").sub(paidDepositAmount);
-      if (expectAmount.lte(0) && expectedDepositAmount.lte(0)) {
+      if (expectAmount.lte(0) && expectedDepositAmount.eq(0)) {
         const warningMessage = `订单 ${orderUuid} 待付金额已为0，不允许添加新的支付项`;
         console.warn("[PaymentModule] Payment lock triggered:", {
           orderUuid,

package/lib/solution/Checkout/index.js

@@ -522,8 +522,16 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
         order: updated,
         timestamp: Date.now()
       });
+      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");
+        return sum.plus(amt).plus(rounding);
+      }, new import_decimal.default(0));
+      const remainingExpectAmount = import_decimal.default.max(0, totalAmount.minus(syncedAmount)).toFixed(
+        2
+      );
       this.initWalletData({
-        order_wait_pay_amount: Number(updated.expect_amount)
+        order_wait_pay_amount: Number(remainingExpectAmount)
       });
       return updated;
     }

package/package.json

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