@pisell/private-materials 6.5.10 → 6.5.12

package/es/components/checkout/PaymentModal.js

@@ -113,41 +113,46 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
     _useState4 = _slicedToArray(_useState3, 2),
     balanceDueAmount = _useState4[0],
     setBalanceDueAmount = _useState4[1];
-  var _useState5 = useState([]),
+  // 剩余待付金额-跟定金无关的一个订单总体待付金额，上面这个 balanceDueAmount 是会收到订单影响的，下面这个不会
+  var _useState5 = useState(''),
     _useState6 = _slicedToArray(_useState5, 2),
-    recommendAmounts = _useState6[0],
-    setRecommendAmounts = _useState6[1];
-  var paymentMethodsRef = useRef(null);
+    balanceDueTotalAmount = _useState6[0],
+    setBalanceDueTotalAmount = _useState6[1];
   var _useState7 = useState([]),
     _useState8 = _slicedToArray(_useState7, 2),
-    paymentMethods = _useState8[0],
-    setPaymentMethods = _useState8[1];
-  var _useState9 = useState(false),
+    recommendAmounts = _useState8[0],
+    setRecommendAmounts = _useState8[1];
+  var paymentMethodsRef = useRef(null);
+  var _useState9 = useState([]),
     _useState10 = _slicedToArray(_useState9, 2),
-    showCashPayment = _useState10[0],
-    setShowCashPayment = _useState10[1];
-  var _useState11 = useState(locales.getText('cards.and.digitals') || 'Cards & Digitals'),
+    paymentMethods = _useState10[0],
+    setPaymentMethods = _useState10[1];
+  var _useState11 = useState(false),
     _useState12 = _slicedToArray(_useState11, 2),
-    paymentOptionsTitle = _useState12[0],
-    setPaymentOptionsTitle = _useState12[1];
+    showCashPayment = _useState12[0],
+    setShowCashPayment = _useState12[1];
+  var _useState13 = useState(locales.getText('cards.and.digitals') || 'Cards & Digitals'),
+    _useState14 = _slicedToArray(_useState13, 2),
+    paymentOptionsTitle = _useState14[0],
+    setPaymentOptionsTitle = _useState14[1];
   var clientChangedRef = useRef(false);
   var walletPassRef = useRef(null);
   // 已保存的支付项数据
-  var _useState13 = useState([]),
-    _useState14 = _slicedToArray(_useState13, 2),
-    paymentItems = _useState14[0],
-    setPaymentItems = _useState14[1];
-  // 钱包卡券数据
-  var _useState15 = useState({}),
+  var _useState15 = useState([]),
     _useState16 = _slicedToArray(_useState15, 2),
-    walletPassData = _useState16[0],
-    setWalletPassData = _useState16[1];
+    paymentItems = _useState16[0],
+    setPaymentItems = _useState16[1];
+  // 钱包卡券数据
+  var _useState17 = useState({}),
+    _useState18 = _slicedToArray(_useState17, 2),
+    walletPassData = _useState18[0],
+    setWalletPassData = _useState18[1];
   var _usePrinter = usePrinter(),
     nativePrint = _usePrinter.nativePrint;
-  var _useState17 = useState(false),
-    _useState18 = _slicedToArray(_useState17, 2),
-    syncingLock = _useState18[0],
-    setSyncingLock = _useState18[1];
+  var _useState19 = useState(false),
+    _useState20 = _slicedToArray(_useState19, 2),
+    syncingLock = _useState20[0],
+    setSyncingLock = _useState20[1];
   var isOrderFree = useMemo(function () {
     if (!customAmount) return false;
     var amount = parseFloat(customAmount);
@@ -155,14 +160,14 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
   }, [customAmount]);
 
   // 新增状态：订单备注和手动折扣
-  var _useState19 = useState(false),
-    _useState20 = _slicedToArray(_useState19, 2),
-    paymentLinkModalOpen = _useState20[0],
-    setPaymentLinkModalOpen = _useState20[1];
   var _useState21 = useState(false),
     _useState22 = _slicedToArray(_useState21, 2),
-    showPriceAdjustModal = _useState22[0],
-    setShowPriceAdjustModal = _useState22[1];
+    paymentLinkModalOpen = _useState22[0],
+    setPaymentLinkModalOpen = _useState22[1];
+  var _useState23 = useState(false),
+    _useState24 = _slicedToArray(_useState23, 2),
+    showPriceAdjustModal = _useState24[0],
+    setShowPriceAdjustModal = _useState24[1];
   var logger = usePaymentLogger();
   var currency = getData('shop_currency_code') || 'USD';
 
@@ -418,6 +423,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
           var _cartData$order_info;
           setCustomAmount(currentAmount);
           setBalanceDueAmount(currentAmount);
+          setBalanceDueTotalAmount(orderInfo.totalAmount || '0');
           // 设置订单备注默认值 - 优先从 checkoutModule 获取，如果没有则从购物车数据获取
           var currentNote = checkoutModule.getOrderNote();
           if (currentNote) {
@@ -520,6 +526,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
           }());
           var amountChangedUnsubscribe = core.effects.on(CheckoutHooks.OnBalanceDueAmountChanged, function (data) {
             setBalanceDueAmount(data.newAmount);
+            setBalanceDueTotalAmount(data.totalAmount || '0');
           });
           var orderSubmitStartUnsubscribe = core.effects.on(CheckoutHooks.OnOrderSubmitStart, function () {
             var _Toast$loading;
@@ -563,7 +570,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
                     updateOrderInfo === null || updateOrderInfo === void 0 || updateOrderInfo(orderInfo);
                     balanceDueAmount = checkoutModule.getBalanceDueAmount();
                     if (!(Number(balanceDueAmount) > 0)) {
-                      _context5.next = 13;
+                      _context5.next = 14;
                       break;
                     }
                     autoCloseConfig = calculateAutoCloseConfig('partially_paid', false); // 获取订单总金额
@@ -575,7 +582,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
                     if (_paymentItems.length > 0 && _paymentItems.filter(function (n) {
                       return n.isSynced;
                     }).some(function (item) {
-                      return item.service_charge;
+                      return item.service_charge || item.rounding_amount;
                     })) {
                       serviceChargeTotal = _paymentItems.reduce(function (acc, item) {
                         var _item$service_charge, _item$service_charge2;
@@ -583,13 +590,19 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
                         var chargePercentage = new Decimal(((_item$service_charge2 = item.service_charge) === null || _item$service_charge2 === void 0 ? void 0 : _item$service_charge2.percentage) || 0);
                         var itemAmount = new Decimal(item.amount || 0);
                         var itemServiceCharge = chargeAmount.add(chargePercentage.mul(itemAmount));
+                        // 如果支付项的 rounding_amount 是正数，需要减掉rounding_amount
+                        // if (Number(item.rounding_amount) > 0) {
+                        //   itemServiceCharge = itemServiceCharge.sub(new Decimal(item.rounding_amount));
+                        // }
+                        console.log(itemServiceCharge);
                         return acc.add(itemServiceCharge);
                       }, new Decimal(0));
                       _totalAmount = _totalAmount.add(serviceChargeTotal);
                     }
+                    console.log(_totalAmount, _paymentItems);
 
                     // 根据支付状态展示不同的 toast
-                    _context5.next = 13;
+                    _context5.next = 14;
                     return displayPaymentResultToast({
                       paymentStatus: 'partially_paid',
                       orderTotalAmount: _totalAmount.toNumber(),
@@ -607,7 +620,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
                         // 不自动关闭Modal，让两个弹窗独立管理
                       }
                     }));
-                  case 13:
+                  case 14:
                     // 判断是否为现金支付
                     paymentMethodName = data.paymentMethodName || data.name || '';
                     isCashPayment = data.paymentMethodCode === 'CASHMANUAL' || /现金|現金/i.test(paymentMethodName) || /cash/i.test(paymentMethodName);
@@ -626,7 +639,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
                         }
                       });
                     }
-                  case 16:
+                  case 17:
                   case "end":
                     return _context5.stop();
                 }
@@ -757,19 +770,23 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
             return showSuccessToast === null || showSuccessToast === void 0 ? void 0 : showSuccessToast(result);
           case 12:
             if (!result.success) {
-              _context8.next = 22;
+              _context8.next = 23;
               break;
             }
+            // 触发 voucher 的更新
+            checkoutModule.core.effects.emit('checkout:onPaymentStarted', {
+              paymentMethodCode: ''
+            });
             // 检查订单此时是不是定金支付订单
             _orderInfo = checkoutModule.getCurrentOrderInfo();
             setCurrentEditOrderId === null || setCurrentEditOrderId === void 0 || setCurrentEditOrderId(result.orderId);
             if (!(result.is_deposit && Number(_orderInfo.depositAmount) < Number(_orderInfo.totalAmount))) {
-              _context8.next = 18;
+              _context8.next = 19;
               break;
             }
             updateOrderInfo === null || updateOrderInfo === void 0 || updateOrderInfo(_orderInfo);
             return _context8.abrupt("return");
-          case 18:
+          case 19:
             responseData = (_result$response = result.response) === null || _result$response === void 0 ? void 0 : _result$response.data; // 打印订单完整信息
             console.log('print_order_onOrderSynced>>>>', result);
             try {
@@ -792,7 +809,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
             }
             // 支付成功时关闭 PaymentModal
             onPaymentCancel(true);
-          case 22:
+          case 23:
           case "end":
             return _context8.stop();
         }
@@ -1284,7 +1301,8 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
     amountButtons: recommendAmounts,
     customAmount: customAmount,
     roundingFunction: roundingFunction,
-    balanceDueAmount: balanceDueAmount
+    balanceDueAmount: balanceDueAmount,
+    balanceDueTotalAmount: balanceDueTotalAmount
   })), moduleConfig.showPaymentOptions && /*#__PURE__*/React.createElement("div", {
     className: showCashPayment ? '' : 'payment-options-module-container',
     style: showCashPayment ? {
@@ -1364,31 +1382,32 @@ var PaymentModal = function PaymentModal(_ref18) {
   var _ref19 = (context === null || context === void 0 || (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.utils) || {},
     pisellos = _ref19.pisellos,
     getData = _ref19.getData,
-    interaction = _ref19.interaction;
-  var _useState23 = useState(null),
-    _useState24 = _slicedToArray(_useState23, 2),
-    orderInfo = _useState24[0],
-    setOrderInfo = _useState24[1];
-  var _useState25 = useState(0),
+    interaction = _ref19.interaction,
+    isWebPos = _ref19.isWebPos;
+  var _useState25 = useState(null),
     _useState26 = _slicedToArray(_useState25, 2),
-    totalAmount = _useState26[0],
-    setTotalAmount = _useState26[1];
-  var _useState27 = useState(true),
+    orderInfo = _useState26[0],
+    setOrderInfo = _useState26[1];
+  var _useState27 = useState(0),
     _useState28 = _slicedToArray(_useState27, 2),
-    actualShowCashPayment = _useState28[0],
-    setActualShowCashPayment = _useState28[1];
-  var _useState29 = useState(0),
+    totalAmount = _useState28[0],
+    setTotalAmount = _useState28[1];
+  var _useState29 = useState(true),
     _useState30 = _slicedToArray(_useState29, 2),
-    windowHeight = _useState30[0],
-    setWindowHeight = _useState30[1];
-  var _useState31 = useState(false),
+    actualShowCashPayment = _useState30[0],
+    setActualShowCashPayment = _useState30[1];
+  var _useState31 = useState(0),
     _useState32 = _slicedToArray(_useState31, 2),
-    showRetryModal = _useState32[0],
-    setShowRetryModal = _useState32[1];
-  var _useState33 = useState(editOrderId || 0),
+    windowHeight = _useState32[0],
+    setWindowHeight = _useState32[1];
+  var _useState33 = useState(false),
     _useState34 = _slicedToArray(_useState33, 2),
-    currentEditOrderId = _useState34[0],
-    _setCurrentEditOrderId = _useState34[1];
+    showRetryModal = _useState34[0],
+    setShowRetryModal = _useState34[1];
+  var _useState35 = useState(editOrderId || 0),
+    _useState36 = _slicedToArray(_useState35, 2),
+    currentEditOrderId = _useState36[0],
+    _setCurrentEditOrderId = _useState36[1];
   var Toast = useToast();
   var _usePrinter2 = usePrinter(),
     nativePrint = _usePrinter2.nativePrint;
@@ -1523,18 +1542,18 @@ var PaymentModal = function PaymentModal(_ref18) {
   }, []);
 
   // 订单备注相关状态
-  var _useState35 = useState(false),
-    _useState36 = _slicedToArray(_useState35, 2),
-    noteModalOpen = _useState36[0],
-    setNoteModalOpen = _useState36[1];
-  var _useState37 = useState(''),
+  var _useState37 = useState(false),
     _useState38 = _slicedToArray(_useState37, 2),
-    orderNote = _useState38[0],
-    setOrderNote = _useState38[1];
-  var _useState39 = useState('payment-content'),
+    noteModalOpen = _useState38[0],
+    setNoteModalOpen = _useState38[1];
+  var _useState39 = useState(''),
     _useState40 = _slicedToArray(_useState39, 2),
-    noteModalSource = _useState40[0],
-    setNoteModalSource = _useState40[1];
+    orderNote = _useState40[0],
+    setOrderNote = _useState40[1];
+  var _useState41 = useState('payment-content'),
+    _useState42 = _slicedToArray(_useState41, 2),
+    noteModalSource = _useState42[0],
+    setNoteModalSource = _useState42[1];
 
   // 订单备注相关处理函数
   var handleNoteConfirm = /*#__PURE__*/function () {
@@ -1995,7 +2014,7 @@ var PaymentModal = function PaymentModal(_ref18) {
               // 获取 checkout 模块并处理订单数据
               checkout = pisellos === null || pisellos === void 0 ? void 0 : pisellos.getModule('checkout');
               if (!(checkout && data && !isLocalOrderCreated.current)) {
-                _context23.next = 24;
+                _context23.next = 25;
                 break;
               }
               isLocalOrderCreated.current = true;
@@ -2030,17 +2049,24 @@ var PaymentModal = function PaymentModal(_ref18) {
                 totalInfo: newData.subtotal_info
               });
             case 12:
-              _context23.next = 16;
+              _context23.next = 17;
               break;
             case 14:
-              _context23.next = 16;
+              logger === null || logger === void 0 || logger.addLog({
+                type: 'info',
+                title: '正常创建 createLocalOrderAsync',
+                metadata: {
+                  data: data
+                }
+              });
+              _context23.next = 17;
               return checkout.createLocalOrderAsync({
                 orderData: newData.order_info,
                 cartSummary: (_newData$subtotal_inf2 = newData.subtotal_info) === null || _newData$subtotal_inf2 === void 0 ? void 0 : _newData$subtotal_inf2.subTotalList,
                 autoPayment: true,
                 totalInfo: newData.subtotal_info
               });
-            case 16:
+            case 17:
               // 获取订单总金额
               _orderInfo2 = checkout.getCurrentOrderInfo();
               console.log(_orderInfo2);
@@ -2061,7 +2087,7 @@ var PaymentModal = function PaymentModal(_ref18) {
               unsubscribeRef.current = checkout.core.effects.on('checkout:onOrderSynced', /*#__PURE__*/function () {
                 var _ref29 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee22(data) {
                   var _data$response, _responseData$payment2;
-                  var currentOrderId, responseData, paymentStatus, orderTotalAmount, gapAmount, currentChangeGivenAmount, failureReason, _interaction$utils6, _interaction$utils6$a, _responseData$payment3, params, statusClassName, autoCloseConfig, enabledAutoPrint, _orderInfo3, paymentResult;
+                  var currentOrderId, responseData, paymentStatus, orderTotalAmount, gapAmount, currentChangeGivenAmount, failureReason, _responseData$payment3, params, statusClassName, autoCloseConfig, enabledAutoPrint, _interaction$utils6, _interaction$utils6$a, _orderInfo3, paymentResult;
                   return _regeneratorRuntime().wrap(function _callee22$(_context22) {
                     while (1) switch (_context22.prev = _context22.next) {
                       case 0:
@@ -2092,7 +2118,7 @@ var PaymentModal = function PaymentModal(_ref18) {
                         // 获取失败原因
                         failureReason = responseData === null || responseData === void 0 ? void 0 : responseData.failure_reason; // 根据支付状态弹出对应的支付结果toast
                         if (!paymentStatus) {
-                          _context22.next = 30;
+                          _context22.next = 35;
                           break;
                         }
                         // 打印订单完整信息
@@ -2147,15 +2173,26 @@ var PaymentModal = function PaymentModal(_ref18) {
                         // 确定支付状态
                         statusClassName = calculateStatusClassName(paymentStatus);
                         autoCloseConfig = calculateAutoCloseConfig(paymentStatus, !!currentChangeGivenAmount);
-                        _context22.next = 21;
+                        enabledAutoPrint = false;
+                        if (!isWebPos) {
+                          _context22.next = 24;
+                          break;
+                        }
+                        // web pos 没有自动打印配置
+                        enabledAutoPrint = false;
+                        _context22.next = 27;
+                        break;
+                      case 24:
+                        _context22.next = 26;
                         return interaction === null || interaction === void 0 || (_interaction$utils6 = interaction.utils) === null || _interaction$utils6 === void 0 || (_interaction$utils6$a = _interaction$utils6.asyncDataManager) === null || _interaction$utils6$a === void 0 ? void 0 : _interaction$utils6$a.call(_interaction$utils6, {
                           module: 'get',
                           key: 'auto_print_receipt'
                         });
-                      case 21:
+                      case 26:
                         enabledAutoPrint = _context22.sent;
+                      case 27:
                         _orderInfo3 = checkout.getCurrentOrderInfo(); // 根据支付状态展示不同的 toast
-                        _context22.next = 25;
+                        _context22.next = 30;
                         return displayPaymentResultToast({
                           paymentStatus: paymentStatus,
                           orderTotalAmount: _orderInfo3.isDeposit ? _orderInfo3.depositAmount : orderTotalAmount,
@@ -2164,7 +2201,7 @@ var PaymentModal = function PaymentModal(_ref18) {
                           autoCloseConfig: autoCloseConfig,
                           actionButtons: generateActionButtons(paymentStatus, enabledAutoPrint)
                         }, paymentResultToastConfig);
-                      case 25:
+                      case 30:
                         // 当支付状态为 paid 时，关闭 paymentModal
                         if (paymentStatus === 'paid') {
                           handleModalClose();
@@ -2180,11 +2217,11 @@ var PaymentModal = function PaymentModal(_ref18) {
                           }
                         });
                         handlePaymentComplete(paymentResult);
-                        _context22.next = 31;
+                        _context22.next = 36;
                         break;
-                      case 30:
+                      case 35:
                         handlePaymentComplete(data);
-                      case 31:
+                      case 36:
                       case "end":
                         return _context22.stop();
                     }
@@ -2194,24 +2231,24 @@ var PaymentModal = function PaymentModal(_ref18) {
                   return _ref29.apply(this, arguments);
                 };
               }());
-              _context23.next = 40;
+              _context23.next = 42;
               break;
-            case 24:
+            case 25:
               if (!isLocalOrderCreated.current) {
-                _context23.next = 40;
+                _context23.next = 42;
                 break;
               }
               // // 如果本地订单已创建，这时候还更新了 data，则需要销毁当前的订单数据，然后更新新的订单数据了
               console.log('🔄 PaymentModal: data changed, updating checkout data...');
               isLocalOrderCreated.current = false;
-              _context23.next = 29;
+              _context23.next = 30;
               return checkout.cancelCurrentOrderAsync();
-            case 29:
+            case 30:
               if (!(editOrderId || currentEditOrderId)) {
-                _context23.next = 34;
+                _context23.next = 35;
                 break;
               }
-              _context23.next = 32;
+              _context23.next = 33;
               return checkout.updateLocalOrderAsync({
                 orderId: editOrderId || currentEditOrderId,
                 orderData: data === null || data === void 0 ? void 0 : data.order_info,
@@ -2219,18 +2256,25 @@ var PaymentModal = function PaymentModal(_ref18) {
                 autoPayment: true,
                 totalInfo: data === null || data === void 0 ? void 0 : data.subtotal_info
               });
-            case 32:
-              _context23.next = 36;
+            case 33:
+              _context23.next = 38;
               break;
-            case 34:
-              _context23.next = 36;
+            case 35:
+              logger === null || logger === void 0 || logger.addLog({
+                type: 'info',
+                title: '含有 localOrderCreate, 调用 createLocalOrderAsync',
+                metadata: {
+                  data: data
+                }
+              });
+              _context23.next = 38;
               return checkout.createLocalOrderAsync({
                 orderData: data === null || data === void 0 ? void 0 : data.order_info,
                 cartSummary: data === null || data === void 0 || (_data$subtotal_info2 = data.subtotal_info) === null || _data$subtotal_info2 === void 0 ? void 0 : _data$subtotal_info2.subTotalList,
                 autoPayment: true,
                 totalInfo: data === null || data === void 0 ? void 0 : data.subtotal_info
               });
-            case 36:
+            case 38:
               // 获取订单总金额
               _orderInfo4 = checkout.getCurrentOrderInfo();
               if (_orderInfo4 && _orderInfo4.totalAmount) {
@@ -2238,11 +2282,11 @@ var PaymentModal = function PaymentModal(_ref18) {
               }
               setOrderInfo(_orderInfo4);
               isLocalOrderCreated.current = true;
-            case 40:
-              _context23.next = 46;
-              break;
             case 42:
-              _context23.prev = 42;
+              _context23.next = 48;
+              break;
+            case 44:
+              _context23.prev = 44;
               _context23.t0 = _context23["catch"](0);
               console.error('Failed to initialize checkout data:', _context23.t0);
               logger === null || logger === void 0 || logger.addLog({
@@ -2252,11 +2296,11 @@ var PaymentModal = function PaymentModal(_ref18) {
                   error: _context23.t0
                 }
               });
-            case 46:
+            case 48:
             case "end":
               return _context23.stop();
           }
-        }, _callee23, null, [[0, 42]]);
+        }, _callee23, null, [[0, 44]]);
       }));
       return function initCheckoutData() {
         return _ref28.apply(this, arguments);

package/es/components/checkout/components/AmountSummary/index.js

@@ -501,8 +501,10 @@ function AmountSummary(_ref2) {
 
     // 需要减去已经同步给后端过的 voucher
     var syncedVoucherAmount = paymentItems === null || paymentItems === void 0 ? void 0 : paymentItems.reduce(function (acc, item) {
-      if (item.voucher_id && item.isSynced) {
-        return acc.plus(item.amount).plus(item.rounding_amount);
+      // 如果当前是普通支付，则减去order_payment_type不为 deposit的支付项
+      // 如果当前是定金支付，则减去order_payment_type为 deposit的支付项
+      if (item.isSynced && (paymentType === 'regular' && item.order_payment_type !== 'deposit' || paymentType === 'deposit' && item.order_payment_type === 'deposit')) {
+        return acc.plus(item.amount).plus(Number(item.rounding_amount) > 0 ? 0 : item.rounding_amount || 0);
       }
       return acc;
     }, new Decimal(0)).toNumber();
@@ -613,7 +615,7 @@ function AmountSummary(_ref2) {
     if (paymentType === 'regular') {
       var depositPaidAmount = paymentItems === null || paymentItems === void 0 ? void 0 : paymentItems.reduce(function (acc, item) {
         if (item.order_payment_type === 'deposit') {
-          return acc.plus(item.amount).plus(Math.abs(item.rounding_amount));
+          return acc.plus(item.amount).plus(Number(item.rounding_amount) > 0 ? 0 : item.rounding_amount || 0);
         }
         return acc;
       }, new Decimal(0)).toNumber();
@@ -625,7 +627,7 @@ function AmountSummary(_ref2) {
       // 如果是定金支付，且定金已付款金额大于等于订单总金额，则不可以再切换到普通支付
       var _depositPaidAmount = paymentItems === null || paymentItems === void 0 ? void 0 : paymentItems.reduce(function (acc, item) {
         if (item.order_payment_type === 'deposit') {
-          return acc.plus(item.amount);
+          return acc.plus(item.amount).plus(Number(item.rounding_amount) > 0 ? 0 : item.rounding_amount || 0);
         }
         return acc;
       }, new Decimal(0)).toNumber();

package/es/components/checkout/components/CashPaymentModule/index.d.ts

@@ -13,10 +13,12 @@ export interface CashPaymentModuleProps {
         roundingDifference: number;
     }>;
     balanceDueAmount?: string;
+    balanceDueTotalAmount?: string;
     syncingLock?: boolean;
 }
 export declare function CashPaymentModule({ amountSymbol, orderInfo, onPaymentComplete, customAmount, amountButtons, // 按钮列表，默认5个推荐金额
 disabled, // 禁用状态
-roundingFunction, balanceDueAmount, // 剩余支付金额
+roundingFunction, balanceDueAmount, // 当前阶段剩余支付金额（定金或普通支付）
+balanceDueTotalAmount, // 完整订单剩余待付金额
 syncingLock, }: CashPaymentModuleProps): JSX.Element;
 export default CashPaymentModule;

package/es/components/checkout/components/CashPaymentModule/index.js

@@ -29,6 +29,8 @@ export function CashPaymentModule(_ref) {
     roundingFunction = _ref.roundingFunction,
     _ref$balanceDueAmount = _ref.balanceDueAmount,
     balanceDueAmount = _ref$balanceDueAmount === void 0 ? '0' : _ref$balanceDueAmount,
+    _ref$balanceDueTotalA = _ref.balanceDueTotalAmount,
+    balanceDueTotalAmount = _ref$balanceDueTotalA === void 0 ? '0' : _ref$balanceDueTotalA,
     _ref$syncingLock = _ref.syncingLock,
     syncingLock = _ref$syncingLock === void 0 ? false : _ref$syncingLock;
   var _useState = useState(customAmount || ''),
@@ -56,7 +58,7 @@ export function CashPaymentModule(_ref) {
   };
   useEffect(function () {
     handleKeyboardConfirm(customAmount || '');
-  }, [customAmount, balanceDueAmount]);
+  }, [customAmount, balanceDueAmount, orderInfo === null || orderInfo === void 0 ? void 0 : orderInfo.isDeposit]);
 
   // 检查是否应该禁用按钮：原本disabled为true 或者 订单金额为0
   var isAmountButtonsDisabled = disabled || Number(customAmount || 0) === 0;
@@ -125,33 +127,35 @@ export function CashPaymentModule(_ref) {
               break;
             }
             setAmount('');
-            _context.next = 32;
+            _context.next = 33;
             break;
           case 13:
             // 移除可能的货币符号和多余空格
             cleanValue = finalValue.replace(/[$\s]/g, '');
             numValue = parseFloat(cleanValue); // 检查当前金额是否等于剩余支付金额
-            balanceDue = parseFloat(balanceDueAmount);
+            debugger;
+            // 需要确认当前是否是定金模式，如果是定金模式则 balanceDue 应该为完整订单剩余待付金额
+            balanceDue = parseFloat(orderInfo !== null && orderInfo !== void 0 && orderInfo.isDeposit ? balanceDueTotalAmount || '0' : balanceDueAmount);
             shouldApplyRounding = Math.abs(numValue - balanceDue) < 0.01; // 使用小数精度比较
             finalAmount = numValue;
             roundingDiff = 0;
             if (!(shouldApplyRounding && roundingFunction)) {
-              _context.next = 29;
+              _context.next = 30;
               break;
             }
-            _context.next = 22;
+            _context.next = 23;
             return roundingFunction(numValue);
-          case 22:
+          case 23:
             _result = _context.sent;
             _ref3 = _result || {}, _ref3$roundedAmount = _ref3.roundedAmount, roundedAmount = _ref3$roundedAmount === void 0 ? numValue : _ref3$roundedAmount, _ref3$roundingDiffere = _ref3.roundingDifference, roundingDifference = _ref3$roundingDiffere === void 0 ? 0 : _ref3$roundingDiffere;
             finalAmount = roundedAmount;
             roundingDiff = roundingDifference;
             console.log('应用抹零：', numValue, '->', roundedAmount, '差额:', roundingDifference);
-            _context.next = 30;
+            _context.next = 31;
             break;
-          case 29:
-            console.log('不应用抹零，用户输入金额:', numValue, '剩余支付金额:', balanceDue);
           case 30:
+            console.log('不应用抹零，用户输入金额:', numValue, '剩余支付金额:', balanceDue);
+          case 31:
             setRoundingAmount(roundingDiff);
             if (isNaN(numValue)) {
               setAmount('');
@@ -159,7 +163,7 @@ export function CashPaymentModule(_ref) {
               setAmount(finalAmount.toString());
               console.log('设置金额为:', finalAmount);
             }
-          case 32:
+          case 33:
           case "end":
             return _context.stop();
         }