@pisell/private-materials 6.4.5 → 6.4.6

package/es/components/booking/components/footer/amount.d.ts

@@ -3,10 +3,14 @@ export declare const getIsPriceIncludeTax: (state: any) => any;
 /**
  * 总金额
  * @param state
- * @param options
+ * @param options isEdit: 预约信息是否发生变动
  * @returns
  */
-export declare const getSumTotal: (state: any, { isEdit, ScheduleModule, ...rest }: any) => {
+export declare const getSumTotal: (state: any, options: {
+    [key: string]: any;
+    isEdit: boolean;
+    ScheduleModule: any;
+}) => {
     productAmount: number;
     duration: string;
     tax: number;

package/es/components/booking/components/footer/amount.js

@@ -1,7 +1,4 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-var _excluded = ["isEdit", "ScheduleModule"];
-function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -192,7 +189,6 @@ var processItemsTax = function processItemsTax(items, state, options) {
       // 计算原始税费（折扣前）- 单个商品
       var originalTaxPerItem = getProductItemTax(_objectSpread(_objectSpread({}, item), {}, {
         total: unitPrice.toNumber(),
-        price: item._extend.total,
         quantity: 1
       }), state, {
         tax_rate: tax_rate,
@@ -222,9 +218,40 @@ var processItemsTax = function processItemsTax(items, state, options) {
       item._extend.original_tax_fee = originalTaxPerItem.toNumber();
       item._extend.tax_fee = discountedTaxPerItem.toNumber();
 
+      // 注意：加时商品独立计算，不考虑主商品数量
+      var addTimeTotalTax = new Decimal(0);
+      if (Array.isArray(item._extend.relation_details)) {
+        var _iterator5 = _createForOfIteratorHelper(item._extend.relation_details),
+          _step5;
+        try {
+          for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
+            var atItem = _step5.value;
+            // 计算单件加时商品折扣后价格
+            var _originTotal = new Decimal(atItem.selling_price || atItem.price || 0);
+            var _discountedTotal = _originTotal;
+            if (productExpectAmount > 0) {
+              _discountedTotal = _originTotal.minus(_originTotal.dividedBy(productExpectAmount).times(shopDiscount));
+            }
+            var addTimeTaxPerItem = getProductItemTax(_objectSpread(_objectSpread({}, atItem), {}, {
+              total: _discountedTotal,
+              // 可能包含原有数据，或前端临时数据
+              quantity: atItem.product_quantity || atItem.num || 1
+            }), state, {
+              tax_rate: tax_rate,
+              is_price_include_tax: is_price_include_tax
+            });
+            addTimeTotalTax = addTimeTotalTax.plus(addTimeTaxPerItem);
+          }
+        } catch (err) {
+          _iterator5.e(err);
+        } finally {
+          _iterator5.f();
+        }
+      }
+
       // 累加到总税费（乘以数量）
-      originTax = originTax.plus(originalTaxPerItem.times(quantity));
-      tax = tax.plus(discountedTaxPerItem.times(quantity));
+      originTax = originTax.plus(originalTaxPerItem.times(quantity)).plus(addTimeTotalTax);
+      tax = tax.plus(discountedTaxPerItem.times(quantity)).plus(addTimeTotalTax);
     }
   } catch (err) {
     _iterator4.e(err);
@@ -406,13 +433,14 @@ var isProductMatchSurchargeCondition = function isProductMatchSurchargeCondition
  * @param options 包含 ScheduleModule 和其他附加费计算所需参数
  */
 var getSurcharge = function getSurcharge(state, options) {
-  var ScheduleModule = options.ScheduleModule,
+  var isEdit = options.isEdit,
+    ScheduleModule = options.ScheduleModule,
     surcharge_list = options.surcharge_list,
     scheduleById = options.scheduleById;
   var bookingDetail = state.bookingDetail,
     bookingId = state.bookingId;
-  // 编辑状态直接从详情取出
-  if (bookingId) {
+  // 编辑状态, 且未修改商品时直接从详情取出
+  if (!isEdit && bookingId) {
     if (Array.isArray(bookingDetail === null || bookingDetail === void 0 ? void 0 : bookingDetail.surcharge)) {
       var _state$bookingDetail3;
       return (((_state$bookingDetail3 = state.bookingDetail) === null || _state$bookingDetail3 === void 0 ? void 0 : _state$bookingDetail3.surcharge) || []).map(function (d, index) {
@@ -459,52 +487,52 @@ var getSurcharge = function getSurcharge(state, options) {
 
     // 检查service中符合条件的商品
     if (Array.isArray(service === null || service === void 0 ? void 0 : service.value)) {
-      var _iterator5 = _createForOfIteratorHelper(service.value),
-        _step5;
+      var _iterator6 = _createForOfIteratorHelper(service.value),
+        _step6;
       try {
-        for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
-          var item = _step5.value;
+        for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
+          var item = _step6.value;
           if (isProductMatchSurchargeCondition(item, {
             surchargeConfig: surchargeConfig,
             scheduleById: scheduleById || {},
             ScheduleModule: ScheduleModule
           })) {
             matchedItems.push({
-              total: Number(item._extend.price),
-              // 附加费不参与折扣，需要使用商品原价计算
+              total: Number(item._extend.total),
+              addTimeTotal: getRelationDetailsTotal(item._extend.relation_details || []),
               quantity: item._extend.quantity || 1
             });
           }
         }
       } catch (err) {
-        _iterator5.e(err);
+        _iterator6.e(err);
       } finally {
-        _iterator5.f();
+        _iterator6.f();
       }
     }
 
     // 检查addons中符合条件的商品
     if (Array.isArray(addons === null || addons === void 0 ? void 0 : addons.value)) {
-      var _iterator6 = _createForOfIteratorHelper(addons.value),
-        _step6;
+      var _iterator7 = _createForOfIteratorHelper(addons.value),
+        _step7;
       try {
-        for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
-          var _item2 = _step6.value;
+        for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
+          var _item2 = _step7.value;
           if (isProductMatchSurchargeCondition(_item2, {
             surchargeConfig: surchargeConfig,
             scheduleById: scheduleById || {},
             ScheduleModule: ScheduleModule
           })) {
             matchedItems.push({
-              total: Number(_item2._extend.price),
+              total: Number(_item2._extend.total),
               quantity: _item2._extend.quantity || 1
             });
           }
         }
       } catch (err) {
-        _iterator6.e(err);
+        _iterator7.e(err);
       } finally {
-        _iterator6.f();
+        _iterator7.f();
       }
     }
     var finalAmount = 0;
@@ -515,21 +543,22 @@ var getSurcharge = function getSurcharge(state, options) {
       // 计算百分比附加费 - 对每个商品单独计算
       if (percentage && new Decimal(percentage).gt(0)) {
         var percentageRate = new Decimal(percentage);
-        var _iterator7 = _createForOfIteratorHelper(matchedItems),
-          _step7;
+        var _iterator8 = _createForOfIteratorHelper(matchedItems),
+          _step8;
         try {
-          for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
-            var _item3 = _step7.value;
+          for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
+            var _item3 = _step8.value;
             // 对每个商品：max(0, 价格) * 数量 * 费率
             var itemPrice = new Decimal(Math.max(0, _item3.total || 0));
             var itemQuantity = new Decimal(_item3.quantity || 1);
-            var itemSurcharge = itemPrice.times(itemQuantity).times(percentageRate);
+            var addTimeTotal = new Decimal(_item3.addTimeTotal || 0);
+            var itemSurcharge = itemPrice.times(itemQuantity).plus(addTimeTotal).times(percentageRate);
             configTotal = configTotal.plus(itemSurcharge);
           }
         } catch (err) {
-          _iterator7.e(err);
+          _iterator8.e(err);
         } finally {
-          _iterator7.f();
+          _iterator8.f();
         }
       }
 
@@ -564,12 +593,16 @@ var getSurcharge = function getSurcharge(state, options) {
  * @param state
  * @returns
  */
-var getSurchargeAmount = function getSurchargeAmount(state, surcharge) {
+var getSurchargeAmount = function getSurchargeAmount(state, surcharge, options) {
   var bookingDetail = state.bookingDetail,
     bookingId = state.bookingId;
-  // 编辑状态直接使用后端的数据
-  if (bookingDetail && bookingId) {
-    return Number(bookingDetail.surcharge_fee);
+  var isEdit = options.isEdit;
+  // 订单未变更过
+  if (!isEdit) {
+    // 有后端数据则直接使用后端的数据
+    if (bookingDetail && bookingId) {
+      return Number(bookingDetail.surcharge_fee);
+    }
   }
   if (!Array.isArray(surcharge)) return 0;
   // 新增状态使用 getSurcharge 的返回值进行求和
@@ -617,7 +650,6 @@ var getExpectAmount = function getExpectAmount(_ref2) {
     state = _ref2.state,
     options = _ref2.options;
   var _tax = tax;
-
   // 如果价格含税, 则将税费改为0
   if (getIsPriceIncludeTax(state) || options !== null && options !== void 0 && options.is_price_include_tax) {
     _tax = 0;
@@ -647,15 +679,12 @@ var getSumTotalAmount = function getSumTotalAmount(_ref3) {
 /**
  * 总金额
  * @param state
- * @param options
+ * @param options isEdit: 预约信息是否发生变动
  * @returns
  */
-export var getSumTotal = function getSumTotal(state, _ref4) {
-  var isEdit = _ref4.isEdit,
-    ScheduleModule = _ref4.ScheduleModule,
-    rest = _objectWithoutProperties(_ref4, _excluded);
+export var getSumTotal = function getSumTotal(state, options) {
   // 商品总金额,   包含 商品折扣 报价单 子商品
-  var _getProductExpectAmou = getProductExpectAmount(state, isEdit),
+  var _getProductExpectAmou = getProductExpectAmount(state, options.isEdit),
     productExpectAmount = _getProductExpectAmou.productExpectAmount,
     duration = _getProductExpectAmou.duration;
 
@@ -669,11 +698,9 @@ export var getSumTotal = function getSumTotal(state, _ref4) {
   var paySurchargeFee = getPaySurchargeFee(state);
 
   // 订单附加费列表
-  var surcharge = getSurcharge(state, _objectSpread({
-    ScheduleModule: ScheduleModule
-  }, rest));
+  var surcharge = getSurcharge(state, options);
   // 订单附加费金额
-  var surchargeAmount = getSurchargeAmount(state, surcharge);
+  var surchargeAmount = getSurchargeAmount(state, surcharge, options);
 
   // 算出整单折扣的百分比 shopDiscount / productExpectAmount
   var computed = {
@@ -682,12 +709,11 @@ export var getSumTotal = function getSumTotal(state, _ref4) {
   };
   // 税费
   var _getTax = getTax(state, _objectSpread({
-      isEdit: isEdit,
       computed: computed
-    }, rest)),
+    }, options)),
     tax = _getTax.tax,
     originTax = _getTax.originTax;
-  var taxInfo = getTaxInfo(state, rest);
+  var taxInfo = getTaxInfo(state, options);
 
   // 已付金额 (包含手续费)
   var paidAmount = getPaidAmount(state);
@@ -705,9 +731,7 @@ export var getSumTotal = function getSumTotal(state, _ref4) {
     surchargeAmount: surchargeAmount,
     shopDiscount: shopDiscount,
     state: state,
-    options: _objectSpread({
-      isEdit: isEdit
-    }, rest)
+    options: options
   });
 
   // 订单原价（不包含整单折扣的价格）
@@ -717,9 +741,7 @@ export var getSumTotal = function getSumTotal(state, _ref4) {
     surchargeAmount: surchargeAmount,
     shopDiscount: 0,
     state: state,
-    options: _objectSpread({
-      isEdit: isEdit
-    }, rest)
+    options: options
   });
 
   // 总支付金额  总计

package/es/components/booking/components/footer/index.js

@@ -606,7 +606,7 @@ var Footer = function Footer(props) {
           case 0:
             isNewOrder = !state.bookingId; // 如果有编辑内容, 则先保存
             if (!isEdit) {
-              _context4.next = 26;
+              _context4.next = 25;
               break;
             }
             if (!isDayBooking(state)) {
@@ -621,7 +621,7 @@ var Footer = function Footer(props) {
             return _context4.abrupt("return");
           case 6:
             if (!state.isBookingTicket2) {
-              _context4.next = 20;
+              _context4.next = 19;
               break;
             }
             _context4.next = 9;
@@ -648,7 +648,6 @@ var Footer = function Footer(props) {
                 showDetail: showDetail
               }
             };
-            console.log('💳 Footer: Setting payment modal data:', modalData);
             setPaymentModalData(modalData);
             setIsPaymentModalOpen(true); // 打开 modal
             setCheckoutLoading(false);
@@ -682,24 +681,24 @@ var Footer = function Footer(props) {
                 }
               };
             });
-            _context4.next = 25;
+            _context4.next = 24;
             break;
-          case 20:
-            _context4.next = 22;
+          case 19:
+            _context4.next = 21;
             return handleSave({
               type: 'checkout',
               messageShow: !(isTerminal !== null && isTerminal !== void 0 && isTerminal())
             });
-          case 22:
+          case 21:
             _res = _context4.sent;
             // goCheckout2(res);
             console.log(_res);
             goCheckout((_res === null || _res === void 0 ? void 0 : _res.order_id) || state.bookingId, isNewOrder);
-          case 25:
+          case 24:
             return _context4.abrupt("return");
-          case 26:
+          case 25:
             return _context4.abrupt("return", goCheckout(state.bookingId, isNewOrder));
-          case 27:
+          case 26:
           case "end":
             return _context4.stop();
         }
@@ -1792,7 +1791,8 @@ var Footer = function Footer(props) {
     onConfirm: handleNoteConfirm,
     onDelete: handleNoteDelete,
     onCancel: handleNoteCancel
-  }), isPaymentModalOpen && /*#__PURE__*/React.createElement(PaymentModal, {
+  }), /*#__PURE__*/React.createElement(PaymentModal, {
+    open: isPaymentModalOpen,
     data: paymentModalData,
     callback: paymentCallback || undefined,
     state: state,

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

@@ -11,6 +11,7 @@ interface PaymentModalData {
     total: any;
 }
 interface PaymentModalProps {
+    open?: boolean;
     data?: PaymentModalData;
     callback?: (result: any) => void;
     onClose?: (reset?: boolean) => void;

package/es/components/checkout/PaymentModal.js

@@ -33,7 +33,7 @@ import PaymentOptionsModule from "./components/PaymentOptionsModule";
 import CashPaymentModule from "./components/CashPaymentModule";
 import AdditionalModule from "./components/AdditionalModule";
 import { getSumTotal } from "../booking/components/footer/amount";
-import { usePaymentResultToast, PaymentResultToastProvider, closePaymentResultToast } from "./components/PaymentResultToast";
+import { PaymentResultToastProvider, closePaymentResultToast } from "./components/PaymentResultToast";
 import { formatCurrency, calculateStatusClassName, calculateAutoCloseConfig, displayPaymentResultToast, createShowSuccessToast } from "./utils/PaymentResultToastUtils";
 import { Printer, FileCheck02, RefreshCw05, CreditCard02, MessageTextSquare02, ArrowLeft, DotsVertical } from '@pisell/icon';
 import { checkoutStyles } from "./styles";
@@ -66,6 +66,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
   var _parentModuleConfig$s, _state$client2, _state$client3;
   var cartData = _ref.cartData,
     orderInfo = _ref.orderInfo,
+    isModalOpen = _ref.isModalOpen,
     onPaymentComplete = _ref.onPaymentComplete,
     onPaymentCancel = _ref.onPaymentCancel,
     onStatusChange = _ref.onStatusChange,
@@ -92,7 +93,8 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
     pisellosAllModule = utils.pisellosAllModule,
     interaction = utils.interaction;
   var Toast = useToast();
-  var paymentResultToast = usePaymentResultToast();
+  // const paymentResultToast = usePaymentResultToast();
+
   var checkoutRef = useRef(null);
   var savePayLaterHandlerRef = useRef(null);
   // 剩余待付金额-可自定义修改，也可认作支付方式付出去需要付多少钱
@@ -352,8 +354,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
 
   // 初始化自定义金额
   useEffect(function () {
-    console.time('initCustomAmount');
-    if (checkoutModule && orderInfo) {
+    if (checkoutModule && orderInfo && isModalOpen) {
       try {
         var currentAmount = checkoutModule.getStateAmount();
         if (currentAmount) {
@@ -375,8 +376,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
       // 没有os 数据的时候先用外面传入的购物车数据展示
       // setCustomAmount(cartData?.total?.expectAmount || 0);
     }
-    console.timeEnd('initCustomAmount');
-    if (checkoutModule) {
+    if (checkoutModule && isModalOpen) {
       checkoutModule.getPaymentMethodsAsync().then(function (paymentMethods) {
         setPaymentMethods(paymentMethods);
         // TODO: 现金枚举类型需要从os导入
@@ -394,7 +394,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
 
   // 初始化推荐金额
   useEffect(function () {
-    if (customAmount && checkoutModule && currency && orderInfo) {
+    if (customAmount && checkoutModule && currency && orderInfo && isModalOpen) {
       try {
         setRecommendAmounts(checkoutModule.payment.cash.getRecommendedAmount(customAmount, currency));
       } catch (error) {
@@ -405,7 +405,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
 
   // 监听金额变化事件
   useEffect(function () {
-    if (checkoutModule && checkoutModule.core) {
+    if (checkoutModule && checkoutModule.core && isModalOpen) {
       try {
         var core = checkoutModule.core;
         if (core.effects && typeof core.effects.on === 'function') {
@@ -1136,7 +1136,8 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
 
 var PaymentModal = function PaymentModal(_ref16) {
   var _context$appHelper$ut, _context$appHelper$ut2, _context$appHelper$ut3, _context$appHelper$ut4, _context$appHelper;
-  var data = _ref16.data,
+  var open = _ref16.open,
+    data = _ref16.data,
     callback = _ref16.callback,
     onClose = _ref16.onClose,
     dispatch = _ref16.dispatch,
@@ -1444,7 +1445,7 @@ var PaymentModal = function PaymentModal(_ref16) {
       status: 'cancelled'
     });
     var checkout = pisellos.getModule('checkout');
-    checkout.cancelCheckoutAsync();
+    checkout.cancelCurrentOrderAsync();
     onClose === null || onClose === void 0 || onClose(reset || false);
   };
 
@@ -1554,7 +1555,7 @@ var PaymentModal = function PaymentModal(_ref16) {
                 var paymentStatus = responseData === null || responseData === void 0 ? void 0 : responseData.payment_status;
                 // 获取订单总金额
                 var orderTotalAmount = Number((responseData === null || responseData === void 0 ? void 0 : responseData.total_amount) || 0);
-                var gapAmount = Number((responseData === null || responseData === void 0 ? void 0 : responseData.amount_gap) || 0);
+                // const gapAmount = Number(responseData?.amount_gap || 0);
                 var currentChangeGivenAmount = Number((responseData === null || responseData === void 0 || (_responseData$payment = responseData.payment_info) === null || _responseData$payment === void 0 ? void 0 : _responseData$payment.current_change_given_amount) || 0);
                 // const changeDue = Number(responseData?.amount_gap || 0);
                 // 获取失败原因
@@ -1564,7 +1565,7 @@ var PaymentModal = function PaymentModal(_ref16) {
                 if (paymentStatus) {
                   // 确定支付状态
                   var statusClassName = calculateStatusClassName(paymentStatus);
-                  var autoCloseConfig = calculateAutoCloseConfig(paymentStatus, !!gapAmount);
+                  var autoCloseConfig = calculateAutoCloseConfig(paymentStatus, !!currentChangeGivenAmount);
 
                   // 根据支付状态展示不同的 toast
                   displayPaymentResultToast({
@@ -1581,7 +1582,7 @@ var PaymentModal = function PaymentModal(_ref16) {
                     toastInfo: {
                       status: paymentStatus,
                       amount: orderTotalAmount,
-                      gapAmount: gapAmount,
+                      gapAmount: currentChangeGivenAmount,
                       failureReason: failureReason
                     }
                   });
@@ -1659,10 +1660,10 @@ var PaymentModal = function PaymentModal(_ref16) {
         return _ref21.apply(this, arguments);
       };
     }();
-    if (data) {
+    if (data && open) {
       initCheckoutData();
     }
-  }, [data]);
+  }, [data, open]);
 
   // 创建PaymentResultToast配置对象
   var paymentResultToastConfig = {
@@ -2001,17 +2002,18 @@ var PaymentModal = function PaymentModal(_ref16) {
 
   // 使用新的工具方法创建showSuccessToast函数
   var showSuccessToast = createShowSuccessToast(paymentResultToastConfig, generateActionButtons);
-  console.log('✅ PaymentModal: Rendering PisellContainer with open=true');
-  return /*#__PURE__*/React.createElement(PaymentResultToastProvider, null, /*#__PURE__*/React.createElement(PisellContainer, {
+  return /*#__PURE__*/React.createElement(PaymentResultToastProvider, null, /*#__PURE__*/React.createElement(PisellContainer
+  // open={open}
+  , {
     renderType: "modal",
     props: {
-      open: true,
+      open: open,
       onCancel: function onCancel() {
         handlePaymentCancel(false);
       },
       title: /*#__PURE__*/React.createElement(CustomHeader, null),
       width: 880,
-      destroyOnClose: true,
+      destroyOnClose: false,
       maskClosable: false,
       footer: null,
       closeIcon: null,
@@ -2032,6 +2034,7 @@ var PaymentModal = function PaymentModal(_ref16) {
     }
   }, /*#__PURE__*/React.createElement(PaymentContent, {
     ref: paymentContentRef,
+    isModalOpen: open,
     cartData: cloneDeep(data),
     orderInfo: orderInfo,
     onPaymentComplete: handlePaymentComplete,

package/es/components/checkout/components/WalletPassModule/components/DiscountWallet/DiscountTextMode.js

@@ -1,4 +1,6 @@
 import React from 'react';
+import { PisellText } from '@pisell/materials';
+var Amount = PisellText.Amount;
 var DiscountTextMode = function DiscountTextMode(_ref) {
   var cardData = _ref.cardData,
     selectedWalletIds = _ref.selectedWalletIds;
@@ -14,7 +16,10 @@ var DiscountTextMode = function DiscountTextMode(_ref) {
       className: "discount-text-name"
     }, card.name), /*#__PURE__*/React.createElement("span", {
       className: "discount-text-amount"
-    }, "-", card.savedAmount ? "$".concat(card.savedAmount) : '$0'));
+    }, "-", /*#__PURE__*/React.createElement(Amount, {
+      value: card.savedAmount,
+      showCurrencySymbol: true
+    })));
   }) : /*#__PURE__*/React.createElement("div", {
     className: "discount-text-empty"
   }));

package/es/components/checkout/components/WalletPassModule/components/WalletPassTextMode/index.js

@@ -1,5 +1,7 @@
 import React from 'react';
+import { PisellText } from '@pisell/materials';
 import "./index.less";
+var Amount = PisellText.Amount;
 var WalletPassTextMode = function WalletPassTextMode(_ref) {
   var cardData = _ref.cardData,
     selectedWalletIds = _ref.selectedWalletIds;
@@ -15,7 +17,10 @@ var WalletPassTextMode = function WalletPassTextMode(_ref) {
       className: "wallet-pass-text-name"
     }, card.name), /*#__PURE__*/React.createElement("span", {
       className: "wallet-pass-text-amount"
-    }, "-", card.redeem ? "".concat(card.redeem) : '$0'));
+    }, "-", /*#__PURE__*/React.createElement(Amount, {
+      value: card.redeem,
+      showCurrencySymbol: true
+    })));
   }) : /*#__PURE__*/React.createElement("div", {
     className: "wallet-pass-text-empty"
   }));

package/es/components/ticketBooking/components/ticketBooking/index.js

@@ -25,8 +25,8 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 import React, { useEffect, useMemo, useRef, useState } from 'react';
 import { locales } from '@pisell/utils';
 import { message } from 'antd';
-import { Iconfont } from '@pisell/materials';
-import { getOrderInfoByCode, getBookingDetail, getEventBookingDetail, getBookingConfig, getServices, voidAppointment } from "../../serve";
+import { Iconfont, PisellModal } from '@pisell/materials';
+import { getOrderInfoByCode, getBookingDetail, getEventBookingDetail, getBookingConfig, getServices } from "../../serve";
 import * as apis from "../../serve";
 import dayjs from 'dayjs';
 import useEngineContext from "../../../../hooks/useEngineContext";
@@ -247,6 +247,10 @@ var TicketBooking = function TicketBooking() {
     _useState2 = _slicedToArray(_useState, 2),
     activeBookingId = _useState2[0],
     setActiveBookingId = _useState2[1];
+  var _useState3 = useState(false),
+    _useState4 = _slicedToArray(_useState3, 2),
+    showTerminalUpgradeModal = _useState4[0],
+    setShowTerminalUpgradeModal = _useState4[1];
   var pisellFloatingPanelRef = useRef(null);
   var closeRef = useRef(null);
   var bookingTicket = useBookingTicket();
@@ -261,6 +265,26 @@ var TicketBooking = function TicketBooking() {
       changeCustomerToGlobalState: changeCustomerToGlobalState
     }),
     selectCustomer = _useCustomer.selectCustomer;
+
+  // 检测Terminal版本并显示升级提示
+  var checkTerminalVersion = useMemoizedFn(function () {
+    if (isTerminal()) {
+      var userAgent = navigator.userAgent;
+      if (userAgent.includes('terminal')) {
+        // 匹配 terminal/x.x.x(xxx) 格式，支持多位数
+        var terminalVersionMatch = userAgent.match(/terminal\/[\d.]+\((\d+)\)/i);
+        if (terminalVersionMatch && terminalVersionMatch[1]) {
+          var buildNumberStr = terminalVersionMatch[1];
+          var buildNumber = parseInt(buildNumberStr, 10);
+
+          // 确保解析成功且是有效数字
+          if (!isNaN(buildNumber) && buildNumber > 0 && buildNumber < 766) {
+            setShowTerminalUpgradeModal(true);
+          }
+        }
+      }
+    }
+  });
   useMemo(function () {
     openScan(function (data) {
       handleScan(data);
@@ -336,6 +360,9 @@ var TicketBooking = function TicketBooking() {
     });
     _setShopOpeningHours();
     _setIntervalTime(true);
+
+    // 检测Terminal版本
+    checkTerminalVersion();
     interaction === null || interaction === void 0 || (_interaction$utils = interaction.utils) === null || _interaction$utils === void 0 || _interaction$utils.mountFunction('bookingTicket', 'clearAllCart', function (type, orderId) {
       console.log('bookingTicket.clearAllCart');
       // 支付成功后清空状态
@@ -349,8 +376,9 @@ var TicketBooking = function TicketBooking() {
 
     // 作废预约
     interaction === null || interaction === void 0 || (_interaction$utils2 = interaction.utils) === null || _interaction$utils2 === void 0 || _interaction$utils2.mountFunction('booking', 'voidBooking', function (orderId) {
-      voidAppointment(orderId);
-      enableAllScanListeners();
+      // checkout2.0 结账时不生成订单 所以不需要作废订单
+      // voidAppointment(orderId);
+      // enableAllScanListeners();
     });
     return function () {
       off === null || off === void 0 || off();
@@ -387,6 +415,7 @@ var TicketBooking = function TicketBooking() {
       intervalSetTime: isInterval
     });
   };
+  useEffect(function () {}, []);
   var getDataFromHost = function getDataFromHost() {
     try {
       var is_price_include_tax = getData('is_price_include_tax');
@@ -1210,6 +1239,19 @@ var TicketBooking = function TicketBooking() {
     ref: pisellFloatingPanelRef,
     currentDate: currentDate,
     onBookingClick: handleBookingClick
+  }), /*#__PURE__*/React.createElement(PisellModal.Information, {
+    open: showTerminalUpgradeModal,
+    title: locales.getText('pisell2.ticket-booking.terminal-upgrade-title'),
+    describe: locales.getText('pisell2.ticket-booking.terminal-upgrade-description'),
+    okText: locales.getText('pisell2.ticket-booking.terminal-upgrade-ok'),
+    cancelText: locales.getText('pisell2.ticket-booking.terminal-upgrade-cancel'),
+    closable: true,
+    onOk: function onOk() {
+      return setShowTerminalUpgradeModal(false);
+    },
+    onCancel: function onCancel() {
+      return setShowTerminalUpgradeModal(false);
+    }
   }));
 };
 export default TicketBooking;