@pisell/private-materials 6.8.64 → 6.8.65

package/es/components/checkout/PaymentModal.js

@@ -277,7 +277,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
   var onPaymentOptionClick = /*#__PURE__*/function () {
     var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(method) {
       var _method$totalAmount;
-      var _ref4, id, code, name, type, finalAmount, eftposCodes, mx51Code, payType, _paymentMethodsRef$cu, data, isSynced, _Toast$loading, _orderId, _method$metadata, service_charge, _interaction$utils2, _interaction$utils2$p;
+      var _ref4, id, code, name, type, finalAmount, eftposCodes, mx51Code, payType, _paymentMethodsRef$cu, _orderId, _paymentMethodsRef$cu2, data, isSynced, _Toast$loading, _orderId2, _method$metadata, service_charge, _interaction$utils2, _interaction$utils2$p;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
@@ -294,38 +294,107 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
             payType = '';
             if (eftposCodes.includes((method === null || method === void 0 ? void 0 : method.code) || '')) {
               payType = 'eftpos';
-            } else if ((method === null || method === void 0 ? void 0 : method.code) === mx51Code) {
-              payType = 'mx51';
             }
-            if (!payType) {
-              _context2.next = 26;
+            // } else if (method?.code === mx51Code) {
+            //   payType = 'mx51';
+            // }
+            if (!((method === null || method === void 0 ? void 0 : method.code) === 'mx51Code')) {
+              _context2.next = 14;
               break;
             }
             _context2.next = 11;
-            return checkoutModule.isCurrentOrderSynced();
+            return checkoutModule.getCurrentOrderId();
           case 11:
+            _orderId = _context2.sent;
+            (_paymentMethodsRef$cu = paymentMethodsRef.current) === null || _paymentMethodsRef$cu === void 0 || _paymentMethodsRef$cu.onPay(payType, {
+              source: 'normal',
+              data: {
+                payMethod: {
+                  id: id,
+                  code: code,
+                  name: name,
+                  type: type
+                },
+                params: {
+                  orderId: _orderId,
+                  symbol: getData('shop_symbol'),
+                  amount: finalAmount,
+                  surcharge: processSurcharge(method.surcharge)
+                },
+                mode: 'pay'
+              },
+              callback: function callback(_ref5) {
+                var status = _ref5.status,
+                  data = _ref5.data,
+                  msg = _ref5.msg;
+                console.log('eftpos_pay_result>>>>>>', status, data, msg);
+                if (status === 'success') {
+                  var payResultParams = {
+                    amount: Number(data === null || data === void 0 ? void 0 : data.amount),
+                    // 支付金额
+                    code: code,
+                    // 支付类型code
+                    custom_payment_id: id,
+                    // 支付类型id
+                    name: name,
+                    // 支付类型name
+                    type: type,
+                    // 支付类型type
+                    voucher_id: '',
+                    service_charge: {},
+                    metadata: {
+                      unique_payment_number: data === null || data === void 0 ? void 0 : data.uniquePaymentNumber
+                    }
+                  };
+                  if (payType === 'mx51') {
+                    // 如果支付服务费跟传入的手续费不一致，则以MX51的支付服务费为准
+                    if (Number((data === null || data === void 0 ? void 0 : data.surcharge) || 0) !== Number((method === null || method === void 0 ? void 0 : method.surcharge) || 0)) {
+                      payResultParams.service_charge = {
+                        amount: (data === null || data === void 0 ? void 0 : data.surcharge) || '0',
+                        percentage: '0'
+                      };
+                    } else {
+                      payResultParams.service_charge = {
+                        amount: (method === null || method === void 0 ? void 0 : method.fixed) || '0',
+                        percentage: (method === null || method === void 0 ? void 0 : method.percentage) || '0'
+                      };
+                    }
+                  }
+                  checkoutModule === null || checkoutModule === void 0 || checkoutModule.addPaymentItemAsync(payResultParams);
+                }
+              }
+            });
+            return _context2.abrupt("return");
+          case 14:
+            if (!payType) {
+              _context2.next = 32;
+              break;
+            }
+            _context2.next = 17;
+            return checkoutModule.isCurrentOrderSynced();
+          case 17:
             isSynced = _context2.sent;
             if (isSynced) {
-              _context2.next = 19;
+              _context2.next = 25;
               break;
             }
             Toast === null || Toast === void 0 || (_Toast$loading = Toast.loading) === null || _Toast$loading === void 0 || _Toast$loading.call(Toast, '', 0);
-            _context2.next = 16;
+            _context2.next = 22;
             return checkoutModule.manualSyncOrderAsync();
-          case 16:
+          case 22:
             data = _context2.sent;
-            _context2.next = 23;
+            _context2.next = 29;
             break;
-          case 19:
-            _context2.next = 21;
+          case 25:
+            _context2.next = 27;
             return checkoutModule.getCurrentOrderId();
-          case 21:
-            _orderId = _context2.sent;
+          case 27:
+            _orderId2 = _context2.sent;
             data = {
-              orderId: _orderId
+              orderId: _orderId2
             };
-          case 23:
-            (_paymentMethodsRef$cu = paymentMethodsRef.current) === null || _paymentMethodsRef$cu === void 0 || _paymentMethodsRef$cu.onPay(payType, {
+          case 29:
+            (_paymentMethodsRef$cu2 = paymentMethodsRef.current) === null || _paymentMethodsRef$cu2 === void 0 || _paymentMethodsRef$cu2.onPay(payType, {
               source: 'normal',
               data: {
                 payMethod: {
@@ -342,10 +411,10 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
                 },
                 mode: 'pay'
               },
-              callback: function callback(_ref5) {
-                var status = _ref5.status,
-                  data = _ref5.data,
-                  msg = _ref5.msg;
+              callback: function callback(_ref6) {
+                var status = _ref6.status,
+                  data = _ref6.data,
+                  msg = _ref6.msg;
                 console.log('eftpos_pay_result>>>>>>', status, data, msg);
                 if (status === 'success') {
                   var payResultParams = {
@@ -388,9 +457,9 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
                 }
               }
             });
-            _context2.next = 31;
+            _context2.next = 37;
             break;
-          case 26:
+          case 32:
             service_charge = null;
             if (method !== null && method !== void 0 && method.fixed || method !== null && method !== void 0 && method.percentage) {
               service_charge = {
@@ -415,7 +484,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
               });
             }
             // 从支付方式列表中查找现金支付方式
-            _context2.next = 31;
+            _context2.next = 37;
             return checkoutModule === null || checkoutModule === void 0 ? void 0 : checkoutModule.addPaymentItemAsync({
               amount: finalAmount,
               /** 支付类型，跟支付列表上对应的支付方式保持一致 */
@@ -431,7 +500,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
               /** 支付手续费 */
               service_charge: service_charge
             });
-          case 31:
+          case 37:
           case "end":
             return _context2.stop();
         }
@@ -469,7 +538,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
     }
     if (checkoutModule && isModalOpen) {
       checkoutModule.getPaymentMethodsAsync().then( /*#__PURE__*/function () {
-        var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(paymentMethods) {
+        var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(paymentMethods) {
           var reorderedPaymentMethods, isShowCashPayment;
           return _regeneratorRuntime().wrap(function _callee3$(_context3) {
             while (1) switch (_context3.prev = _context3.next) {
@@ -495,7 +564,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
           }, _callee3);
         }));
         return function (_x3) {
-          return _ref6.apply(this, arguments);
+          return _ref7.apply(this, arguments);
         };
       }());
       checkoutModule.getCurrentOrderPaymentItemsAsync().then(function (items) {
@@ -522,7 +591,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
         var core = checkoutModule.core;
         if (core.effects && typeof core.effects.on === 'function') {
           var unsubscribe = core.effects.on(CheckoutHooks.OnStateAmountChanged, executeIfActive( /*#__PURE__*/function () {
-            var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(data) {
+            var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(data) {
               var _Toast$success, _Toast$success2, items;
               return _regeneratorRuntime().wrap(function _callee4$(_context4) {
                 while (1) switch (_context4.prev = _context4.next) {
@@ -549,7 +618,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
               }, _callee4);
             }));
             return function (_x4) {
-              return _ref7.apply(this, arguments);
+              return _ref8.apply(this, arguments);
             };
           }()));
           var amountChangedUnsubscribe = core.effects.on(CheckoutHooks.OnBalanceDueAmountChanged, executeIfActive(function (data) {
@@ -587,7 +656,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
           //   }
           // );
           var orderPaymentAddedUnsubscribe = core.effects.on(CheckoutHooks.OnOrderPaymentAdded, executeIfActive( /*#__PURE__*/function () {
-            var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(data) {
+            var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(data) {
               var orderInfo, balanceDueAmount, autoCloseConfig, _paymentItems, _totalAmount, serviceChargeTotal, isToastMode, paymentMethodName, isCashPayment, _interaction$utils3, _interaction$utils3$p;
               return _regeneratorRuntime().wrap(function _callee5$(_context5) {
                 while (1) switch (_context5.prev = _context5.next) {
@@ -681,7 +750,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
               }, _callee5);
             }));
             return function (_x5) {
-              return _ref8.apply(this, arguments);
+              return _ref9.apply(this, arguments);
             };
           }()));
           return function () {
@@ -710,7 +779,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
 
   // 处理金额修改
   var handleAmountChange = useCallback( /*#__PURE__*/function () {
-    var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(newAmount) {
+    var _ref10 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(newAmount) {
       return _regeneratorRuntime().wrap(function _callee6$(_context6) {
         while (1) switch (_context6.prev = _context6.next) {
           case 0:
@@ -736,13 +805,13 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
       }, _callee6, null, [[1, 7]]);
     }));
     return function (_x6) {
-      return _ref9.apply(this, arguments);
+      return _ref10.apply(this, arguments);
     };
   }(), [checkoutModule]);
 
   // 处理押金状态变更
   var handleDepositStatusChange = useCallback( /*#__PURE__*/function () {
-    var _ref10 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(isDeposit) {
+    var _ref11 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(isDeposit) {
       var depositStatus;
       return _regeneratorRuntime().wrap(function _callee7$(_context7) {
         while (1) switch (_context7.prev = _context7.next) {
@@ -770,13 +839,13 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
       }, _callee7, null, [[1, 8]]);
     }));
     return function (_x7) {
-      return _ref10.apply(this, arguments);
+      return _ref11.apply(this, arguments);
     };
   }(), [checkoutModule]);
 
   // 当 walletpass 直接就满足订单支付时，触发此方法
   var handleWalletPassConfirmPay = /*#__PURE__*/function () {
-    var _ref11 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(action) {
+    var _ref12 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(action) {
       var result, _result$response, _orderInfo, responseData, _responseData$payment, params;
       return _regeneratorRuntime().wrap(function _callee8$(_context8) {
         while (1) switch (_context8.prev = _context8.next) {
@@ -851,13 +920,13 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
       }, _callee8);
     }));
     return function handleWalletPassConfirmPay(_x8) {
-      return _ref11.apply(this, arguments);
+      return _ref12.apply(this, arguments);
     };
   }();
 
   // 处理 Save & Pay Later 的钱包余额确认
   var handleSavePayLater = useCallback( /*#__PURE__*/function () {
-    var _ref12 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(action) {
+    var _ref13 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(action) {
       var res;
       return _regeneratorRuntime().wrap(function _callee9$(_context9) {
         while (1) switch (_context9.prev = _context9.next) {
@@ -909,7 +978,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
       }, _callee9);
     }));
     return function (_x9) {
-      return _ref12.apply(this, arguments);
+      return _ref13.apply(this, arguments);
     };
   }(), [checkoutModule, onPaymentCancel]);
   var moduleConfig = {
@@ -929,7 +998,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
     return new Decimal(currentTotalPrice || 0).minus(shopDiscount || 0).toNumber();
   }, [shopDiscount, currentTotalPrice]);
   var handleSelectWalletChange = useMemoizedFn( /*#__PURE__*/function () {
-    var _ref13 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(select) {
+    var _ref14 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(select) {
       var voucherItems, data;
       return _regeneratorRuntime().wrap(function _callee10$(_context10) {
         while (1) switch (_context10.prev = _context10.next) {
@@ -979,13 +1048,13 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
       }, _callee10);
     }));
     return function (_x10) {
-      return _ref13.apply(this, arguments);
+      return _ref14.apply(this, arguments);
     };
   }());
 
   // 手动折扣相关处理函数
   var handlePriceAdjustConfirm = /*#__PURE__*/function () {
-    var _ref14 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11(discountAmount) {
+    var _ref15 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11(discountAmount) {
       return _regeneratorRuntime().wrap(function _callee11$(_context11) {
         while (1) switch (_context11.prev = _context11.next) {
           case 0:
@@ -1004,13 +1073,13 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
       }, _callee11);
     }));
     return function handlePriceAdjustConfirm(_x11) {
-      return _ref14.apply(this, arguments);
+      return _ref15.apply(this, arguments);
     };
   }();
   var handleButtonClick = /*#__PURE__*/function () {
-    var _ref15 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12(key) {
+    var _ref16 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12(key) {
       var _savePayLaterHandlerR;
-      var data, isSynced, _orderId2, params, _paymentItems2;
+      var data, isSynced, _orderId3, params, _paymentItems2;
       return _regeneratorRuntime().wrap(function _callee12$(_context12) {
         while (1) switch (_context12.prev = _context12.next) {
           case 0:
@@ -1047,9 +1116,9 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
             _context12.next = 21;
             return checkoutModule.getCurrentOrderId();
           case 21:
-            _orderId2 = _context12.sent;
+            _orderId3 = _context12.sent;
             data = {
-              orderId: _orderId2
+              orderId: _orderId3
             };
           case 23:
             console.log('handleButtonClick_print-receipt_data>>>>', data);
@@ -1112,7 +1181,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
       }, _callee12);
     }));
     return function handleButtonClick(_x12) {
-      return _ref15.apply(this, arguments);
+      return _ref16.apply(this, arguments);
     };
   }();
 
@@ -1140,7 +1209,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
     };
   };
   var handleSendCustomerPaymentLink = /*#__PURE__*/function () {
-    var _ref16 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13(data) {
+    var _ref17 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13(data) {
       var order, stateAmount, isCurrentOrderSynced, res;
       return _regeneratorRuntime().wrap(function _callee13$(_context13) {
         while (1) switch (_context13.prev = _context13.next) {
@@ -1185,7 +1254,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
       }, _callee13);
     }));
     return function handleSendCustomerPaymentLink(_x13) {
-      return _ref16.apply(this, arguments);
+      return _ref17.apply(this, arguments);
     };
   }();
   var searchAndClientProps = useMemo(function () {
@@ -1195,7 +1264,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
   }, [paymentItems, config]);
   console.log(searchAndClientProps, 'searchAndClientProps');
   var roundingFunction = /*#__PURE__*/function () {
-    var _ref17 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14(amount) {
+    var _ref18 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14(amount) {
       var res;
       return _regeneratorRuntime().wrap(function _callee14$(_context14) {
         while (1) switch (_context14.prev = _context14.next) {
@@ -1212,7 +1281,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
       }, _callee14);
     }));
     return function roundingFunction(_x14) {
-      return _ref17.apply(this, arguments);
+      return _ref18.apply(this, arguments);
     };
   }();
 
@@ -1385,33 +1454,33 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
 
 // 主要的支付弹窗组件
 
-var PaymentModal = function PaymentModal(_ref18) {
+var PaymentModal = function PaymentModal(_ref19) {
   var _context$appHelper$ut, _context$appHelper$ut2, _context$appHelper$ut3, _context$appHelper$ut4, _context$appHelper;
-  var open = _ref18.open,
-    data = _ref18.data,
-    callback = _ref18.callback,
-    onClose = _ref18.onClose,
-    setEditCartMode = _ref18.setEditCartMode,
-    editOrderId = _ref18.editOrderId,
-    paymentResultDisplayMode = _ref18.paymentResultDisplayMode,
-    shopDiscount = _ref18.shopDiscount,
-    client = _ref18.client,
-    currentTotalPrice = _ref18.currentTotalPrice,
-    onChangeShopDiscount = _ref18.onChangeShopDiscount,
-    onChangeOrderNote = _ref18.onChangeOrderNote,
-    onDeleteOrderNote = _ref18.onDeleteOrderNote,
-    _ref18$config = _ref18.config,
-    config = _ref18$config === void 0 ? {
+  var open = _ref19.open,
+    data = _ref19.data,
+    callback = _ref19.callback,
+    onClose = _ref19.onClose,
+    setEditCartMode = _ref19.setEditCartMode,
+    editOrderId = _ref19.editOrderId,
+    paymentResultDisplayMode = _ref19.paymentResultDisplayMode,
+    shopDiscount = _ref19.shopDiscount,
+    client = _ref19.client,
+    currentTotalPrice = _ref19.currentTotalPrice,
+    onChangeShopDiscount = _ref19.onChangeShopDiscount,
+    onChangeOrderNote = _ref19.onChangeOrderNote,
+    onDeleteOrderNote = _ref19.onDeleteOrderNote,
+    _ref19$config = _ref19.config,
+    config = _ref19$config === void 0 ? {
       showHeaderCenter: true,
       showHeaderRightButton: true
-    } : _ref18$config;
+    } : _ref19$config;
   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,
-    isWebPos = _ref19.isWebPos;
+  var _ref20 = (context === null || context === void 0 || (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.utils) || {},
+    pisellos = _ref20.pisellos,
+    getData = _ref20.getData,
+    interaction = _ref20.interaction,
+    isWebPos = _ref20.isWebPos;
   var _useState27 = useState(null),
     _useState28 = _slicedToArray(_useState27, 2),
     orderInfo = _useState28[0],
@@ -1448,7 +1517,7 @@ var PaymentModal = function PaymentModal(_ref18) {
 
   // 重试处理函数（逻辑由用户自己实现）
   var handleRetry = /*#__PURE__*/function () {
-    var _ref20 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee15() {
+    var _ref21 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee15() {
       var checkoutModule, res;
       return _regeneratorRuntime().wrap(function _callee15$(_context15) {
         while (1) switch (_context15.prev = _context15.next) {
@@ -1482,7 +1551,7 @@ var PaymentModal = function PaymentModal(_ref18) {
       }, _callee15);
     }));
     return function handleRetry() {
-      return _ref20.apply(this, arguments);
+      return _ref21.apply(this, arguments);
     };
   }();
 
@@ -1510,7 +1579,7 @@ var PaymentModal = function PaymentModal(_ref18) {
   useEffect(function () {
     var _interaction$utils5;
     var initTillButtonData = /*#__PURE__*/function () {
-      var _ref21 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16() {
+      var _ref22 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16() {
         var _interaction$utils4, _interaction$utils4$a, tillButtonData;
         return _regeneratorRuntime().wrap(function _callee16$(_context16) {
           while (1) switch (_context16.prev = _context16.next) {
@@ -1543,7 +1612,7 @@ var PaymentModal = function PaymentModal(_ref18) {
         }, _callee16, null, [[1, 9]]);
       }));
       return function initTillButtonData() {
-        return _ref21.apply(this, arguments);
+        return _ref22.apply(this, arguments);
       };
     }();
 
@@ -1591,8 +1660,8 @@ var PaymentModal = function PaymentModal(_ref18) {
 
   // 订单备注相关处理函数
   var handleNoteConfirm = /*#__PURE__*/function () {
-    var _ref22 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee17(noteValue) {
-      var checkoutModule, _orderId3, _checkoutModule$editO, _checkoutModule, _checkoutModule$updat;
+    var _ref23 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee17(noteValue) {
+      var checkoutModule, _orderId4, _checkoutModule$editO, _checkoutModule, _checkoutModule$updat;
       return _regeneratorRuntime().wrap(function _callee17$(_context17) {
         while (1) switch (_context17.prev = _context17.next) {
           case 0:
@@ -1601,9 +1670,9 @@ var PaymentModal = function PaymentModal(_ref18) {
               break;
             }
             checkoutModule = pisellos === null || pisellos === void 0 ? void 0 : pisellos.getModule('checkout');
-            _orderId3 = checkoutModule === null || checkoutModule === void 0 ? void 0 : checkoutModule.getCurrentOrderId();
+            _orderId4 = checkoutModule === null || checkoutModule === void 0 ? void 0 : checkoutModule.getCurrentOrderId();
             if (checkoutModule) {
-              (_checkoutModule$editO = checkoutModule.editOrderNoteByOrderIdAsync) === null || _checkoutModule$editO === void 0 || _checkoutModule$editO.call(checkoutModule, _orderId3, noteValue);
+              (_checkoutModule$editO = checkoutModule.editOrderNoteByOrderIdAsync) === null || _checkoutModule$editO === void 0 || _checkoutModule$editO.call(checkoutModule, _orderId4, noteValue);
               setOrderNote(noteValue);
               Toast === null || Toast === void 0 || Toast.success(locales.getText('pisell2.checkout.order-note.updated-successfully'));
             }
@@ -1650,11 +1719,11 @@ var PaymentModal = function PaymentModal(_ref18) {
       }, _callee17, null, [[6, 17]]);
     }));
     return function handleNoteConfirm(_x15) {
-      return _ref22.apply(this, arguments);
+      return _ref23.apply(this, arguments);
     };
   }();
   var handleNoteDelete = /*#__PURE__*/function () {
-    var _ref23 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18() {
+    var _ref24 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18() {
       var checkoutModule, _checkoutModule$updat2;
       return _regeneratorRuntime().wrap(function _callee18$(_context18) {
         while (1) switch (_context18.prev = _context18.next) {
@@ -1689,7 +1758,7 @@ var PaymentModal = function PaymentModal(_ref18) {
       }, _callee18, null, [[0, 10]]);
     }));
     return function handleNoteDelete() {
-      return _ref23.apply(this, arguments);
+      return _ref24.apply(this, arguments);
     };
   }();
   var handleNoteCancel = function handleNoteCancel() {
@@ -1728,20 +1797,20 @@ var PaymentModal = function PaymentModal(_ref18) {
       }
     };
     var handleNoteConfirm = /*#__PURE__*/function () {
-      var _ref24 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee19(noteValue) {
-        var checkoutModule, _orderId4, _checkoutModule$editO2;
+      var _ref25 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee19(noteValue) {
+        var checkoutModule, _orderId5, _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');
-              _orderId4 = checkoutModule === null || checkoutModule === void 0 ? void 0 : checkoutModule.getCurrentOrderId();
-              if (!(checkoutModule && _orderId4)) {
+              _orderId5 = checkoutModule === null || checkoutModule === void 0 ? void 0 : checkoutModule.getCurrentOrderId();
+              if (!(checkoutModule && _orderId5)) {
                 _context19.next = 8;
                 break;
               }
               _context19.next = 6;
-              return (_checkoutModule$editO2 = checkoutModule.editOrderNoteByOrderIdAsync) === null || _checkoutModule$editO2 === void 0 ? void 0 : _checkoutModule$editO2.call(checkoutModule, _orderId4, noteValue);
+              return (_checkoutModule$editO2 = checkoutModule.editOrderNoteByOrderIdAsync) === null || _checkoutModule$editO2 === void 0 ? void 0 : _checkoutModule$editO2.call(checkoutModule, _orderId5, noteValue);
             case 6:
               setOrderNote(noteValue);
               showToast('success', locales.getText('pisell2.checkout.order-note.updated-successfully'));
@@ -1766,24 +1835,24 @@ var PaymentModal = function PaymentModal(_ref18) {
         }, _callee19, null, [[0, 10]]);
       }));
       return function handleNoteConfirm(_x16) {
-        return _ref24.apply(this, arguments);
+        return _ref25.apply(this, arguments);
       };
     }();
     var handleNoteDelete = /*#__PURE__*/function () {
-      var _ref25 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee20() {
-        var checkoutModule, _orderId5, _checkoutModule$editO3;
+      var _ref26 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee20() {
+        var checkoutModule, _orderId6, _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');
-              _orderId5 = checkoutModule === null || checkoutModule === void 0 ? void 0 : checkoutModule.getCurrentOrderId();
-              if (!(checkoutModule && _orderId5)) {
+              _orderId6 = checkoutModule === null || checkoutModule === void 0 ? void 0 : checkoutModule.getCurrentOrderId();
+              if (!(checkoutModule && _orderId6)) {
                 _context20.next = 8;
                 break;
               }
               _context20.next = 6;
-              return (_checkoutModule$editO3 = checkoutModule.editOrderNoteByOrderIdAsync) === null || _checkoutModule$editO3 === void 0 ? void 0 : _checkoutModule$editO3.call(checkoutModule, _orderId5, '');
+              return (_checkoutModule$editO3 = checkoutModule.editOrderNoteByOrderIdAsync) === null || _checkoutModule$editO3 === void 0 ? void 0 : _checkoutModule$editO3.call(checkoutModule, _orderId6, '');
             case 6:
               setOrderNote('');
               showToast('success', locales.getText('pisell2.checkout.order-note.deleted-successfully'));
@@ -1808,7 +1877,7 @@ var PaymentModal = function PaymentModal(_ref18) {
         }, _callee20, null, [[0, 10]]);
       }));
       return function handleNoteDelete() {
-        return _ref25.apply(this, arguments);
+        return _ref26.apply(this, arguments);
       };
     }();
     var handleNoteCancel = function handleNoteCancel() {
@@ -1823,9 +1892,9 @@ var PaymentModal = function PaymentModal(_ref18) {
     var currentLocale = ((_context$appHelper$ut5 = context.appHelper.utils) === null || _context$appHelper$ut5 === void 0 || (_context$appHelper$ut6 = _context$appHelper$ut5.getApp) === null || _context$appHelper$ut6 === void 0 || (_context$appHelper$ut6 = _context$appHelper$ut6.call(_context$appHelper$ut5)) === null || _context$appHelper$ut6 === void 0 || (_context$appHelper$ut6 = _context$appHelper$ut6.locales) === null || _context$appHelper$ut6 === void 0 || (_context$appHelper$ut7 = _context$appHelper$ut6.getLocale) === null || _context$appHelper$ut7 === void 0 ? void 0 : _context$appHelper$ut7.call(_context$appHelper$ut6)) || ((_context$appHelper$ut8 = context.appHelper.utils) === null || _context$appHelper$ut8 === void 0 || (_context$appHelper$ut8 = _context$appHelper$ut8.storage) === null || _context$appHelper$ut8 === void 0 ? void 0 : _context$appHelper$ut8.get('umi_locale')) || 'en';
 
     // 创建一个临时的Context Provider来传递正确的语言环境
-    var EngineContextProvider = function EngineContextProvider(_ref26) {
+    var EngineContextProvider = function EngineContextProvider(_ref27) {
       var _context$engine;
-      var children = _ref26.children;
+      var children = _ref27.children;
       var tempEngineContext = _objectSpread(_objectSpread({}, context), {}, {
         engine: _objectSpread(_objectSpread({}, context.engine), {}, {
           props: _objectSpread(_objectSpread({}, (_context$engine = context.engine) === null || _context$engine === void 0 ? void 0 : _context$engine.props), {}, {
@@ -1931,7 +2000,7 @@ var PaymentModal = function PaymentModal(_ref18) {
 
   // 如果订单已经同步过，此时点击左上角返回，需要通知购物车进入编辑态
   var handleSetEditCartMode = /*#__PURE__*/function () {
-    var _ref27 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee21() {
+    var _ref28 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee21() {
       var closeModal,
         checkout,
         orderId,
@@ -1971,7 +2040,7 @@ var PaymentModal = function PaymentModal(_ref18) {
       }, _callee21);
     }));
     return function handleSetEditCartMode() {
-      return _ref27.apply(this, arguments);
+      return _ref28.apply(this, arguments);
     };
   }();
 
@@ -1989,8 +2058,10 @@ var PaymentModal = function PaymentModal(_ref18) {
       size: "small",
       type: "text",
       onClick: function onClick() {
+        var _checkout$getCurrentO;
         var checkout = pisellos.getModule('checkout');
-        if (checkout.isCurrentOrderSynced()) {
+        // 如果订单是 unpaid（弃单） ，则不进入编辑状态，直接关闭弹窗
+        if (checkout.isCurrentOrderSynced() && ((_checkout$getCurrentO = checkout.getCurrentOrderInfo()) === null || _checkout$getCurrentO === void 0 ? void 0 : _checkout$getCurrentO.payment_status) !== 'unpaid') {
           handleSetEditCartMode(true);
         } else {
           handlePaymentCancel(false);
@@ -2023,7 +2094,7 @@ var PaymentModal = function PaymentModal(_ref18) {
   // 初始化checkout数据
   useEffect(function () {
     var initCheckoutData = /*#__PURE__*/function () {
-      var _ref28 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee23() {
+      var _ref29 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee23() {
         var checkout, _getData, shop_wallet_pass_id, newData, existPayment, _newData$subtotal_inf, _newData$subtotal_inf2, _orderInfo2, _data$subtotal_info, _data$subtotal_info2, _orderInfo4, domain;
         return _regeneratorRuntime().wrap(function _callee23$(_context23) {
           while (1) switch (_context23.prev = _context23.next) {
@@ -2105,7 +2176,7 @@ var PaymentModal = function PaymentModal(_ref18) {
               }
               // 监听订单同步完成，同步完成后显示订单完成 toast，关闭当前弹窗
               unsubscribeRef.current = checkout.core.effects.on('checkout:onOrderSynced', executeIfActive( /*#__PURE__*/function () {
-                var _ref29 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee22(data) {
+                var _ref30 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee22(data) {
                   var _data$response, _responseData$payment2;
                   var currentOrderId, responseData, paymentStatus, orderTotalAmount, gapAmount, currentChangeGivenAmount, failureReason, _responseData$payment3, params, statusClassName, autoCloseConfig, enabledAutoPrint, _interaction$utils6, _interaction$utils6$a, _orderInfo3, isToastMode, paymentResult;
                   return _regeneratorRuntime().wrap(function _callee22$(_context22) {
@@ -2256,7 +2327,7 @@ var PaymentModal = function PaymentModal(_ref18) {
                   }, _callee22);
                 }));
                 return function (_x17) {
-                  return _ref29.apply(this, arguments);
+                  return _ref30.apply(this, arguments);
                 };
               }()));
               _context23.next = 46;
@@ -2338,7 +2409,7 @@ var PaymentModal = function PaymentModal(_ref18) {
         }, _callee23, null, [[0, 48]]);
       }));
       return function initCheckoutData() {
-        return _ref28.apply(this, arguments);
+        return _ref29.apply(this, arguments);
       };
     }();
     if (data) {
@@ -2374,9 +2445,9 @@ var PaymentModal = function PaymentModal(_ref18) {
 
     // 通用回调函数
     var handleDetailsClick = /*#__PURE__*/function () {
-      var _ref30 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee24() {
+      var _ref31 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee24() {
         var _context$appHelper2;
-        var _context$appHelper$ut9, isTerminal, isWebPos, checkout, _orderId6;
+        var _context$appHelper$ut9, isTerminal, isWebPos, checkout, _orderId7;
         return _regeneratorRuntime().wrap(function _callee24$(_context24) {
           while (1) switch (_context24.prev = _context24.next) {
             case 0:
@@ -2394,12 +2465,12 @@ var PaymentModal = function PaymentModal(_ref18) {
               _context24.next = 6;
               return checkout.getCurrentOrderId();
             case 6:
-              _orderId6 = _context24.sent;
+              _orderId7 = _context24.sent;
               return _context24.abrupt("return", interaction.utils.postMessageToApp({
                 module: 'booking',
                 key: 'view_order',
                 data: {
-                  order_id: _orderId6
+                  order_id: _orderId7
                 },
                 origin: '/booking'
               }));
@@ -2410,12 +2481,12 @@ var PaymentModal = function PaymentModal(_ref18) {
         }, _callee24);
       }));
       return function handleDetailsClick() {
-        return _ref30.apply(this, arguments);
+        return _ref31.apply(this, arguments);
       };
     }();
     var handlePrintReceiptClick = /*#__PURE__*/function () {
-      var _ref31 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee25() {
-        var checkoutModule, data, isSynced, _orderId7, params;
+      var _ref32 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee25() {
+        var checkoutModule, data, isSynced, _orderId8, params;
         return _regeneratorRuntime().wrap(function _callee25$(_context25) {
           while (1) switch (_context25.prev = _context25.next) {
             case 0:
@@ -2449,9 +2520,9 @@ var PaymentModal = function PaymentModal(_ref18) {
               _context25.next = 15;
               return checkoutModule.getCurrentOrderId();
             case 15:
-              _orderId7 = _context25.sent;
+              _orderId8 = _context25.sent;
               data = {
-                orderId: _orderId7
+                orderId: _orderId8
               };
             case 17:
               // data.orderId 就是订单号，可以用来打印小票
@@ -2480,7 +2551,7 @@ var PaymentModal = function PaymentModal(_ref18) {
         }, _callee25);
       }));
       return function handlePrintReceiptClick() {
-        return _ref31.apply(this, arguments);
+        return _ref32.apply(this, arguments);
       };
     }();
     var handleRetryClick = function handleRetryClick() {