@pisell/private-materials 6.9.6 → 6.10.2

package/es/components/booking/notes/model.d.ts

@@ -1,10 +1 @@
-/// <reference types="react" />
-import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: FormState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
+export declare const Provider: any, Context: any;

package/es/components/booking/payments/model.d.ts

@@ -1,10 +1 @@
-/// <reference types="react" />
-import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: FormState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
+export declare const Provider: any, Context: any;

package/es/components/booking/utils.d.ts

@@ -173,10 +173,10 @@ export declare const getProductTotalPrice: (item: any) => number;
 export declare const getDuration: (duration: number | {
     type: string;
     value: number;
-}) => number | "flexible" | {
+}) => number | {
     type: string;
     value: number;
-};
+} | "flexible";
 export declare const isWalkIn: (customer_id?: number | string) => boolean;
 export declare const getIsEdit: (state: any) => boolean;
 export {};

package/es/components/booking/utils.js

@@ -827,13 +827,13 @@ export var getMainPrice = function getMainPrice(item, price) {
 
 // 商品价格:   (商品价格 + (套餐价格 + 单规格价格 * 单规格数量) * 套餐数量 + 单规格价格 * 单规格数量)  * 商品数量
 export var getProductTotalPrice = function getProductTotalPrice(item) {
-  var _item$_extend2, _item$_extend3, _item$_extend4;
+  var _item$_extend2, _item$_extend3;
   var price = new Decimal(item._extend.price || 0);
   var other = (_item$_extend2 = item._extend) === null || _item$_extend2 === void 0 ? void 0 : _item$_extend2.other;
   // 如果有 priceOverride，则强制使用 priceOverride，不受规则约束
-  if ((_item$_extend3 = item._extend) !== null && _item$_extend3 !== void 0 && _item$_extend3.priceOverride || ((_item$_extend4 = item._extend) === null || _item$_extend4 === void 0 ? void 0 : _item$_extend4.priceOverride) === 0) {
-    var _item$_extend5;
-    price = new Decimal(((_item$_extend5 = item._extend) === null || _item$_extend5 === void 0 ? void 0 : _item$_extend5.priceOverride) || 0);
+  if ((_item$_extend3 = item._extend) !== null && _item$_extend3 !== void 0 && _item$_extend3.priceOverride) {
+    var _item$_extend4;
+    price = new Decimal(((_item$_extend4 = item._extend) === null || _item$_extend4 === void 0 ? void 0 : _item$_extend4.priceOverride) || 0);
     return price.toNumber();
   }
 

package/es/components/checkout/PaymentModal.d.ts

@@ -26,7 +26,6 @@ interface PaymentModalProps {
 }
 interface PaymentModalMainProps extends PaymentModalProps {
     onClose?: (reset?: boolean) => void;
-    onSetLocalOrderId?: (order_id: number) => void;
     setEditCartMode?: (order_id: number, payData: any, closeModal: boolean) => void;
     editOrderId?: number;
     config?: {

package/es/components/checkout/PaymentModal.js

@@ -16,7 +16,7 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 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, formatAmount } from '@pisell/utils';
+import { locales } from '@pisell/utils';
 import { getLocale } from "../../utils/locales";
 import { useMemoizedFn } from 'ahooks';
 import { createPortal } from 'react-dom';
@@ -32,7 +32,6 @@ import WalletPassModule from "./components/WalletPassModule";
 import PaymentOptionsModule, { SHOW_METHODS_CODE } from "./components/PaymentOptionsModule";
 import CashPaymentModule from "./components/CashPaymentModule";
 import AdditionalModule from "./components/AdditionalModule";
-import { useBusinessCode, useOsKey } from "../ticketBooking/context/OsKeyContext";
 import { closePaymentResultToast, closeAllPaymentResultToasts, setTillButton } from "./components/PaymentResultToast";
 import { formatCurrency, calculateStatusClassName, calculateAutoCloseConfig, displayPaymentResultToast, createShowSuccessToast } from "./utils/PaymentResultToastUtils";
 import { Printer, FileCheck02, RefreshCw05, CreditCard02, MessageTextSquare02, ArrowLeft, DotsVertical } from '@pisell/icon';
@@ -61,48 +60,8 @@ var CheckoutHooks = {
 
 // 从 PaymentOptionsModule 导入扩展支付方法类型
 
-/**
- * @description
- * 根据 WalletPassUsage 配置，将传入的货币金额转换为 WalletPass 面额（points）。
- *
- * 对齐后端 PHP 逻辑：
- * - 无有效 points / price 时：按 1:1 返回货币金额格式化字符串
- * - 计算方式：currencyAmount / price (保留 6 位小数，直接截断) * points
- * - 返回值：保留 2 位小数，第三位舍去（不四舍五入）
- */
-function convertCurrencyAmountToWalletPassValue(params) {
-  var _toDecimalOrNull, _params$walletPassUsa, _params$walletPassUsa2;
-  var currencyDecimal = (_toDecimalOrNull = toDecimalOrNull(params.currencyAmount)) !== null && _toDecimalOrNull !== void 0 ? _toDecimalOrNull : new Decimal(0);
-  var pointsDecimal = toDecimalOrNull((_params$walletPassUsa = params.walletPassUsageUnit) === null || _params$walletPassUsa === void 0 ? void 0 : _params$walletPassUsa.points);
-  var priceDecimal = toDecimalOrNull((_params$walletPassUsa2 = params.walletPassUsageUnit) === null || _params$walletPassUsa2 === void 0 ? void 0 : _params$walletPassUsa2.price);
-
-  // 无有效识别码比例数据，按 1 比 1 处理（对齐 PHP empty('0') 的行为：0 也视为无效）
-  if (!pointsDecimal || !priceDecimal) return formatAmount(currencyDecimal.toNumber());
-  if (pointsDecimal.eq(0) || priceDecimal.eq(0)) return formatAmount(currencyDecimal.toNumber());
-  var baseRatio = currencyDecimal.div(priceDecimal).toDecimalPlaces(6, Decimal.ROUND_DOWN);
-  return baseRatio.mul(pointsDecimal).toFixed(2, Decimal.ROUND_DOWN);
-}
-
-/**
- * @description
- * 将任意输入安全转换为 Decimal
- */
-function toDecimalOrNull(value) {
-  if (value === null || value === undefined) return null;
-  try {
-    return new Decimal(value);
-  } catch (_unused) {
-    return null;
-  }
-}
-
 // 支付弹窗的数据接口
 
-/**
- * PaymentContent 对外暴露给父组件 PaymentModal 的 ref 方法集合
- * - 父组件如果需要“读取子组件内部 state”，需要通过 ref（或将 state 上提）
- */
-
 // 支付弹窗主体内容组件
 var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
   var _parentModuleConfig$s;
@@ -188,7 +147,6 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
     _useState16 = _slicedToArray(_useState15, 2),
     paymentOptionsTitle = _useState16[0],
     setPaymentOptionsTitle = _useState16[1];
-  var osKey = useOsKey();
   var paymentOptionList = useMemo(function () {
     return paymentMethods.filter(function (item) {
       return !(item.type === 'app' && item.code === 'EFTPOS_LINKLY') && (['custom'].includes(item.type) || SHOW_METHODS_CODE.includes(item.code));
@@ -259,10 +217,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
             // 从支付方式列表中查找现金支付方式
             cashPaymentMethod = paymentMethods.find(function (method) {
               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')
-              );
+              return method.code === 'CASHMANUAL' || method.type === 'CASHMANUAL' || ((_method$name = method.name) === null || _method$name === void 0 ? void 0 : _method$name.toLowerCase().includes('cash'));
             });
             logger === null || logger === void 0 || logger.addLog({
               type: 'info',
@@ -279,14 +234,18 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
             _context.next = 5;
             return checkoutModule === null || checkoutModule === void 0 ? void 0 : checkoutModule.addPaymentItemAsync({
               amount: result.amount,
-              /** 支付类型，跟支付列表上对应的支付方式保持一致 */
-              code: cashPaymentMethod === null || cashPaymentMethod === void 0 ? void 0 : cashPaymentMethod.code,
-              /** 支付类型id，跟支付列表上对应的支付方式保持一致 */
-              custom_payment_id: cashPaymentMethod === null || cashPaymentMethod === void 0 ? void 0 : cashPaymentMethod.id,
-              /** 支付类型名称，跟支付列表上对应的支付方式保持一致 */
-              name: cashPaymentMethod === null || cashPaymentMethod === void 0 ? void 0 : cashPaymentMethod.name,
-              /** 支付类型type，跟支付列表上对应的支付方式保持一致 */
-              type: cashPaymentMethod === null || cashPaymentMethod === void 0 ? void 0 : cashPaymentMethod.type,
+              // /** 支付类型，跟支付列表上对应的支付方式保持一致 */
+              // code: cashPaymentMethod?.code,
+              // /** 支付类型id，跟支付列表上对应的支付方式保持一致 */
+              // custom_payment_id: cashPaymentMethod?.id,
+              // /** 支付类型名称，跟支付列表上对应的支付方式保持一致 */
+              // name: cashPaymentMethod?.name,
+              // /** 支付类型type，跟支付列表上对应的支付方式保持一致 */
+              // type: cashPaymentMethod?.type,
+              code: "CUSTOM_10361",
+              "type": "custom",
+              "name": "Cash - Cafe",
+              "custom_payment_id": 10361,
               /** 代金券、充值卡、积分卡等wallet pass id */
               voucher_id: 0,
               rounding_amount: result.roundingAmount
@@ -318,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, currentOrderInfo, originUUid, _paymentMethodsRef$cu, _orderId, _paymentMethodsRef$cu2, data, isSynced, _Toast$loading, _orderId2, _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:
@@ -330,7 +289,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
           case 2:
             _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', 'EFTPOS_HUIFU'];
+            eftposCodes = ['EFTPOS_LINKLY', 'EFTPOS_PAYO', 'EFTPOS_WINDCAVE', 'EFTPOS_TYRO'];
             mx51Code = 'EFTPOS';
             payType = '';
             if (eftposCodes.includes((method === null || method === void 0 ? void 0 : method.code) || '')) {
@@ -339,17 +298,15 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
             // } else if (method?.code === mx51Code) {
             //   payType = 'mx51';
             // }
-            currentOrderInfo = checkoutModule.getCurrentOrderInfo();
-            originUUid = currentOrderInfo === null || currentOrderInfo === void 0 ? void 0 : currentOrderInfo.uuid;
             if (!((method === null || method === void 0 ? void 0 : method.code) === mx51Code)) {
-              _context2.next = 17;
+              _context2.next = 15;
               break;
             }
             // mx51 不下单，直接提交支付
             payType = 'mx51';
-            _context2.next = 14;
+            _context2.next = 12;
             return checkoutModule.getCurrentOrderId();
-          case 14:
+          case 12:
             _orderId = _context2.sent;
             (_paymentMethodsRef$cu = paymentMethodsRef.current) === null || _paymentMethodsRef$cu === void 0 || _paymentMethodsRef$cu.onPay(payType, {
               source: 'normal',
@@ -373,11 +330,6 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
                   data = _ref5.data,
                   msg = _ref5.msg;
                 console.log('eftpos_pay_result>>>>>>', status, data, msg);
-                // 如果 data.action 为 cancel_order，则直接触发 start new order
-                if ((data === null || data === void 0 ? void 0 : data.action) === 'cancel_order') {
-                  onPaymentCancel(true);
-                  return;
-                }
                 if (status === 'success') {
                   var payResultParams = {
                     amount: Number(data === null || data === void 0 ? void 0 : data.amount),
@@ -410,40 +362,40 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
                       };
                     }
                   }
-                  checkoutModule === null || checkoutModule === void 0 || checkoutModule.addPaymentItemAsync(payResultParams, originUUid);
+                  checkoutModule === null || checkoutModule === void 0 || checkoutModule.addPaymentItemAsync(payResultParams);
                 }
               }
             });
             return _context2.abrupt("return");
-          case 17:
+          case 15:
             if (!payType) {
-              _context2.next = 35;
+              _context2.next = 33;
               break;
             }
-            _context2.next = 20;
+            _context2.next = 18;
             return checkoutModule.isCurrentOrderSynced();
-          case 20:
+          case 18:
             isSynced = _context2.sent;
             if (isSynced) {
-              _context2.next = 28;
+              _context2.next = 26;
               break;
             }
             Toast === null || Toast === void 0 || (_Toast$loading = Toast.loading) === null || _Toast$loading === void 0 || _Toast$loading.call(Toast, '', 0);
-            _context2.next = 25;
+            _context2.next = 23;
             return checkoutModule.manualSyncOrderAsync();
-          case 25:
+          case 23:
             data = _context2.sent;
-            _context2.next = 32;
-            break;
-          case 28:
             _context2.next = 30;
+            break;
+          case 26:
+            _context2.next = 28;
             return checkoutModule.getCurrentOrderId();
-          case 30:
+          case 28:
             _orderId2 = _context2.sent;
             data = {
               orderId: _orderId2
             };
-          case 32:
+          case 30:
             (_paymentMethodsRef$cu2 = paymentMethodsRef.current) === null || _paymentMethodsRef$cu2 === void 0 || _paymentMethodsRef$cu2.onPay(payType, {
               source: 'normal',
               data: {
@@ -457,9 +409,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
                   orderId: data.orderId,
                   symbol: getData('shop_symbol'),
                   amount: finalAmount,
-                  surcharge: processSurcharge(method.surcharge),
-                  operator_type: 'shop',
-                  platform: 'pos'
+                  surcharge: processSurcharge(method.surcharge)
                 },
                 mode: 'pay'
               },
@@ -505,13 +455,13 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
                       };
                     }
                   }
-                  checkoutModule === null || checkoutModule === void 0 || checkoutModule.addPaymentItemAsync(payResultParams, originUUid);
+                  checkoutModule === null || checkoutModule === void 0 || checkoutModule.addPaymentItemAsync(payResultParams);
                 }
               }
             });
-            _context2.next = 40;
+            _context2.next = 38;
             break;
-          case 35:
+          case 33:
             service_charge = null;
             if (method !== null && method !== void 0 && method.fixed || method !== null && method !== void 0 && method.percentage) {
               service_charge = {
@@ -536,7 +486,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
               });
             }
             // 从支付方式列表中查找现金支付方式
-            _context2.next = 40;
+            _context2.next = 38;
             return checkoutModule === null || checkoutModule === void 0 ? void 0 : checkoutModule.addPaymentItemAsync({
               amount: finalAmount,
               /** 支付类型，跟支付列表上对应的支付方式保持一致 */
@@ -552,7 +502,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
               /** 支付手续费 */
               service_charge: service_charge
             });
-          case 40:
+          case 38:
           case "end":
             return _context2.stop();
         }
@@ -602,7 +552,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
                 setPaymentMethods(reorderedPaymentMethods);
                 // TODO: 现金枚举类型需要从os导入
                 isShowCashPayment = paymentMethods.some(function (item) {
-                  return item.code === 'CASHMANUAL' || /现金|現金/i.test(item.name) || /cash/i.test(item.name);
+                  return item.code === 'CASHMANUAL';
                 });
                 setShowCashPayment(isShowCashPayment);
                 onShowCashPaymentChange === null || onShowCashPaymentChange === void 0 || onShowCashPaymentChange(isShowCashPayment);
@@ -1076,22 +1026,14 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
                   /** 支付类型type，跟支付列表上对应的支付方式保持一致 */
                   type: (_walletPassDetail$map4 = walletPassDetail.map[mapCode]) === null || _walletPassDetail$map4 === void 0 ? void 0 : _walletPassDetail$map4.type,
                   /** 代金券、充值卡、积分卡等wallet pass id */
-                  voucher_id: item.voucher_id,
-                  wallet_pass_usage_unit: item.wallet_pass_usage_unit,
-                  wallet_pass_use_value: convertCurrencyAmountToWalletPassValue({
-                    currencyAmount: item.amount,
-                    walletPassUsageUnit: item.wallet_pass_usage_unit
-                  })
+                  voucher_id: item.voucher_id
                 });
               }
             });
             logger === null || logger === void 0 || logger.addLog({
               type: 'info',
               title: 'handleSelectWalletChange checkoutModule updateVoucherPaymentItemsAsync',
-              metadata: {
-                voucherItems: voucherItems,
-                select: select
-              }
+              metadata: {}
             });
             _context10.next = 6;
             return checkoutModule.updateVoucherPaymentItemsAsync(voucherItems);
@@ -1248,12 +1190,9 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
   // 暴露方法给父组件
   useImperativeHandle(ref, function () {
     return {
-      handleButtonClick: handleButtonClick,
-      getSyncingLock: function getSyncingLock() {
-        return syncingLock;
-      }
+      handleButtonClick: handleButtonClick
     };
-  }, [handleButtonClick, syncingLock]);
+  });
   var getCustomerInfo = function getCustomerInfo() {
     var _client$contacts;
     // const client = state?.client?.value;
@@ -1523,7 +1462,6 @@ var PaymentModal = function PaymentModal(_ref19) {
     data = _ref19.data,
     callback = _ref19.callback,
     onClose = _ref19.onClose,
-    onSetLocalOrderId = _ref19.onSetLocalOrderId,
     setEditCartMode = _ref19.setEditCartMode,
     editOrderId = _ref19.editOrderId,
     paymentResultDisplayMode = _ref19.paymentResultDisplayMode,
@@ -1578,12 +1516,11 @@ var PaymentModal = function PaymentModal(_ref19) {
   var Toast = useToast();
   var _usePrinter2 = usePrinter(),
     nativePrint = _usePrinter2.nativePrint;
-  var businessCode = useBusinessCode();
 
   // 重试处理函数（逻辑由用户自己实现）
   var handleRetry = /*#__PURE__*/function () {
     var _ref21 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee15() {
-      var checkoutModule, res, _res$response;
+      var checkoutModule, res;
       return _regeneratorRuntime().wrap(function _callee15$(_context15) {
         while (1) switch (_context15.prev = _context15.next) {
           case 0:
@@ -1603,20 +1540,13 @@ var PaymentModal = function PaymentModal(_ref19) {
             res = _context15.sent;
             console.log(res);
             if (!res.success) {
-              _context15.next = 10;
+              _context15.next = 9;
               break;
             }
             setShowRetryModal(false);
             _context15.next = 9;
             return showSuccessToast === null || showSuccessToast === void 0 ? void 0 : showSuccessToast(res);
           case 9:
-            // 如果是整单支付，则调用 onClose 让外面清空购物车
-            if ((res === null || res === void 0 || (_res$response = res.response) === null || _res$response === void 0 || (_res$response = _res$response.data) === null || _res$response === void 0 ? void 0 : _res$response.payment_status) === 'paid') {
-              onClose === null || onClose === void 0 || onClose(true);
-            }
-            // if (res.data.payment_status)
-            // setShowRetryModal(false);
-          case 10:
           case "end":
             return _context15.stop();
         }
@@ -2049,9 +1979,7 @@ var PaymentModal = function PaymentModal(_ref19) {
     console.log('PaymentModal - Toast closed, executing payment completion callback');
     // 调用支付完成回调
     if (currentPaymentResultRef.current) {
-      callback === null || callback === void 0 || callback(_objectSpread(_objectSpread({}, currentPaymentResultRef.current), {}, {
-        isCallbackFromToast: true
-      }));
+      callback === null || callback === void 0 || callback(currentPaymentResultRef.current);
     }
     // 不再自动关闭PaymentModal，让两个弹窗独立管理
   };
@@ -2061,36 +1989,12 @@ var PaymentModal = function PaymentModal(_ref19) {
     console.log('PaymentModal - Modal closing independently');
     onClose === null || onClose === void 0 || onClose(true);
   };
-  var handlePaymentCancel = function handlePaymentCancel(reset, notCancelOrder) {
-    var _paymentContentRef$cu, _paymentContentRef$cu2;
-    // 如果需要在父组件读取子组件 PaymentContent 的内部状态（如 syncingLock），只能通过 ref/回调或将状态上提
-    var isSyncingLocked = ((_paymentContentRef$cu = paymentContentRef.current) === null || _paymentContentRef$cu === void 0 || (_paymentContentRef$cu2 = _paymentContentRef$cu.getSyncingLock) === null || _paymentContentRef$cu2 === void 0 ? void 0 : _paymentContentRef$cu2.call(_paymentContentRef$cu)) || false;
-    console.log('Payment cancelled, syncingLock:', isSyncingLocked);
-    if (isSyncingLocked) {
-      logger === null || logger === void 0 || logger.addLog({
-        type: 'warning',
-        title: '订单正在同步中，用户点击取消',
-        metadata: {
-          isSyncingLocked: isSyncingLocked
-        }
-      });
-      return;
-    }
+  var handlePaymentCancel = function handlePaymentCancel(reset) {
     console.log('Payment cancelled');
     callback === null || callback === void 0 || callback({
       status: 'cancelled'
     });
     var checkout = pisellos.getModule('checkout');
-
-    // if (!notCancelOrder) {
-    //   checkout.cancelCurrentOrderAsync();
-    // } else {
-    //   onClose?.(false)
-    //   onSetLocalOrderId?.(checkout.getCurrentOrderId())
-    //   return
-    // }
-    // 暂时先使用取消订单的逻辑（本地数据库标记）
-    // 确认是否有地方重复调用 checkout
     checkout.cancelCurrentOrderAsync();
     // 不关闭PaymentResultToast，让它独立存在
     onClose === null || onClose === void 0 || onClose(reset || false);
@@ -2162,7 +2066,7 @@ var PaymentModal = function PaymentModal(_ref19) {
         if (checkout.isCurrentOrderSynced() && ((_checkout$getCurrentO = checkout.getCurrentOrderInfo()) === null || _checkout$getCurrentO === void 0 ? void 0 : _checkout$getCurrentO.paymentStatus) !== 'unpaid') {
           handleSetEditCartMode(true);
         } else {
-          handlePaymentCancel(false, true);
+          handlePaymentCancel(false);
         }
       }
     })), (config === null || config === void 0 ? void 0 : config.showHeaderCenter) && /*#__PURE__*/React.createElement("div", {
@@ -2219,8 +2123,7 @@ var PaymentModal = function PaymentModal(_ref19) {
                 currency_code: getData('shop_currency_code'),
                 currency_symbol: getData('shop_symbol'),
                 order_rounding_setting: getData('order_rounding_setting'),
-                shop_wallet_pass_id: shop_wallet_pass_id,
-                business_code: businessCode
+                shop_wallet_pass_id: shop_wallet_pass_id
               });
               newData = cloneDeep(data);
               existPayment = newData.existPayment; // setTotalAmount(newData.total.expectAmount);
@@ -2546,7 +2449,7 @@ var PaymentModal = function PaymentModal(_ref19) {
     var handleDetailsClick = /*#__PURE__*/function () {
       var _ref31 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee24() {
         var _context$appHelper2;
-        var _context$appHelper$ut9, isTerminal, isWebPos, NativePage, checkout, orderId, nativePage;
+        var _context$appHelper$ut9, isTerminal, isWebPos, checkout, _orderId7;
         return _regeneratorRuntime().wrap(function _callee24$(_context24) {
           while (1) switch (_context24.prev = _context24.next) {
             case 0:
@@ -2555,38 +2458,25 @@ var PaymentModal = function PaymentModal(_ref19) {
                 closePaymentResultToast();
                 // 不关闭PaymentModal，保持其打开状态
               }, 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, NativePage = _context$appHelper$ut9.NativePage;
-              checkout = pisellos.getModule('checkout');
-              _context24.next = 5;
-              return checkout.getCurrentOrderId();
-            case 5:
-              orderId = _context24.sent;
-              if (!isWebPos) {
-                _context24.next = 10;
-                break;
-              }
-              nativePage = NativePage === null || NativePage === void 0 ? void 0 : NativePage();
-              nativePage.open({
-                page: "/native/order/detail",
-                params: {
-                  order_id: orderId
-                }
-              });
-              return _context24.abrupt("return");
-            case 10:
+              _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())) {
-                _context24.next = 12;
+                _context24.next = 8;
                 break;
               }
+              checkout = pisellos.getModule('checkout');
+              _context24.next = 6;
+              return checkout.getCurrentOrderId();
+            case 6:
+              _orderId7 = _context24.sent;
               return _context24.abrupt("return", interaction.utils.postMessageToApp({
                 module: 'booking',
                 key: 'view_order',
                 data: {
-                  order_id: orderId
+                  order_id: _orderId7
                 },
                 origin: '/booking'
               }));
-            case 12:
+            case 8:
             case "end":
               return _context24.stop();
           }
@@ -2598,7 +2488,7 @@ var PaymentModal = function PaymentModal(_ref19) {
     }();
     var handlePrintReceiptClick = /*#__PURE__*/function () {
       var _ref32 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee25() {
-        var checkoutModule, data, isSynced, _orderId7, params;
+        var checkoutModule, data, isSynced, _orderId8, params;
         return _regeneratorRuntime().wrap(function _callee25$(_context25) {
           while (1) switch (_context25.prev = _context25.next) {
             case 0:
@@ -2632,9 +2522,9 @@ var PaymentModal = function PaymentModal(_ref19) {
               _context25.next = 15;
               return checkoutModule.getCurrentOrderId();
             case 15:
-              _orderId7 = _context25.sent;
+              _orderId8 = _context25.sent;
               data = {
-                orderId: _orderId7
+                orderId: _orderId8
               };
             case 17:
               // data.orderId 就是订单号，可以用来打印小票
@@ -2675,14 +2565,14 @@ var PaymentModal = function PaymentModal(_ref19) {
       // 这里可以添加更改支付方式的逻辑
     };
     var handleSaveAsPartialPaidClick = function handleSaveAsPartialPaidClick() {
-      var _paymentContentRef$cu3;
+      var _paymentContentRef$cu;
       // console.log(
       //   locales.getText('payment.result.actions.saveAsPartialPaidClicked')
       // );
       // savePayLaterHandlerRef.current?.handleSavePayLaterClick();
       // 直接关闭弹窗
       // handleToastClose();
-      (_paymentContentRef$cu3 = paymentContentRef.current) === null || _paymentContentRef$cu3 === void 0 || _paymentContentRef$cu3.handleButtonClick('save-pay-later');
+      (_paymentContentRef$cu = paymentContentRef.current) === null || _paymentContentRef$cu === void 0 || _paymentContentRef$cu.handleButtonClick('save-pay-later');
     };
     var handleContinuePaymentClick = function handleContinuePaymentClick() {
       console.log(locales.getText('payment.result.actions.continuePaymentClicked'));
@@ -2932,7 +2822,6 @@ var PaymentModal = function PaymentModal(_ref19) {
       },
       title: /*#__PURE__*/React.createElement(CustomHeader, null),
       width: 880,
-      className: 'payment-modal-modal',
       destroyOnClose: false,
       maskClosable: false,
       footer: null,