@pisell/private-materials 6.5.4 → 6.5.6

package/es/components/checkout/PaymentModal.js

@@ -16,13 +16,14 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useRef, useState, useEffect, useCallback, useMemo, useImperativeHandle, forwardRef } from 'react';
+import Decimal from 'decimal.js';
 import { locales } from '@pisell/utils';
 import { getLocale } from "../../utils/locales";
 import { useMemoizedFn } from 'ahooks';
 import { createPortal } from 'react-dom';
 import ReactDOM from 'react-dom';
 import checkoutLocales from "./locales";
-import { PisellContainer, PisellAdjustPrice, Icon, useToast, ConfigProvider } from '@pisell/materials';
+import { PisellContainer, Icon, useToast, ConfigProvider } from '@pisell/materials';
 import useEngineContext from "../../hooks/useEngineContext";
 import NoteModal from "../../plus/noteModal";
 import SendPaymentLinkModal from "./components/SendPaymentLinkModal";
@@ -46,6 +47,7 @@ import { getShopWalletPassId, reorderPaymentMethodList } from "./utils";
 import usePaymentLogger from "./hooks/usePaymentLogger";
 import { Button } from 'antd';
 import usePrinter from "../../hooks/printer";
+import { DiscountKeyboard } from "../../pro/priceKeyboard";
 
 // Checkout 模块的事件常量
 var CheckoutHooks = {
@@ -87,7 +89,9 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
     dynamicMaxHeight = _ref$dynamicMaxHeight === void 0 ? '600px' : _ref$dynamicMaxHeight,
     onOrderSyncFailed = _ref.onOrderSyncFailed,
     generateActionButtons = _ref.generateActionButtons,
-    paymentResultToastConfig = _ref.paymentResultToastConfig;
+    paymentResultToastConfig = _ref.paymentResultToastConfig,
+    updateOrderInfo = _ref.updateOrderInfo,
+    setCurrentEditOrderId = _ref.setCurrentEditOrderId;
   var context = useEngineContext();
   var utils = context.appHelper.utils || {};
   var pisellos = utils.pisellos,
@@ -140,6 +144,10 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
     setWalletPassData = _useState16[1];
   var _usePrinter = usePrinter(),
     nativePrint = _usePrinter.nativePrint;
+  var _useState17 = useState(false),
+    _useState18 = _slicedToArray(_useState17, 2),
+    syncingLock = _useState18[0],
+    setSyncingLock = _useState18[1];
   var isOrderFree = useMemo(function () {
     if (!customAmount) return false;
     var amount = parseFloat(customAmount);
@@ -147,14 +155,14 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
   }, [customAmount]);
 
   // 新增状态：订单备注和手动折扣
-  var _useState17 = useState(false),
-    _useState18 = _slicedToArray(_useState17, 2),
-    paymentLinkModalOpen = _useState18[0],
-    setPaymentLinkModalOpen = _useState18[1];
   var _useState19 = useState(false),
     _useState20 = _slicedToArray(_useState19, 2),
-    showPriceAdjustModal = _useState20[0],
-    setShowPriceAdjustModal = _useState20[1];
+    paymentLinkModalOpen = _useState20[0],
+    setPaymentLinkModalOpen = _useState20[1];
+  var _useState21 = useState(false),
+    _useState22 = _slicedToArray(_useState21, 2),
+    showPriceAdjustModal = _useState22[0],
+    setShowPriceAdjustModal = _useState22[1];
   var logger = usePaymentLogger();
   var currency = getData('shop_currency_code') || 'USD';
 
@@ -189,7 +197,19 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
               var _method$name;
               return method.code === 'CASHMANUAL' || method.type === 'CASHMANUAL' || ((_method$name = method.name) === null || _method$name === void 0 ? void 0 : _method$name.toLowerCase().includes('cash'));
             });
-            _context.next = 3;
+            logger === null || logger === void 0 || logger.addLog({
+              type: 'info',
+              title: 'open_till',
+              metadata: {}
+            });
+            interaction === null || interaction === void 0 || (_interaction$utils = interaction.utils) === null || _interaction$utils === void 0 || (_interaction$utils$po = _interaction$utils.postMessageToApp) === null || _interaction$utils$po === void 0 || _interaction$utils$po.call(_interaction$utils, {
+              module: 'till',
+              key: 'open_till',
+              data: {
+                type: 'cash' // cash 不需要验证钱箱权限
+              }
+            });
+            _context.next = 5;
             return checkoutModule === null || checkoutModule === void 0 ? void 0 : checkoutModule.addPaymentItemAsync({
               amount: result.amount,
               /** 支付类型，跟支付列表上对应的支付方式保持一致 */
@@ -204,19 +224,6 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
               voucher_id: 0,
               rounding_amount: result.roundingAmount
             });
-          case 3:
-            logger === null || logger === void 0 || logger.addLog({
-              type: 'info',
-              title: 'open_till',
-              metadata: {}
-            });
-            interaction === null || interaction === void 0 || (_interaction$utils = interaction.utils) === null || _interaction$utils === void 0 || (_interaction$utils$po = _interaction$utils.postMessageToApp) === null || _interaction$utils$po === void 0 || _interaction$utils$po.call(_interaction$utils, {
-              module: 'till',
-              key: 'open_till',
-              data: {
-                type: 'cash' // cash 不需要验证钱箱权限
-              }
-            });
           case 5:
           case "end":
             return _context.stop();
@@ -228,11 +235,12 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
     };
   }();
 
-  // 处理 surcharge 字符串，去除前面的 $ 符号
+  // 处理 surcharge 字符串，提取其中的金额数字（包括小数点）
   var processSurcharge = function processSurcharge(surcharge) {
     if (typeof surcharge === 'string') {
-      // 去除前面的 $ 符号和其他货币符号
-      return surcharge.replace(/^[$¥€£]+/, '');
+      // 使用正则表达式提取字符串中的数字（包括小数点）
+      var match = surcharge.match(/\d+(?:\.\d+)?/);
+      return match ? match[0] : undefined;
     }
     if (typeof surcharge === 'number') {
       // 如果是数字，转换为字符串
@@ -242,11 +250,13 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
   };
   var onPaymentOptionClick = /*#__PURE__*/function () {
     var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(method) {
-      var _ref4, id, code, name, type, eftposCodes, mx51Code, payType, _paymentMethodsRef$cu, data, isSynced, orderId, service_charge;
+      var _method$totalAmount;
+      var _ref4, id, code, name, type, finalAmount, eftposCodes, mx51Code, payType, _paymentMethodsRef$cu, data, isSynced, _orderId, _method$metadata, service_charge, _interaction$utils2, _interaction$utils2$p;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
-            _ref4 = method || {}, id = _ref4.id, code = _ref4.code, name = _ref4.name, type = _ref4.type; // 这里需要根据支付方式来判断是 eftpos 还是 mx51
+            _ref4 = method || {}, id = _ref4.id, code = _ref4.code, name = _ref4.name, type = _ref4.type;
+            finalAmount = (_method$totalAmount = method.totalAmount) !== null && _method$totalAmount !== void 0 ? _method$totalAmount : customAmount; // 这里需要根据支付方式来判断是 eftpos 还是 mx51
             eftposCodes = ['EFTPOS_LINKLY', 'EFTPOS_PAYO', 'EFTPOS_WINDCAVE', 'EFTPOS_TYRO'];
             mx51Code = 'EFTPOS';
             payType = '';
@@ -256,32 +266,32 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
               payType = 'mx51';
             }
             if (!payType) {
-              _context2.next = 22;
+              _context2.next = 23;
               break;
             }
-            _context2.next = 8;
+            _context2.next = 9;
             return checkoutModule.isCurrentOrderSynced();
-          case 8:
+          case 9:
             isSynced = _context2.sent;
             if (isSynced) {
-              _context2.next = 15;
+              _context2.next = 16;
               break;
             }
-            _context2.next = 12;
+            _context2.next = 13;
             return checkoutModule.manualSyncOrderAsync();
-          case 12:
+          case 13:
             data = _context2.sent;
-            _context2.next = 19;
+            _context2.next = 20;
             break;
-          case 15:
-            _context2.next = 17;
+          case 16:
+            _context2.next = 18;
             return checkoutModule.getCurrentOrderId();
-          case 17:
-            orderId = _context2.sent;
+          case 18:
+            _orderId = _context2.sent;
             data = {
-              orderId: orderId
+              orderId: _orderId
             };
-          case 19:
+          case 20:
             (_paymentMethodsRef$cu = paymentMethodsRef.current) === null || _paymentMethodsRef$cu === void 0 || _paymentMethodsRef$cu.onPay(payType, {
               source: 'normal',
               data: {
@@ -294,7 +304,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
                 params: {
                   orderId: data.orderId,
                   symbol: getData('shop_symbol'),
-                  amount: customAmount,
+                  amount: finalAmount,
                   surcharge: processSurcharge(method.surcharge)
                 },
                 mode: 'pay'
@@ -345,9 +355,9 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
                 }
               }
             });
-            _context2.next = 26;
+            _context2.next = 28;
             break;
-          case 22:
+          case 23:
             service_charge = null;
             if (method !== null && method !== void 0 && method.fixed || method !== null && method !== void 0 && method.percentage) {
               service_charge = {
@@ -355,10 +365,26 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
                 percentage: (method === null || method === void 0 ? void 0 : method.percentage) || '0'
               };
             }
+            // 如果是自定义支付并且开启了钱箱，则先打开钱箱
+            if (method.type === 'custom' && (_method$metadata = method.metadata) !== null && _method$metadata !== void 0 && _method$metadata.order_open_cash_drawer) {
+              logger === null || logger === void 0 || logger.addLog({
+                type: 'info',
+                title: 'open_till',
+                metadata: {}
+              });
+              // handleToastClose();
+              interaction === null || interaction === void 0 || (_interaction$utils2 = interaction.utils) === null || _interaction$utils2 === void 0 || (_interaction$utils2$p = _interaction$utils2.postMessageToApp) === null || _interaction$utils2$p === void 0 || _interaction$utils2$p.call(_interaction$utils2, {
+                module: 'till',
+                key: 'open_till',
+                data: {
+                  type: 'cash' // cash 不需要验证钱箱权限
+                }
+              });
+            }
             // 从支付方式列表中查找现金支付方式
-            _context2.next = 26;
+            _context2.next = 28;
             return checkoutModule === null || checkoutModule === void 0 ? void 0 : checkoutModule.addPaymentItemAsync({
-              amount: customAmount,
+              amount: finalAmount,
               /** 支付类型，跟支付列表上对应的支付方式保持一致 */
               code: method.code,
               /** 支付类型id，跟支付列表上对应的支付方式保持一致 */
@@ -372,7 +398,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
               /** 支付手续费 */
               service_charge: service_charge
             });
-          case 26:
+          case 28:
           case "end":
             return _context2.stop();
         }
@@ -438,6 +464,9 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
           return _ref6.apply(this, arguments);
         };
       }());
+      checkoutModule.getCurrentOrderPaymentItemsAsync().then(function (items) {
+        setPaymentItems(items);
+      });
     }
   }, [checkoutModule, orderInfo]);
 
@@ -494,9 +523,11 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
           });
           var orderSubmitStartUnsubscribe = core.effects.on(CheckoutHooks.OnOrderSubmitStart, function () {
             var _Toast$loading;
+            setSyncingLock(true);
             Toast === null || Toast === void 0 || (_Toast$loading = Toast.loading) === null || _Toast$loading === void 0 || _Toast$loading.call(Toast);
           });
           var orderSubmitEndUnsubscribe = core.effects.on(CheckoutHooks.OnOrderSubmitEnd, function (res) {
+            setSyncingLock(false);
             if (res.success) {
               var _Toast$hide;
               Toast === null || Toast === void 0 || (_Toast$hide = Toast.hide) === null || _Toast$hide === void 0 || _Toast$hide.call(Toast);
@@ -522,22 +553,46 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
           // );
           var orderPaymentAddedUnsubscribe = core.effects.on(CheckoutHooks.OnOrderPaymentAdded, /*#__PURE__*/function () {
             var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(data) {
-              var balanceDueAmount, autoCloseConfig, _orderInfo;
+              var orderInfo, balanceDueAmount, autoCloseConfig, _paymentItems, _totalAmount, serviceChargeTotal, paymentMethodName, isCashPayment, _interaction$utils3, _interaction$utils3$p;
               return _regeneratorRuntime().wrap(function _callee5$(_context5) {
                 while (1) switch (_context5.prev = _context5.next) {
                   case 0:
                     console.log('orderPaymentAddedUnsubscribe>>>>', data);
+                    // 需要更新 order_info
+                    orderInfo = checkoutModule.getCurrentOrderInfo();
+                    updateOrderInfo === null || updateOrderInfo === void 0 || updateOrderInfo(orderInfo);
                     balanceDueAmount = checkoutModule.getBalanceDueAmount();
                     if (!(Number(balanceDueAmount) > 0)) {
-                      _context5.next = 7;
+                      _context5.next = 13;
                       break;
                     }
                     autoCloseConfig = calculateAutoCloseConfig('partially_paid', false); // 获取订单总金额
-                    _orderInfo = checkoutModule.getCurrentOrderInfo(); // 根据支付状态展示不同的 toast
-                    _context5.next = 7;
+                    _context5.next = 8;
+                    return checkoutModule.getCurrentOrderPaymentItemsAsync();
+                  case 8:
+                    _paymentItems = _context5.sent;
+                    _totalAmount = new Decimal(orderInfo.isDeposit ? orderInfo.depositAmount : orderInfo.totalAmount); // 如果现在有支付项了，而且还有手续费产生，totalAmount 的计算需要加上手续费
+                    if (_paymentItems.length > 0 && _paymentItems.filter(function (n) {
+                      return n.isSynced;
+                    }).some(function (item) {
+                      return item.service_charge;
+                    })) {
+                      serviceChargeTotal = _paymentItems.reduce(function (acc, item) {
+                        var _item$service_charge, _item$service_charge2;
+                        var chargeAmount = new Decimal(((_item$service_charge = item.service_charge) === null || _item$service_charge === void 0 ? void 0 : _item$service_charge.amount) || 0);
+                        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));
+                        return acc.add(itemServiceCharge);
+                      }, new Decimal(0));
+                      _totalAmount = _totalAmount.add(serviceChargeTotal);
+                    }
+
+                    // 根据支付状态展示不同的 toast
+                    _context5.next = 13;
                     return displayPaymentResultToast({
                       paymentStatus: 'partially_paid',
-                      orderTotalAmount: _orderInfo.totalAmount,
+                      orderTotalAmount: _totalAmount.toNumber(),
                       gapAmount: balanceDueAmount,
                       failureReason: '',
                       autoCloseConfig: autoCloseConfig,
@@ -552,7 +607,26 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
                         // 不自动关闭Modal，让两个弹窗独立管理
                       }
                     }));
-                  case 7:
+                  case 13:
+                    // 判断是否为现金支付
+                    paymentMethodName = data.paymentMethodName || data.name || '';
+                    isCashPayment = data.paymentMethodCode === 'CASHMANUAL' || /现金|現金/i.test(paymentMethodName) || /cash/i.test(paymentMethodName);
+                    if (isCashPayment) {
+                      logger === null || logger === void 0 || logger.addLog({
+                        type: 'info',
+                        title: 'open_till',
+                        metadata: {}
+                      });
+                      // handleToastClose();
+                      interaction === null || interaction === void 0 || (_interaction$utils3 = interaction.utils) === null || _interaction$utils3 === void 0 || (_interaction$utils3$p = _interaction$utils3.postMessageToApp) === null || _interaction$utils3$p === void 0 || _interaction$utils3$p.call(_interaction$utils3, {
+                        module: 'till',
+                        key: 'open_till',
+                        data: {
+                          type: 'cash' // cash 不需要验证钱箱权限
+                        }
+                      });
+                    }
+                  case 16:
                   case "end":
                     return _context5.stop();
                 }
@@ -655,7 +729,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
   // 当 walletpass 直接就满足订单支付时，触发此方法
   var handleWalletPassConfirmPay = /*#__PURE__*/function () {
     var _ref11 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(action) {
-      var result, _result$response, responseData, _responseData$payment, params;
+      var result, _result$response, _orderInfo, responseData, _responseData$payment, params;
       return _regeneratorRuntime().wrap(function _callee8$(_context8) {
         while (1) switch (_context8.prev = _context8.next) {
           case 0:
@@ -682,31 +756,43 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
             _context8.next = 12;
             return showSuccessToast === null || showSuccessToast === void 0 ? void 0 : showSuccessToast(result);
           case 12:
-            if (result.success) {
-              responseData = (_result$response = result.response) === null || _result$response === void 0 ? void 0 : _result$response.data; // 打印订单完整信息
-              console.log('print_order_onOrderSynced>>>>', result);
-              try {
-                params = {
-                  type: '99',
-                  // 打印订单全部信息
-                  data: {
-                    order_id: responseData.order_id,
-                    machine_code_print_info: responseData === null || responseData === void 0 ? void 0 : responseData.machine_code_print_info,
-                    small_ticket_data: responseData === null || responseData === void 0 || (_responseData$payment = responseData.payment_info) === null || _responseData$payment === void 0 ? void 0 : _responseData$payment.small_ticket_data,
-                    machine_code_print_info_v2: responseData === null || responseData === void 0 ? void 0 : responseData.machine_code_print_info_v2
-                  }
-                };
-                console.log('print_order_onOrderSynced_params>>>>', params);
-                nativePrint(params, function (res) {
-                  console.log('print_order_onOrderSynced_res>>>>', res);
-                });
-              } catch (error) {
-                console.error('print_order_onOrderSynced_error>>>>', error);
-              }
-              // 支付成功时关闭 PaymentModal
-              onPaymentCancel(true);
+            if (!result.success) {
+              _context8.next = 22;
+              break;
             }
-          case 13:
+            // 检查订单此时是不是定金支付订单
+            _orderInfo = checkoutModule.getCurrentOrderInfo();
+            setCurrentEditOrderId === null || setCurrentEditOrderId === void 0 || setCurrentEditOrderId(result.orderId);
+            if (!(result.is_deposit && Number(_orderInfo.depositAmount < _orderInfo.totalAmount))) {
+              _context8.next = 18;
+              break;
+            }
+            updateOrderInfo === null || updateOrderInfo === void 0 || updateOrderInfo(_orderInfo);
+            return _context8.abrupt("return");
+          case 18:
+            responseData = (_result$response = result.response) === null || _result$response === void 0 ? void 0 : _result$response.data; // 打印订单完整信息
+            console.log('print_order_onOrderSynced>>>>', result);
+            try {
+              params = {
+                type: '99',
+                // 打印订单全部信息
+                data: {
+                  order_id: responseData.order_id,
+                  machine_code_print_info: responseData === null || responseData === void 0 ? void 0 : responseData.machine_code_print_info,
+                  small_ticket_data: responseData === null || responseData === void 0 || (_responseData$payment = responseData.payment_info) === null || _responseData$payment === void 0 ? void 0 : _responseData$payment.small_ticket_data,
+                  machine_code_print_info_v2: responseData === null || responseData === void 0 ? void 0 : responseData.machine_code_print_info_v2
+                }
+              };
+              console.log('print_order_onOrderSynced_params>>>>', params);
+              nativePrint(params, function (res) {
+                console.log('print_order_onOrderSynced_res>>>>', res);
+              });
+            } catch (error) {
+              console.error('print_order_onOrderSynced_error>>>>', error);
+            }
+            // 支付成功时关闭 PaymentModal
+            onPaymentCancel(true);
+          case 22:
           case "end":
             return _context8.stop();
         }
@@ -838,6 +924,11 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
       return 0;
     }
   }, [state, showPriceAdjustModal]);
+
+  // 手动折扣后订单总价
+  var currentTotalPriceAfterDiscount = useMemo(function () {
+    return new Decimal(currentTotalPrice).minus(state.shop_discount || 0).toNumber();
+  }, [state.shop_discount, currentTotalPrice]);
   var handleSelectWalletChange = useMemoizedFn( /*#__PURE__*/function () {
     var _ref13 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(select) {
       var voucherItems, data;
@@ -851,7 +942,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
             voucherItems = [];
             select.forEach(function (item) {
               var mapCode = item.code ? WALLET_PASS_CODE_MAP[item.code] : null;
-              if (mapCode) {
+              if (mapCode && walletPassDetail.map[mapCode]) {
                 var _walletPassDetail$map, _walletPassDetail$map2, _walletPassDetail$map3, _walletPassDetail$map4;
                 voucherItems.push({
                   /** 支付金额 */
@@ -895,32 +986,19 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
 
   // 手动折扣相关处理函数
   var handlePriceAdjustConfirm = /*#__PURE__*/function () {
-    var _ref14 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11(newPrice) {
-      var ScheduleModule, _getSumTotal2, productAmount, discountAmount;
+    var _ref14 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11(discountAmount) {
       return _regeneratorRuntime().wrap(function _callee11$(_context11) {
         while (1) switch (_context11.prev = _context11.next) {
           case 0:
             try {
               if (checkoutModule && orderInfo !== null && orderInfo !== void 0 && orderInfo.totalAmount) {
                 if (dispatch) {
-                  ScheduleModule = pisellosAllModule.ScheduleModule;
-                  _getSumTotal2 = getSumTotal(state, {
-                    isEdit: true,
-                    ScheduleModule: ScheduleModule
-                  }), productAmount = _getSumTotal2.productAmount; // 计算折扣金额（商品总金额 - 新价格）
-                  // 存储正数：正数表示折扣，0表示无折扣
-                  discountAmount = Math.max(0, productAmount - newPrice); // 转换为金额字符串格式（2位小数）
-                  // const discountAmountStr = formatAmount(discountAmount, 2, '');
-                  // 修改os 中折扣的数据
-                  // await checkoutModule.updateShopDiscountAsync(discountAmountStr);
-                  // 同步修改购物车的数据
                   dispatch({
                     type: 'setState',
                     payload: {
                       shop_discount: discountAmount
                     }
                   });
-                  // 修改 pisellos 中 shop_discount 的值
                 }
               }
             } catch (error) {
@@ -940,7 +1018,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
   var handleButtonClick = /*#__PURE__*/function () {
     var _ref15 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12(key) {
       var _savePayLaterHandlerR;
-      var data, isSynced, orderId, params, _paymentItems;
+      var data, isSynced, _orderId2, params, _paymentItems2;
       return _regeneratorRuntime().wrap(function _callee12$(_context12) {
         while (1) switch (_context12.prev = _context12.next) {
           case 0:
@@ -973,9 +1051,9 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
             _context12.next = 19;
             return checkoutModule.getCurrentOrderId();
           case 19:
-            orderId = _context12.sent;
+            _orderId2 = _context12.sent;
             data = {
-              orderId: orderId
+              orderId: _orderId2
             };
           case 21:
             console.log('handleButtonClick_print-receipt_data>>>>', data);
@@ -1010,8 +1088,8 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
             _context12.next = 29;
             return checkoutModule.getCurrentOrderPaymentItemsAsync();
           case 29:
-            _paymentItems = _context12.sent;
-            if (!(_paymentItems !== null && _paymentItems !== void 0 && _paymentItems.length)) {
+            _paymentItems2 = _context12.sent;
+            if (!(_paymentItems2 !== null && _paymentItems2 !== void 0 && _paymentItems2.length)) {
               _context12.next = 33;
               break;
             }
@@ -1169,7 +1247,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
     onSearch: handleSearch
   }, searchAndClientProps)), moduleConfig.showWalletPass && /*#__PURE__*/React.createElement(WalletPassModule, {
     clientId: state === null || state === void 0 || (_state$client2 = state.client) === null || _state$client2 === void 0 || (_state$client2 = _state$client2.value) === null || _state$client2 === void 0 ? void 0 : _state$client2.id,
-    customAmount: customAmount,
+    customAmount: balanceDueAmount,
     orderInfo: orderInfo || undefined,
     ref: walletPassRef,
     paymentItems: paymentItems,
@@ -1197,8 +1275,10 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
       gridRow: '1'
     } : {}
   }, /*#__PURE__*/React.createElement(CashPaymentModule, {
+    disabled: isOrderFree,
     isModalOpen: isModalOpen,
-    amountSymbol: state.amountSymbol,
+    syncingLock: syncingLock,
+    amountSymbol: getData('shop_symbol'),
     orderInfo: orderInfo || undefined,
     onPaymentComplete: handleAddCashPayment,
     amountButtons: recommendAmounts,
@@ -1246,34 +1326,20 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
       return setPaymentLinkModalOpen(false);
     },
     sendPaymentLink: handleSendCustomerPaymentLink
-  }), showPriceAdjustModal && /*#__PURE__*/createPortal( /*#__PURE__*/React.createElement("div", {
-    className: "pisell-price-adjust-overlay"
-  }, /*#__PURE__*/React.createElement("button", {
-    className: "pisell-price-adjust-backdrop",
-    style: {
-      cursor: 'pointer',
-      border: 'none',
-      background: 'transparent',
-      width: '100%',
-      height: '100%',
-      position: 'absolute',
-      top: 0,
-      left: 0
-    },
-    onClick: function onClick() {
-      return setShowPriceAdjustModal(false);
+  }), /*#__PURE__*/React.createElement(DiscountKeyboard, {
+    containerProps: {
+      renderType: 'modal',
+      open: showPriceAdjustModal,
+      onCancel: function onCancel() {
+        return setShowPriceAdjustModal(false);
+      }
     },
-    "aria-label": locales.getText('pisell2.checkout.modal.close-price-adjustment') || 'Close price adjustment modal'
-  }), /*#__PURE__*/React.createElement("div", {
-    className: "pisell-price-adjust-container"
-  }, /*#__PURE__*/React.createElement(PisellAdjustPrice, {
     selectType: "dark",
-    originValue: currentTotalPrice,
-    value: currentTotalPrice,
-    onChange: handlePriceAdjustConfirm,
+    originalValue: currentTotalPrice,
+    defaultValue: currentTotalPriceAfterDiscount,
     resetText: locales.getText('pisell2.checkout.modal.reset-price-adjustment'),
-    doneText: locales.getText('pisell2.checkout.modal.done-price-adjustment')
-  }))), document.body), /*#__PURE__*/React.createElement(SavePayLaterHandler, {
+    onEnter: handlePriceAdjustConfirm
+  }), /*#__PURE__*/React.createElement(SavePayLaterHandler, {
     ref: savePayLaterHandlerRef,
     amountSymbol: state.amountSymbol,
     walletPassData: walletPassData,
@@ -1290,33 +1356,39 @@ var PaymentModal = function PaymentModal(_ref18) {
     callback = _ref18.callback,
     onClose = _ref18.onClose,
     dispatch = _ref18.dispatch,
-    state = _ref18.state;
+    state = _ref18.state,
+    setEditCartMode = _ref18.setEditCartMode,
+    editOrderId = _ref18.editOrderId;
   var context = useEngineContext();
   locales.init(checkoutLocales, ((_context$appHelper$ut = context.appHelper.utils) === null || _context$appHelper$ut === void 0 || (_context$appHelper$ut2 = _context$appHelper$ut.getApp) === null || _context$appHelper$ut2 === void 0 || (_context$appHelper$ut2 = _context$appHelper$ut2.call(_context$appHelper$ut)) === null || _context$appHelper$ut2 === void 0 || (_context$appHelper$ut2 = _context$appHelper$ut2.locales) === null || _context$appHelper$ut2 === void 0 || (_context$appHelper$ut3 = _context$appHelper$ut2.getLocale) === null || _context$appHelper$ut3 === void 0 ? void 0 : _context$appHelper$ut3.call(_context$appHelper$ut2)) || ((_context$appHelper$ut4 = context.appHelper.utils) === null || _context$appHelper$ut4 === void 0 || (_context$appHelper$ut4 = _context$appHelper$ut4.storage) === null || _context$appHelper$ut4 === void 0 ? void 0 : _context$appHelper$ut4.get('umi_locale')) || 'en');
   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 _useState21 = useState(null),
-    _useState22 = _slicedToArray(_useState21, 2),
-    orderInfo = _useState22[0],
-    setOrderInfo = _useState22[1];
-  var _useState23 = useState(0),
+  var _useState23 = useState(null),
     _useState24 = _slicedToArray(_useState23, 2),
-    totalAmount = _useState24[0],
-    setTotalAmount = _useState24[1];
-  var _useState25 = useState(true),
+    orderInfo = _useState24[0],
+    setOrderInfo = _useState24[1];
+  var _useState25 = useState(0),
     _useState26 = _slicedToArray(_useState25, 2),
-    actualShowCashPayment = _useState26[0],
-    setActualShowCashPayment = _useState26[1];
-  var _useState27 = useState(0),
+    totalAmount = _useState26[0],
+    setTotalAmount = _useState26[1];
+  var _useState27 = useState(true),
     _useState28 = _slicedToArray(_useState27, 2),
-    windowHeight = _useState28[0],
-    setWindowHeight = _useState28[1];
-  var _useState29 = useState(false),
+    actualShowCashPayment = _useState28[0],
+    setActualShowCashPayment = _useState28[1];
+  var _useState29 = useState(0),
     _useState30 = _slicedToArray(_useState29, 2),
-    showRetryModal = _useState30[0],
-    setShowRetryModal = _useState30[1];
+    windowHeight = _useState30[0],
+    setWindowHeight = _useState30[1];
+  var _useState31 = useState(false),
+    _useState32 = _slicedToArray(_useState31, 2),
+    showRetryModal = _useState32[0],
+    setShowRetryModal = _useState32[1];
+  var _useState33 = useState(editOrderId || 0),
+    _useState34 = _slicedToArray(_useState33, 2),
+    currentEditOrderId = _useState34[0],
+    _setCurrentEditOrderId = _useState34[1];
   var Toast = useToast();
   var _usePrinter2 = usePrinter(),
     nativePrint = _usePrinter2.nativePrint;
@@ -1383,17 +1455,17 @@ var PaymentModal = function PaymentModal(_ref18) {
 
   // 初始化 tillButton 数据
   useEffect(function () {
-    var _interaction$utils3;
+    var _interaction$utils5;
     var initTillButtonData = /*#__PURE__*/function () {
       var _ref21 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16() {
-        var _interaction$utils2, _interaction$utils2$a, tillButtonData;
+        var _interaction$utils4, _interaction$utils4$a, tillButtonData;
         return _regeneratorRuntime().wrap(function _callee16$(_context16) {
           while (1) switch (_context16.prev = _context16.next) {
             case 0:
               console.log('准备获取tillButton数据');
               _context16.prev = 1;
               _context16.next = 4;
-              return interaction === null || interaction === void 0 || (_interaction$utils2 = interaction.utils) === null || _interaction$utils2 === void 0 || (_interaction$utils2$a = _interaction$utils2.asyncDataManager) === null || _interaction$utils2$a === void 0 ? void 0 : _interaction$utils2$a.call(_interaction$utils2, {
+              return interaction === null || interaction === void 0 || (_interaction$utils4 = interaction.utils) === null || _interaction$utils4 === void 0 || (_interaction$utils4$a = _interaction$utils4.asyncDataManager) === null || _interaction$utils4$a === void 0 ? void 0 : _interaction$utils4$a.call(_interaction$utils4, {
                 module: 'get',
                 key: 'till_button'
               });
@@ -1423,7 +1495,7 @@ var PaymentModal = function PaymentModal(_ref18) {
     }();
 
     // 只在 PaymentModal 打开时初始化 tillButton 数据
-    if (interaction !== null && interaction !== void 0 && (_interaction$utils3 = interaction.utils) !== null && _interaction$utils3 !== void 0 && _interaction$utils3.asyncDataManager) {
+    if (interaction !== null && interaction !== void 0 && (_interaction$utils5 = interaction.utils) !== null && _interaction$utils5 !== void 0 && _interaction$utils5.asyncDataManager) {
       initTillButtonData();
     }
   }, [interaction]);
@@ -1437,7 +1509,7 @@ var PaymentModal = function PaymentModal(_ref18) {
       var matrix = new DOMMatrix(bodyTransform);
       scaleY = matrix.d;
     }
-    return "".concat(Math.floor((windowHeight * 0.9 - 72) / scaleY), "px");
+    return "".concat(Math.floor(windowHeight * 0.9 / scaleY), "px");
   }, [windowHeight]);
 
   // 模块配置 - 控制显示哪些支付模块
@@ -1451,23 +1523,23 @@ var PaymentModal = function PaymentModal(_ref18) {
   }, []);
 
   // 订单备注相关状态
-  var _useState31 = useState(false),
-    _useState32 = _slicedToArray(_useState31, 2),
-    noteModalOpen = _useState32[0],
-    setNoteModalOpen = _useState32[1];
-  var _useState33 = useState(''),
-    _useState34 = _slicedToArray(_useState33, 2),
-    orderNote = _useState34[0],
-    setOrderNote = _useState34[1];
-  var _useState35 = useState('payment-content'),
+  var _useState35 = useState(false),
     _useState36 = _slicedToArray(_useState35, 2),
-    noteModalSource = _useState36[0],
-    setNoteModalSource = _useState36[1];
+    noteModalOpen = _useState36[0],
+    setNoteModalOpen = _useState36[1];
+  var _useState37 = useState(''),
+    _useState38 = _slicedToArray(_useState37, 2),
+    orderNote = _useState38[0],
+    setOrderNote = _useState38[1];
+  var _useState39 = useState('payment-content'),
+    _useState40 = _slicedToArray(_useState39, 2),
+    noteModalSource = _useState40[0],
+    setNoteModalSource = _useState40[1];
 
   // 订单备注相关处理函数
   var handleNoteConfirm = /*#__PURE__*/function () {
     var _ref22 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee17(noteValue) {
-      var checkoutModule, orderId, _checkoutModule$editO, _checkoutModule, _checkoutModule$updat;
+      var checkoutModule, _orderId3, _checkoutModule$editO, _checkoutModule, _checkoutModule$updat;
       return _regeneratorRuntime().wrap(function _callee17$(_context17) {
         while (1) switch (_context17.prev = _context17.next) {
           case 0:
@@ -1476,9 +1548,9 @@ var PaymentModal = function PaymentModal(_ref18) {
               break;
             }
             checkoutModule = pisellos === null || pisellos === void 0 ? void 0 : pisellos.getModule('checkout');
-            orderId = checkoutModule === null || checkoutModule === void 0 ? void 0 : checkoutModule.getCurrentOrderId();
+            _orderId3 = checkoutModule === null || checkoutModule === void 0 ? void 0 : checkoutModule.getCurrentOrderId();
             if (checkoutModule) {
-              (_checkoutModule$editO = checkoutModule.editOrderNoteByOrderIdAsync) === null || _checkoutModule$editO === void 0 || _checkoutModule$editO.call(checkoutModule, orderId, noteValue);
+              (_checkoutModule$editO = checkoutModule.editOrderNoteByOrderIdAsync) === null || _checkoutModule$editO === void 0 || _checkoutModule$editO.call(checkoutModule, _orderId3, noteValue);
               setOrderNote(noteValue);
               Toast === null || Toast === void 0 || Toast.success(locales.getText('pisell2.checkout.order-note.updated-successfully'));
             }
@@ -1620,19 +1692,19 @@ var PaymentModal = function PaymentModal(_ref18) {
     };
     var handleNoteConfirm = /*#__PURE__*/function () {
       var _ref24 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee19(noteValue) {
-        var checkoutModule, orderId, _checkoutModule$editO2;
+        var checkoutModule, _orderId4, _checkoutModule$editO2;
         return _regeneratorRuntime().wrap(function _callee19$(_context19) {
           while (1) switch (_context19.prev = _context19.next) {
             case 0:
               _context19.prev = 0;
               checkoutModule = pisellos === null || pisellos === void 0 ? void 0 : pisellos.getModule('checkout');
-              orderId = checkoutModule === null || checkoutModule === void 0 ? void 0 : checkoutModule.getCurrentOrderId();
-              if (!(checkoutModule && orderId)) {
+              _orderId4 = checkoutModule === null || checkoutModule === void 0 ? void 0 : checkoutModule.getCurrentOrderId();
+              if (!(checkoutModule && _orderId4)) {
                 _context19.next = 8;
                 break;
               }
               _context19.next = 6;
-              return (_checkoutModule$editO2 = checkoutModule.editOrderNoteByOrderIdAsync) === null || _checkoutModule$editO2 === void 0 ? void 0 : _checkoutModule$editO2.call(checkoutModule, orderId, noteValue);
+              return (_checkoutModule$editO2 = checkoutModule.editOrderNoteByOrderIdAsync) === null || _checkoutModule$editO2 === void 0 ? void 0 : _checkoutModule$editO2.call(checkoutModule, _orderId4, noteValue);
             case 6:
               setOrderNote(noteValue);
               showToast('success', locales.getText('pisell2.checkout.order-note.updated-successfully'));
@@ -1662,19 +1734,19 @@ var PaymentModal = function PaymentModal(_ref18) {
     }();
     var handleNoteDelete = /*#__PURE__*/function () {
       var _ref25 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee20() {
-        var checkoutModule, orderId, _checkoutModule$editO3;
+        var checkoutModule, _orderId5, _checkoutModule$editO3;
         return _regeneratorRuntime().wrap(function _callee20$(_context20) {
           while (1) switch (_context20.prev = _context20.next) {
             case 0:
               _context20.prev = 0;
               checkoutModule = pisellos === null || pisellos === void 0 ? void 0 : pisellos.getModule('checkout');
-              orderId = checkoutModule === null || checkoutModule === void 0 ? void 0 : checkoutModule.getCurrentOrderId();
-              if (!(checkoutModule && orderId)) {
+              _orderId5 = checkoutModule === null || checkoutModule === void 0 ? void 0 : checkoutModule.getCurrentOrderId();
+              if (!(checkoutModule && _orderId5)) {
                 _context20.next = 8;
                 break;
               }
               _context20.next = 6;
-              return (_checkoutModule$editO3 = checkoutModule.editOrderNoteByOrderIdAsync) === null || _checkoutModule$editO3 === void 0 ? void 0 : _checkoutModule$editO3.call(checkoutModule, orderId, '');
+              return (_checkoutModule$editO3 = checkoutModule.editOrderNoteByOrderIdAsync) === null || _checkoutModule$editO3 === void 0 ? void 0 : _checkoutModule$editO3.call(checkoutModule, _orderId5, '');
             case 6:
               setOrderNote('');
               showToast('success', locales.getText('pisell2.checkout.order-note.deleted-successfully'));
@@ -1820,6 +1892,52 @@ var PaymentModal = function PaymentModal(_ref18) {
     onClose === null || onClose === void 0 || onClose(reset || false);
   };
 
+  // 如果订单已经同步过，此时点击左上角返回，需要通知购物车进入编辑态
+  var handleSetEditCartMode = /*#__PURE__*/function () {
+    var _ref27 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee21() {
+      var closeModal,
+        checkout,
+        orderId,
+        paymentData,
+        paidAmount,
+        paidAmountWithoutSurcharge,
+        _args21 = arguments;
+      return _regeneratorRuntime().wrap(function _callee21$(_context21) {
+        while (1) switch (_context21.prev = _context21.next) {
+          case 0:
+            closeModal = _args21.length > 0 && _args21[0] !== undefined ? _args21[0] : false;
+            checkout = pisellos.getModule('checkout');
+            orderId = checkout.getCurrentOrderId();
+            _context21.next = 5;
+            return checkout.getCurrentOrderPaymentItemsAsync();
+          case 5:
+            paymentData = _context21.sent;
+            // 计算订单已付款和已付款（不包含手续费）的金额
+            paidAmount = paymentData.reduce(function (total, item) {
+              return total + Number(item.amount);
+            }, 0);
+            paidAmountWithoutSurcharge = paymentData.reduce(function (total, item) {
+              var _item$service_charge3;
+              return total + Number(item.amount) - Number(((_item$service_charge3 = item.service_charge) === null || _item$service_charge3 === void 0 ? void 0 : _item$service_charge3.amount) || 0);
+            }, 0);
+            console.log('paidAmount>>>>', paidAmount, paidAmountWithoutSurcharge);
+            // 清空临时选择的 voucher
+            checkout.updateVoucherPaymentItemsAsync([]);
+            setEditCartMode === null || setEditCartMode === void 0 || setEditCartMode(orderId, {
+              paidAmount: paidAmount,
+              paidAmountWithoutSurcharge: paidAmountWithoutSurcharge
+            }, closeModal);
+          case 11:
+          case "end":
+            return _context21.stop();
+        }
+      }, _callee21);
+    }));
+    return function handleSetEditCartMode() {
+      return _ref27.apply(this, arguments);
+    };
+  }();
+
   // 自定义头部组件
   var CustomHeader = function CustomHeader() {
     return /*#__PURE__*/React.createElement("div", {
@@ -1836,7 +1954,7 @@ var PaymentModal = function PaymentModal(_ref18) {
       onClick: function onClick() {
         var checkout = pisellos.getModule('checkout');
         if (checkout.isCurrentOrderSynced()) {
-          handlePaymentCancel(true);
+          handleSetEditCartMode(true);
         } else {
           handlePaymentCancel(false);
         }
@@ -1868,23 +1986,23 @@ var PaymentModal = function PaymentModal(_ref18) {
   // 初始化checkout数据
   useEffect(function () {
     var initCheckoutData = /*#__PURE__*/function () {
-      var _ref27 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee22() {
-        var checkout, _newData$subtotal_inf, shop_wallet_pass_id, newData, _orderInfo2, _data$subtotal_info, _orderInfo3;
-        return _regeneratorRuntime().wrap(function _callee22$(_context22) {
-          while (1) switch (_context22.prev = _context22.next) {
+      var _ref28 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee23() {
+        var checkout, shop_wallet_pass_id, newData, _newData$subtotal_inf, _newData$subtotal_inf2, _orderInfo2, _data$subtotal_info, _data$subtotal_info2, _orderInfo4;
+        return _regeneratorRuntime().wrap(function _callee23$(_context23) {
+          while (1) switch (_context23.prev = _context23.next) {
             case 0:
-              _context22.prev = 0;
+              _context23.prev = 0;
               // 获取 checkout 模块并处理订单数据
               checkout = pisellos === null || pisellos === void 0 ? void 0 : pisellos.getModule('checkout');
               if (!(checkout && data && !isLocalOrderCreated.current)) {
-                _context22.next = 18;
+                _context23.next = 24;
                 break;
               }
               isLocalOrderCreated.current = true;
-              _context22.next = 6;
+              _context23.next = 6;
               return getShopWalletPassId(interaction);
             case 6:
-              shop_wallet_pass_id = _context22.sent;
+              shop_wallet_pass_id = _context23.sent;
               checkout.setOtherParams({
                 is_price_include_tax: getData('is_price_include_tax'),
                 tax_rate: getData('tax_rate') || '10',
@@ -1899,16 +2017,33 @@ var PaymentModal = function PaymentModal(_ref18) {
               });
               newData = cloneDeep(data); // setTotalAmount(newData.total.expectAmount);
               // 先往 checkout 解决方案推送一条 local 数据
-              _context22.next = 11;
-              return checkout.createLocalOrderAsync({
+              if (!(editOrderId || currentEditOrderId)) {
+                _context23.next = 14;
+                break;
+              }
+              _context23.next = 12;
+              return checkout.updateLocalOrderAsync({
+                orderId: editOrderId || currentEditOrderId,
                 orderData: newData.order_info,
                 cartSummary: (_newData$subtotal_inf = newData.subtotal_info) === null || _newData$subtotal_inf === void 0 ? void 0 : _newData$subtotal_inf.subTotalList,
                 autoPayment: true,
                 totalInfo: newData.subtotal_info
               });
-            case 11:
+            case 12:
+              _context23.next = 16;
+              break;
+            case 14:
+              _context23.next = 16;
+              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:
               // 获取订单总金额
               _orderInfo2 = checkout.getCurrentOrderInfo();
+              console.log(_orderInfo2);
               if (_orderInfo2 && _orderInfo2.totalAmount) {
                 setTotalAmount(_orderInfo2.totalAmount);
               }
@@ -1924,37 +2059,40 @@ var PaymentModal = function PaymentModal(_ref18) {
               }
               // 监听订单同步完成，同步完成后显示订单完成 toast，关闭当前弹窗
               unsubscribeRef.current = checkout.core.effects.on('checkout:onOrderSynced', /*#__PURE__*/function () {
-                var _ref28 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee21(data) {
+                var _ref29 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee22(data) {
                   var _data$response, _responseData$payment2;
-                  var responseData, paymentStatus, orderTotalAmount, gapAmount, currentChangeGivenAmount, failureReason, _interaction$utils4, _interaction$utils4$a, _responseData$payment3, params, statusClassName, autoCloseConfig, enabledAutoPrint, paymentResult;
-                  return _regeneratorRuntime().wrap(function _callee21$(_context21) {
-                    while (1) switch (_context21.prev = _context21.next) {
+                  var currentOrderId, responseData, paymentStatus, orderTotalAmount, gapAmount, currentChangeGivenAmount, failureReason, _interaction$utils6, _interaction$utils6$a, _responseData$payment3, params, statusClassName, autoCloseConfig, enabledAutoPrint, _orderInfo3, paymentResult;
+                  return _regeneratorRuntime().wrap(function _callee22$(_context22) {
+                    while (1) switch (_context22.prev = _context22.next) {
                       case 0:
+                        // handleSetEditCartMode(false)
+                        currentOrderId = checkout.getCurrentOrderId();
+                        _setCurrentEditOrderId(currentOrderId);
                         // 获取支付状态和相关信息
                         responseData = (_data$response = data.response) === null || _data$response === void 0 ? void 0 : _data$response.data; // 获取支付状态
                         paymentStatus = responseData === null || responseData === void 0 ? void 0 : responseData.payment_status;
                         if (!data.isManual) {
-                          _context21.next = 4;
+                          _context22.next = 6;
                           break;
                         }
-                        return _context21.abrupt("return");
-                      case 4:
+                        return _context22.abrupt("return");
+                      case 6:
                         handlePaymentComplete(data);
                         // 如果正在显示现金支付 toast，跳过自动关闭逻辑
                         if (!showingCashToastRef.current) {
-                          _context21.next = 7;
+                          _context22.next = 9;
                           break;
                         }
-                        return _context21.abrupt("return");
-                      case 7:
+                        return _context22.abrupt("return");
+                      case 9:
                         // 获取订单总金额
                         orderTotalAmount = Number((responseData === null || responseData === void 0 ? void 0 : responseData.total_amount) || 0);
                         gapAmount = Number((responseData === null || responseData === void 0 ? void 0 : responseData.amount_gap) || 0);
-                        currentChangeGivenAmount = Number((responseData === null || responseData === void 0 || (_responseData$payment2 = responseData.payment_info) === null || _responseData$payment2 === void 0 ? void 0 : _responseData$payment2.current_change_given_amount) || 0); // const changeDue = Number(responseData?.amount_gap || 0);
+                        currentChangeGivenAmount = Number(responseData === null || responseData === void 0 || (_responseData$payment2 = responseData.payment_info) === null || _responseData$payment2 === void 0 ? void 0 : _responseData$payment2.current_change_given_amount); // const changeDue = Number(responseData?.amount_gap || 0);
                         // 获取失败原因
                         failureReason = responseData === null || responseData === void 0 ? void 0 : responseData.failure_reason; // 根据支付状态弹出对应的支付结果toast
                         if (!paymentStatus) {
-                          _context21.next = 27;
+                          _context22.next = 30;
                           break;
                         }
                         // 打印订单完整信息
@@ -2009,23 +2147,24 @@ var PaymentModal = function PaymentModal(_ref18) {
                         // 确定支付状态
                         statusClassName = calculateStatusClassName(paymentStatus);
                         autoCloseConfig = calculateAutoCloseConfig(paymentStatus, !!currentChangeGivenAmount);
-                        _context21.next = 19;
-                        return interaction === null || interaction === void 0 || (_interaction$utils4 = interaction.utils) === null || _interaction$utils4 === void 0 || (_interaction$utils4$a = _interaction$utils4.asyncDataManager) === null || _interaction$utils4$a === void 0 ? void 0 : _interaction$utils4$a.call(_interaction$utils4, {
+                        _context22.next = 21;
+                        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 19:
-                        enabledAutoPrint = _context21.sent;
-                        _context21.next = 22;
+                      case 21:
+                        enabledAutoPrint = _context22.sent;
+                        _orderInfo3 = checkout.getCurrentOrderInfo(); // 根据支付状态展示不同的 toast
+                        _context22.next = 25;
                         return displayPaymentResultToast({
                           paymentStatus: paymentStatus,
-                          orderTotalAmount: orderTotalAmount,
+                          orderTotalAmount: _orderInfo3.isDeposit ? _orderInfo3.depositAmount : orderTotalAmount,
                           gapAmount: paymentStatus === 'partially_paid' ? gapAmount : currentChangeGivenAmount,
                           failureReason: failureReason,
                           autoCloseConfig: autoCloseConfig,
                           actionButtons: generateActionButtons(paymentStatus, enabledAutoPrint)
                         }, paymentResultToastConfig);
-                      case 22:
+                      case 25:
                         // 当支付状态为 paid 时，关闭 paymentModal
                         if (paymentStatus === 'paid') {
                           handleModalClose();
@@ -2041,70 +2180,86 @@ var PaymentModal = function PaymentModal(_ref18) {
                           }
                         });
                         handlePaymentComplete(paymentResult);
-                        _context21.next = 28;
+                        _context22.next = 31;
                         break;
-                      case 27:
+                      case 30:
                         handlePaymentComplete(data);
-                      case 28:
+                      case 31:
                       case "end":
-                        return _context21.stop();
+                        return _context22.stop();
                     }
-                  }, _callee21);
+                  }, _callee22);
                 }));
                 return function (_x17) {
-                  return _ref28.apply(this, arguments);
+                  return _ref29.apply(this, arguments);
                 };
               }());
-              _context22.next = 29;
+              _context23.next = 40;
               break;
-            case 18:
+            case 24:
               if (!isLocalOrderCreated.current) {
-                _context22.next = 29;
+                _context23.next = 40;
                 break;
               }
               // // 如果本地订单已创建，这时候还更新了 data，则需要销毁当前的订单数据，然后更新新的订单数据了
               console.log('🔄 PaymentModal: data changed, updating checkout data...');
               isLocalOrderCreated.current = false;
-              _context22.next = 23;
+              _context23.next = 29;
               return checkout.cancelCurrentOrderAsync();
-            case 23:
-              _context22.next = 25;
-              return checkout.createLocalOrderAsync({
+            case 29:
+              if (!(editOrderId || currentEditOrderId)) {
+                _context23.next = 34;
+                break;
+              }
+              _context23.next = 32;
+              return checkout.updateLocalOrderAsync({
+                orderId: editOrderId || currentEditOrderId,
                 orderData: data === null || data === void 0 ? void 0 : data.order_info,
                 cartSummary: data === null || data === void 0 || (_data$subtotal_info = data.subtotal_info) === null || _data$subtotal_info === void 0 ? void 0 : _data$subtotal_info.subTotalList,
                 autoPayment: true,
                 totalInfo: data === null || data === void 0 ? void 0 : data.subtotal_info
               });
-            case 25:
+            case 32:
+              _context23.next = 36;
+              break;
+            case 34:
+              _context23.next = 36;
+              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:
               // 获取订单总金额
-              _orderInfo3 = checkout.getCurrentOrderInfo();
-              if (_orderInfo3 && _orderInfo3.totalAmount) {
-                setTotalAmount(_orderInfo3.totalAmount);
+              _orderInfo4 = checkout.getCurrentOrderInfo();
+              if (_orderInfo4 && _orderInfo4.totalAmount) {
+                setTotalAmount(_orderInfo4.totalAmount);
               }
-              setOrderInfo(_orderInfo3);
+              setOrderInfo(_orderInfo4);
               isLocalOrderCreated.current = true;
-            case 29:
-              _context22.next = 35;
+            case 40:
+              _context23.next = 46;
               break;
-            case 31:
-              _context22.prev = 31;
-              _context22.t0 = _context22["catch"](0);
-              console.error('Failed to initialize checkout data:', _context22.t0);
+            case 42:
+              _context23.prev = 42;
+              _context23.t0 = _context23["catch"](0);
+              console.error('Failed to initialize checkout data:', _context23.t0);
               logger === null || logger === void 0 || logger.addLog({
                 type: 'error',
                 title: 'Failed to initialize checkout data',
                 metadata: {
-                  error: _context22.t0
+                  error: _context23.t0
                 }
               });
-            case 35:
+            case 46:
             case "end":
-              return _context22.stop();
+              return _context23.stop();
           }
-        }, _callee22, null, [[0, 31]]);
+        }, _callee23, null, [[0, 42]]);
       }));
       return function initCheckoutData() {
-        return _ref27.apply(this, arguments);
+        return _ref28.apply(this, arguments);
       };
     }();
     if (data) {
@@ -2140,11 +2295,11 @@ var PaymentModal = function PaymentModal(_ref18) {
 
     // 通用回调函数
     var handleDetailsClick = /*#__PURE__*/function () {
-      var _ref29 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee23() {
+      var _ref30 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee24() {
         var _context$appHelper2;
-        var _context$appHelper$ut9, isTerminal, isWebPos, checkout, orderId;
-        return _regeneratorRuntime().wrap(function _callee23$(_context23) {
-          while (1) switch (_context23.prev = _context23.next) {
+        var _context$appHelper$ut9, isTerminal, isWebPos, checkout, _orderId6;
+        return _regeneratorRuntime().wrap(function _callee24$(_context24) {
+          while (1) switch (_context24.prev = _context24.next) {
             case 0:
               setTimeout(function () {
                 // 主动关闭PaymentResultToast
@@ -2153,37 +2308,37 @@ var PaymentModal = function PaymentModal(_ref18) {
               }, 0);
               _context$appHelper$ut9 = (_context$appHelper2 = context.appHelper) === null || _context$appHelper2 === void 0 ? void 0 : _context$appHelper2.utils, isTerminal = _context$appHelper$ut9.isTerminal, isWebPos = _context$appHelper$ut9.isWebPos;
               if (!(isTerminal !== null && isTerminal !== void 0 && isTerminal())) {
-                _context23.next = 8;
+                _context24.next = 8;
                 break;
               }
               checkout = pisellos.getModule('checkout');
-              _context23.next = 6;
+              _context24.next = 6;
               return checkout.getCurrentOrderId();
             case 6:
-              orderId = _context23.sent;
-              return _context23.abrupt("return", interaction.utils.postMessageToApp({
+              _orderId6 = _context24.sent;
+              return _context24.abrupt("return", interaction.utils.postMessageToApp({
                 module: 'booking',
                 key: 'view_order',
                 data: {
-                  order_id: orderId
+                  order_id: _orderId6
                 },
                 origin: '/booking'
               }));
             case 8:
             case "end":
-              return _context23.stop();
+              return _context24.stop();
           }
-        }, _callee23);
+        }, _callee24);
       }));
       return function handleDetailsClick() {
-        return _ref29.apply(this, arguments);
+        return _ref30.apply(this, arguments);
       };
     }();
     var handlePrintReceiptClick = /*#__PURE__*/function () {
-      var _ref30 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee24() {
-        var checkoutModule, data, isSynced, orderId, params;
-        return _regeneratorRuntime().wrap(function _callee24$(_context24) {
-          while (1) switch (_context24.prev = _context24.next) {
+      var _ref31 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee25() {
+        var checkoutModule, data, isSynced, _orderId7, params;
+        return _regeneratorRuntime().wrap(function _callee25$(_context25) {
+          while (1) switch (_context25.prev = _context25.next) {
             case 0:
               setTimeout(function () {
                 // 主动关闭PaymentResultToast
@@ -2192,32 +2347,32 @@ var PaymentModal = function PaymentModal(_ref18) {
               }, 0);
               checkoutModule = pisellos === null || pisellos === void 0 ? void 0 : pisellos.getModule('checkout');
               if (checkoutModule) {
-                _context24.next = 4;
+                _context25.next = 4;
                 break;
               }
-              return _context24.abrupt("return");
+              return _context25.abrupt("return");
             case 4:
-              _context24.next = 6;
+              _context25.next = 6;
               return checkoutModule.isCurrentOrderSynced();
             case 6:
-              isSynced = _context24.sent;
+              isSynced = _context25.sent;
               if (isSynced) {
-                _context24.next = 13;
+                _context25.next = 13;
                 break;
               }
-              _context24.next = 10;
+              _context25.next = 10;
               return checkoutModule.manualSyncOrderAsync();
             case 10:
-              data = _context24.sent;
-              _context24.next = 17;
+              data = _context25.sent;
+              _context25.next = 17;
               break;
             case 13:
-              _context24.next = 15;
+              _context25.next = 15;
               return checkoutModule.getCurrentOrderId();
             case 15:
-              orderId = _context24.sent;
+              _orderId7 = _context25.sent;
               data = {
-                orderId: orderId
+                orderId: _orderId7
               };
             case 17:
               // data.orderId 就是订单号，可以用来打印小票
@@ -2241,12 +2396,12 @@ var PaymentModal = function PaymentModal(_ref18) {
               }
             case 18:
             case "end":
-              return _context24.stop();
+              return _context25.stop();
           }
-        }, _callee24);
+        }, _callee25);
       }));
       return function handlePrintReceiptClick() {
-        return _ref30.apply(this, arguments);
+        return _ref31.apply(this, arguments);
       };
     }();
     var handleRetryClick = function handleRetryClick() {
@@ -2319,6 +2474,20 @@ var PaymentModal = function PaymentModal(_ref18) {
               className: getClassName('menu-icon')
             }),
             onClick: handleOrderNoteClick
+          }, enabledAutoPrint ? {
+            key: 'print',
+            label: locales.getText('payment.result.printReceipt'),
+            icon: /*#__PURE__*/React.createElement(Printer, {
+              className: getClassName('action-icon')
+            }),
+            onClick: handlePrintReceiptClick
+          } : {
+            key: 'details',
+            label: locales.getText('payment.result.details'),
+            icon: /*#__PURE__*/React.createElement(FileCheck02, {
+              className: getClassName('action-icon')
+            }),
+            onClick: handleDetailsClick
           }],
           buttonProps: {
             className: getClassName('action-button'),
@@ -2329,7 +2498,7 @@ var PaymentModal = function PaymentModal(_ref18) {
         }]];
       case 'partially_paid':
         // 部分支付状态
-        return [[{
+        return [[enabledAutoPrint ? {
           id: 'details',
           buttonProps: {
             className: getClassName('action-button'),
@@ -2339,6 +2508,16 @@ var PaymentModal = function PaymentModal(_ref18) {
             }),
             children: locales.getText('payment.result.details')
           }
+        } : {
+          id: 'print',
+          buttonProps: {
+            className: getClassName('action-button'),
+            onClick: handlePrintReceiptClick,
+            icon: /*#__PURE__*/React.createElement(Printer, {
+              className: getClassName('action-icon')
+            }),
+            children: locales.getText('payment.result.printReceipt')
+          }
         }, {
           id: 'more',
           isMore: true,
@@ -2349,6 +2528,20 @@ var PaymentModal = function PaymentModal(_ref18) {
               className: getClassName('menu-icon')
             }),
             onClick: handleOrderNoteClick
+          }, enabledAutoPrint ? {
+            key: 'print',
+            label: locales.getText('payment.result.printReceipt'),
+            icon: /*#__PURE__*/React.createElement(Printer, {
+              className: getClassName('action-icon')
+            }),
+            onClick: handlePrintReceiptClick
+          } : {
+            key: 'details',
+            label: locales.getText('payment.result.details'),
+            icon: /*#__PURE__*/React.createElement(FileCheck02, {
+              className: getClassName('action-icon')
+            }),
+            onClick: handleDetailsClick
           }],
           buttonProps: {
             className: getClassName('action-button'),
@@ -2521,7 +2714,13 @@ var PaymentModal = function PaymentModal(_ref18) {
       return setShowRetryModal(true);
     },
     generateActionButtons: generateActionButtons,
-    paymentResultToastConfig: paymentResultToastConfig
+    paymentResultToastConfig: paymentResultToastConfig,
+    updateOrderInfo: function updateOrderInfo(orderInfo) {
+      return setOrderInfo(orderInfo);
+    },
+    setCurrentEditOrderId: function setCurrentEditOrderId(orderId) {
+      return _setCurrentEditOrderId(orderId);
+    }
   })), noteModalOpen && /*#__PURE__*/createPortal( /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(NoteModal, {
     open: noteModalOpen,
     title: locales.getText('pisell2.text.add-order-notes'),
@@ -2536,10 +2735,10 @@ var PaymentModal = function PaymentModal(_ref18) {
       open: showRetryModal,
       title: locales.getText('pisell2.checkout.tips'),
       footer: null,
-      closable: false,
-      maskClosable: false,
       keyboard: false,
-      onCancel: function onCancel() {} // 禁用关闭
+      onCancel: function onCancel() {
+        setShowRetryModal(false);
+      } // 禁用关闭
     }
   }, /*#__PURE__*/React.createElement("div", {
     style: {