@pisell/private-materials 6.5.12 → 6.5.14

package/es/components/Sales/Summary/utils.d.ts

@@ -30,7 +30,7 @@ export declare const calculateSubtotal: (items: CartItem[]) => string;
  * @return {*}
  * @Author: xiangfeng.xue
  */
-export declare const calculateTaxFee: (shopInfo: any, items: CartItem[]) => "0.00" | Decimal;
+export declare const calculateTaxFee: (shopInfo: any, items: CartItem[]) => Decimal | "0.00";
 /**
  * 计算所有价格明细
  * @param items - 购物车商品数组

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

@@ -1 +1,10 @@
-export declare const Provider: any, Context: any;
+/// <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;
+}>;

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

@@ -31,8 +31,9 @@ import { useCustomer } from "../../../ticketBooking/hooks/pisellos/useCustomer";
 import { useMemoizedFn } from 'ahooks';
 import useEngineContext, { usePisellOS } from "../../../../hooks/useEngineContext";
 import useScanManager from "../../../ticketBooking/hooks/pisellos/useScanManager";
-import { useShopDiscount } from "../../../appointmentBooking/hooks";
 import { DiscountKeyboard } from "../../../../pro/priceKeyboard";
+import { useActiveExecute, useBookingTicket } from "../../../ticketBooking/hooks/pisellos";
+import { useShopDiscountModule } from "../../../ticketBooking/hooks/pisellos/useShopDiscountModule";
 // Toast 内容包装器，统一设置行高
 var createToastContent = function createToastContent(text) {
   return /*#__PURE__*/React.createElement("div", {
@@ -62,14 +63,17 @@ var ActionButtons = function ActionButtons(_ref) {
     _useState8 = _slicedToArray(_useState7, 2),
     showVoucherModal = _useState8[0],
     setShowVoucherModal = _useState8[1];
-  var shopDiscount = useShopDiscount();
+  var _useActiveExecute = useActiveExecute(),
+    executeIfActive = _useActiveExecute.executeIfActive;
   var context = useEngineContext();
   var _context$appHelper$ut = (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.utils,
     getData = _context$appHelper$ut.getData,
     pisellosAllModule = _context$appHelper$ut.pisellosAllModule;
   var Toast = useToast();
   var pisellOS = usePisellOS();
+  var bookingTicket = useBookingTicket();
   var ScheduleModule = pisellosAllModule.ScheduleModule;
+  var shopDiscount = useShopDiscountModule();
 
   // 将选中的客户数据传递给状态管理
   var changeCustomerToGlobalState = useMemoizedFn(function (value) {
@@ -90,7 +94,7 @@ var ActionButtons = function ActionButtons(_ref) {
 
   // 监听客户选择变化，清空手动折扣
   useEffect(function () {
-    if (!pisellOS) return;
+    if (!bookingTicket) return;
     var handleCustomerSelected = function handleCustomerSelected() {
       // 当客户选择改变时，清空 shop_discount
       dispatch({
@@ -100,15 +104,16 @@ var ActionButtons = function ActionButtons(_ref) {
         }
       });
     };
+    var wrappedHandleCustomerSelected = executeIfActive(handleCustomerSelected);
 
     // 监听客户选择事件
-    pisellOS.effects.on('bookingTicket:onCustomerSelected', handleCustomerSelected);
+    bookingTicket.effectsOn('onCustomerSelected', wrappedHandleCustomerSelected);
 
     // 清理函数
     return function () {
-      pisellOS.effects.off('bookingTicket:onCustomerSelected', handleCustomerSelected);
+      bookingTicket.effectsOff('onCustomerSelected', wrappedHandleCustomerSelected);
     };
-  }, [dispatch, pisellOS]);
+  }, [dispatch, bookingTicket]);
 
   // 同步获取金额计算所需配置
   var getDataFromHost = function getDataFromHost() {
@@ -224,13 +229,14 @@ var ActionButtons = function ActionButtons(_ref) {
     var _context$appHelper2;
     var _ref2 = ((_context$appHelper2 = context.appHelper) === null || _context$appHelper2 === void 0 ? void 0 : _context$appHelper2.utils) || {},
       pisellos = _ref2.pisellos;
-    if (!pisellos) return;
+    if (!pisellos || !shopDiscount) return;
     var onDiscountListChange = function onDiscountListChange(discount) {
       setDiscountList(discount);
     };
-    pisellos.effects.on('shopDiscount:onDiscountListChange', onDiscountListChange);
+    var wrappedHandler = executeIfActive(onDiscountListChange);
+    shopDiscount.effectsOn('onDiscountListChange', wrappedHandler);
     return function () {
-      pisellos.effects.off('shopDiscount:onDiscountListChange', onDiscountListChange);
+      shopDiscount.effectsOff('onDiscountListChange', wrappedHandler);
     };
   }, [(_context$appHelper3 = context.appHelper) === null || _context$appHelper3 === void 0 ? void 0 : _context$appHelper3.utils]);
 

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

@@ -46,7 +46,7 @@ import { Iconfont } from '@pisell/materials';
 import { useCustomer } from "../../../ticketBooking/hooks/pisellos/useCustomer";
 import { useDebounceEffect, useDebounceFn, useMemoizedFn } from 'ahooks';
 import { cloneDeep } from 'lodash';
-import { useShopDiscount } from "../../../appointmentBooking/hooks";
+import { useShopDiscountModule } from "../../../ticketBooking/hooks/pisellos/useShopDiscountModule";
 
 /**
  * @title: 底部
@@ -1734,7 +1734,7 @@ var Footer = function Footer(props) {
       changeCustomerToGlobalState: changeCustomerToGlobalState
     }),
     selectCustomer = _useCustomer.selectCustomer;
-  var shopDiscount = useShopDiscount();
+  var shopDiscount = useShopDiscountModule();
   var _useScanManager2 = useScanManager(),
     clearAllScanListenersTaskQueue = _useScanManager2.clearAllScanListenersTaskQueue;
   // 清空所有内容并重置购物车

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

@@ -28,8 +28,9 @@ import { useIsBooking4Shop } from "../../hooks/useIsBooking4Shop";
 import "./index.less";
 import { useMemoizedFn, useDebounceFn, useDebounceEffect } from 'ahooks';
 import { getServiceAddons } from "./utils";
-import { useCustomer } from "../../../ticketBooking/hooks/pisellos";
+import { useActiveExecute, useCustomer } from "../../../ticketBooking/hooks/pisellos";
 import { getClientVariantClose } from "../../info/clientVariant/utils";
+import { useShopDiscountModule } from "../../../ticketBooking/hooks/pisellos/useShopDiscountModule";
 var ShopDiscountHooks = {
   onInited: 'shopDiscount:onInited',
   onDestroy: 'shopDiscount:onDestroy',
@@ -66,7 +67,9 @@ var VoucherCard = function VoucherCard(props) {
   var serviceValueRef = useRef(state.service.value);
   var addonsValueRef = useRef(state.addons.value);
   var isBooking4Shop = useIsBooking4Shop(state);
-  var shopDiscount = pisellos.getModule('shopDiscount');
+  var shopDiscount = useShopDiscountModule();
+  var _useActiveExecute = useActiveExecute(),
+    executeIfActive = _useActiveExecute.executeIfActive;
   services = state.service;
 
   // 将选中的客户数据传递给状态管理
@@ -95,7 +98,7 @@ var VoucherCard = function VoucherCard(props) {
 
   // 设置productList
   useEffect(function () {
-    if (isBooking4Shop) {
+    if (isBooking4Shop && shopDiscount) {
       shopDiscount.setProductList([].concat(_toConsumableArray(state.service.value), _toConsumableArray(state.addons.value)));
     }
   }, [state.service.value, state.addons.value, isBooking4Shop]);
@@ -122,9 +125,10 @@ var VoucherCard = function VoucherCard(props) {
     onScanCode(e.detail.code);
   });
   useEffect(function () {
-    window.addEventListener('onScanWallPassCode', onScanWallPassCode);
+    var wrappedOnScanWallPassCode = executeIfActive(onScanWallPassCode);
+    window.addEventListener('onScanWallPassCode', wrappedOnScanWallPassCode);
     return function () {
-      window.removeEventListener('onScanWallPassCode', onScanWallPassCode);
+      window.removeEventListener('onScanWallPassCode', wrappedOnScanWallPassCode);
     };
   }, []);
   var addonsMemo = useMemo(function () {
@@ -174,12 +178,11 @@ var VoucherCard = function VoucherCard(props) {
     run();
   }, [JSON.stringify(serviceMemo), JSON.stringify(addonsMemo), isBooking4Shop]);
   useEffect(function () {
-    if (pisellos) {
-      var _pisellos$effects;
-      pisellos === null || pisellos === void 0 || (_pisellos$effects = pisellos.effects) === null || _pisellos$effects === void 0 || _pisellos$effects.on("shopDiscount:onSelectedDiscountListChange", fn);
+    if (shopDiscount) {
+      var wrappedHandler = executeIfActive(fn);
+      shopDiscount === null || shopDiscount === void 0 || shopDiscount.effectsOn("onSelectedDiscountListChange", wrappedHandler);
       return function () {
-        var _pisellos$effects2;
-        pisellos === null || pisellos === void 0 || (_pisellos$effects2 = pisellos.effects) === null || _pisellos$effects2 === void 0 || _pisellos$effects2.off("shopDiscount:onSelectedDiscountListChange", fn);
+        shopDiscount === null || shopDiscount === void 0 || shopDiscount.effectsOff("onSelectedDiscountListChange", wrappedHandler);
       };
     }
   }, []);
@@ -195,7 +198,7 @@ var VoucherCard = function VoucherCard(props) {
 
   // 监听customer变化
   useEffect(function () {
-    if (!isBooking4Shop) return;
+    if (!isBooking4Shop || !shopDiscount) return;
     var onScanCustomerChange = function onScanCustomerChange(customer) {
       var clientVariantClose = getClientVariantClose();
       if (clientVariantClose) {
@@ -206,14 +209,17 @@ var VoucherCard = function VoucherCard(props) {
     var onDiscountListChange = function onDiscountListChange(discount) {
       setDisCountList(discount);
     };
-    pisellos.effects.on(ShopDiscountHooks.onScanCustomerChange, onScanCustomerChange);
-    pisellos.effects.on(ShopDiscountHooks.onLoadPrepareCalcResult, fn);
-    pisellos.effects.on(ShopDiscountHooks.onDiscountListChange, onDiscountListChange);
+    var wrappedOnScanCustomerChangeHandler = executeIfActive(onScanCustomerChange);
+    var wrappedOnDiscountListChangeHandler = executeIfActive(onDiscountListChange);
+    var wrappedFn = executeIfActive(fn);
+    shopDiscount.effectsOn('onScanCustomerChange', wrappedOnScanCustomerChangeHandler);
+    shopDiscount.effectsOn('onLoadPrepareCalcResult', wrappedFn);
+    shopDiscount.effectsOn('onDiscountListChange', wrappedOnDiscountListChangeHandler);
     return function () {
       shopDiscount.clear();
-      pisellos.effects.off(ShopDiscountHooks.onScanCustomerChange, onScanCustomerChange);
-      pisellos.effects.off(ShopDiscountHooks.onLoadPrepareCalcResult, fn);
-      pisellos.effects.off(ShopDiscountHooks.onDiscountListChange, onDiscountListChange);
+      shopDiscount.effectsOff('onScanCustomerChange', wrappedOnScanCustomerChangeHandler);
+      shopDiscount.effectsOff('onLoadPrepareCalcResult', wrappedFn);
+      shopDiscount.effectsOff('onDiscountListChange', wrappedOnDiscountListChangeHandler);
     };
   }, [state.bookingId, isBooking4Shop, fn]);
   var productListToValue = useMemoizedFn(function (list, edit) {
@@ -282,7 +288,6 @@ var VoucherCard = function VoucherCard(props) {
   }();
   var availableData = useMemo(function () {
     if (!isBooking4Shop) return [];
-    var shopDiscount = pisellos.getModule('shopDiscount');
     return discountList.filter(function (item) {
       return !!item.isAvailable;
     }).map(function (discount) {
@@ -325,7 +330,6 @@ var VoucherCard = function VoucherCard(props) {
     dataSource: (_state$service2 = state.service) !== null && _state$service2 !== void 0 && (_state$service2 = _state$service2.value) !== null && _state$service2 !== void 0 && _state$service2.length ? availableData : [],
     mixedSort: mixedSort,
     onChange: function onChange(val) {
-      var shopDiscount = pisellos.getModule('shopDiscount');
       var detail = shopDiscount.setDiscountSelected({
         discountId: val.id,
         isSelected: val.isSelected

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

@@ -9,7 +9,7 @@ import useSendModal from "./sendModal/useSendModal";
 import SendModal from "./sendModal";
 import { locales } from '@pisell/utils';
 var Footer = function Footer(_ref) {
-  var _state$form2, _state$client6, _state$form3, _state$client7;
+  var _state$client6, _state$form, _state$client7;
   var state = _ref.state,
     reload = _ref.reload;
   var _useSendModal = useSendModal(state === null || state === void 0 ? void 0 : state.bookingId),
@@ -37,14 +37,6 @@ var Footer = function Footer(_ref) {
       return _ref2.apply(this, arguments);
     };
   }();
-
-  // 是否都填写完成
-  var isAllCompleted = useMemo(function () {
-    var _state$form;
-    return Object.values((state === null || state === void 0 || (_state$form = state.form) === null || _state$form === void 0 ? void 0 : _state$form.value) || {}).every(function (item) {
-      return item.length > 0;
-    });
-  }, [state === null || state === void 0 || (_state$form2 = state.form) === null || _state$form2 === void 0 ? void 0 : _state$form2.value]);
   var defaultValues = useMemo(function () {
     var _state$client, _state$client2, _state$client3, _state$client4, _state$client5;
     return {
@@ -57,7 +49,7 @@ var Footer = function Footer(_ref) {
       }
     };
   }, [(_state$client6 = state.client) === null || _state$client6 === void 0 ? void 0 : _state$client6.value]);
-  if (!state.bookingId || !(state !== null && state !== void 0 && (_state$form3 = state.form) !== null && _state$form3 !== void 0 && _state$form3.forms.length)) {
+  if (!state.bookingId || !(state !== null && state !== void 0 && (_state$form = state.form) !== null && _state$form !== void 0 && _state$form.forms.length)) {
     return null;
   }
   return /*#__PURE__*/React.createElement("div", {
@@ -72,9 +64,8 @@ var Footer = function Footer(_ref) {
     size: "large",
     block: true,
     type: "primary",
-    onClick: handleOpen,
-    disabled: isAllCompleted
-  }, !isAllCompleted ? locales.getText('pisell2.text.send-form-reminder') : locales.getText('pisell2.text.send-form-reminder-completed')), /*#__PURE__*/React.createElement(SendModal, {
+    onClick: handleOpen
+  }, locales.getText('pisell2.text.send-form-reminder')), /*#__PURE__*/React.createElement(SendModal, {
     refreshKey: (_state$client7 = state.client) === null || _state$client7 === void 0 || (_state$client7 = _state$client7.value) === null || _state$client7 === void 0 ? void 0 : _state$client7.id,
     open: open,
     onCancel: function onCancel() {

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

@@ -1 +1,10 @@
-export declare const Provider: any, Context: any;
+/// <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;
+}>;

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

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

package/es/components/booking/info/service/addService/utils.d.ts

@@ -6,7 +6,7 @@ export declare const getDurationProps: ({ cacheItem, useStartTime, currentResour
         type: string;
         value: number;
     };
-    locale: any;
+    locale: string;
     slice: any;
     selectProps: {
         size: string;

package/es/components/booking/info2/cartClientCard/index.js

@@ -29,6 +29,7 @@ import useTranslationOriginal from "../../../../hooks/useTranslationOriginal";
 import useEngineContext from "../../../../hooks/useEngineContext";
 import { Context } from "../../info/model";
 import "./index.less";
+import { useIsActive } from "../../../ticketBooking/context/IsActiveContext";
 
 // 导出类型
 
@@ -60,6 +61,7 @@ var CartClientCard = /*#__PURE__*/forwardRef(function (_ref, ref) {
     keyword = _useState8[0],
     setKeyword = _useState8[1];
   var keywordRef = useRef('');
+  var isActive = useIsActive();
   keywordRef.current = keyword;
   var Toast = useToast();
   var _useScanCustomer = useScanCustomer(),
@@ -315,13 +317,15 @@ var CartClientCard = /*#__PURE__*/forwardRef(function (_ref, ref) {
     setPendingCustomer(null);
   };
   useMemo(function () {
-    setHandleSetClient(handleSetClient);
-  }, []);
+    if (isActive) {
+      setHandleSetClient(handleSetClient);
+    }
+  }, [isActive]);
   useEffect(function () {
     return function () {
       setHandleSetClient(null);
     };
-  }, []);
+  }, [isActive]);
   var tags = useMemo(function () {
     var _latest_wallet_detail;
     if (!selectedCustomer) return;

package/es/components/booking/info2/service/addService/utils.d.ts

@@ -7,7 +7,7 @@ export declare const getDurationProps: ({ cacheItem, useStartTime, currentResour
         type: string;
         value: number;
     };
-    locale: any;
+    locale: string;
     slice: any;
     selectProps: {
         size: string;

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 export interface FormState {
     amountSymbol: string;
     apis: {
@@ -105,4 +106,11 @@ export declare const walkInData: {
     id: number;
     nickname: string;
 };
-export declare const Provider: any, Context: any;
+export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
+    state: FormState;
+} & {
+    dispatch: (params: {
+        type: string;
+        payload: any;
+    }) => void;
+}>;

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

@@ -1 +1,10 @@
-export declare const Provider: any, Context: any;
+/// <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;
+}>;

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

@@ -1 +1,10 @@
-export declare const Provider: any, Context: any;
+/// <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;
+}>;

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

@@ -165,10 +165,10 @@ export declare const getProductTotalPrice: (item: any) => number;
 export declare const getDuration: (duration: number | {
     type: string;
     value: number;
-}) => number | {
+}) => number | "flexible" | {
     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/checkout/PaymentModal.js

@@ -48,6 +48,7 @@ import usePaymentLogger from "./hooks/usePaymentLogger";
 import { Button } from 'antd';
 import usePrinter from "../../hooks/printer";
 import { DiscountKeyboard } from "../../pro/priceKeyboard";
+import { useActiveExecute } from "../ticketBooking/hooks/pisellos";
 
 // Checkout 模块的事件常量
 var CheckoutHooks = {
@@ -99,6 +100,8 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
     pisellosAllModule = utils.pisellosAllModule,
     interaction = utils.interaction;
   var Toast = useToast();
+  var _useActiveExecute = useActiveExecute(),
+    executeIfActive = _useActiveExecute.executeIfActive;
   // const paymentResultToast = usePaymentResultToast();
 
   var checkoutRef = useRef(null);
@@ -493,7 +496,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
       try {
         var core = checkoutModule.core;
         if (core.effects && typeof core.effects.on === 'function') {
-          var unsubscribe = core.effects.on(CheckoutHooks.OnStateAmountChanged, /*#__PURE__*/function () {
+          var unsubscribe = core.effects.on(CheckoutHooks.OnStateAmountChanged, executeIfActive( /*#__PURE__*/function () {
             var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(data) {
               var _Toast$success, _Toast$success2, items;
               return _regeneratorRuntime().wrap(function _callee4$(_context4) {
@@ -523,17 +526,17 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
             return function (_x4) {
               return _ref7.apply(this, arguments);
             };
-          }());
-          var amountChangedUnsubscribe = core.effects.on(CheckoutHooks.OnBalanceDueAmountChanged, function (data) {
+          }()));
+          var amountChangedUnsubscribe = core.effects.on(CheckoutHooks.OnBalanceDueAmountChanged, executeIfActive(function (data) {
             setBalanceDueAmount(data.newAmount);
             setBalanceDueTotalAmount(data.totalAmount || '0');
-          });
-          var orderSubmitStartUnsubscribe = core.effects.on(CheckoutHooks.OnOrderSubmitStart, function () {
+          }));
+          var orderSubmitStartUnsubscribe = core.effects.on(CheckoutHooks.OnOrderSubmitStart, executeIfActive(function () {
             var _Toast$loading;
             setSyncingLock(true);
             Toast === null || Toast === void 0 || (_Toast$loading = Toast.loading) === null || _Toast$loading === void 0 || _Toast$loading.call(Toast);
-          });
-          var orderSubmitEndUnsubscribe = core.effects.on(CheckoutHooks.OnOrderSubmitEnd, function (res) {
+          }));
+          var orderSubmitEndUnsubscribe = core.effects.on(CheckoutHooks.OnOrderSubmitEnd, executeIfActive(function (res) {
             setSyncingLock(false);
             if (res.success) {
               var _Toast$hide;
@@ -549,7 +552,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
                 Toast === null || Toast === void 0 || Toast.fail(locales.getText('pisell2.checkout.order-sync-failed') || 'Order sync failed');
               }
             }
-          });
+          }));
 
           // const orderSyncFailedUnsubscribe = core.effects.on(
           //   CheckoutHooks.OnOrderSyncFailed,
@@ -558,7 +561,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
           //     Toast?.fail(locales.getText('pisell2.checkout.order-sync-failed') || 'Order sync failed');
           //   }
           // );
-          var orderPaymentAddedUnsubscribe = core.effects.on(CheckoutHooks.OnOrderPaymentAdded, /*#__PURE__*/function () {
+          var orderPaymentAddedUnsubscribe = core.effects.on(CheckoutHooks.OnOrderPaymentAdded, executeIfActive( /*#__PURE__*/function () {
             var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(data) {
               var orderInfo, balanceDueAmount, autoCloseConfig, _paymentItems, _totalAmount, serviceChargeTotal, paymentMethodName, isCashPayment, _interaction$utils3, _interaction$utils3$p;
               return _regeneratorRuntime().wrap(function _callee5$(_context5) {
@@ -648,7 +651,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
             return function (_x5) {
               return _ref8.apply(this, arguments);
             };
-          }());
+          }()));
           return function () {
             if (unsubscribe && typeof unsubscribe === 'function') {
               unsubscribe();
@@ -1408,6 +1411,8 @@ var PaymentModal = function PaymentModal(_ref18) {
     _useState36 = _slicedToArray(_useState35, 2),
     currentEditOrderId = _useState36[0],
     _setCurrentEditOrderId = _useState36[1];
+  var _useActiveExecute2 = useActiveExecute(),
+    executeIfActive = _useActiveExecute2.executeIfActive;
   var Toast = useToast();
   var _usePrinter2 = usePrinter(),
     nativePrint = _usePrinter2.nativePrint;
@@ -2084,7 +2089,7 @@ var PaymentModal = function PaymentModal(_ref18) {
                 unsubscribeRef.current = undefined;
               }
               // 监听订单同步完成，同步完成后显示订单完成 toast，关闭当前弹窗
-              unsubscribeRef.current = checkout.core.effects.on('checkout:onOrderSynced', /*#__PURE__*/function () {
+              unsubscribeRef.current = checkout.core.effects.on('checkout:onOrderSynced', executeIfActive( /*#__PURE__*/function () {
                 var _ref29 = _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, paymentResult;
@@ -2230,7 +2235,7 @@ var PaymentModal = function PaymentModal(_ref18) {
                 return function (_x17) {
                   return _ref29.apply(this, arguments);
                 };
-              }());
+              }()));
               _context23.next = 42;
               break;
             case 25:

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

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

package/es/components/checkout/hooks/useWalletPass.d.ts

@@ -17,7 +17,7 @@ export declare const useWalletPass: (props: {
     cardData: any;
     handleSelectWallet: (value: number[]) => void;
     selectedWalletIds: any[];
-    expiredWalletIds: any;
+    expiredWalletIds: any[];
     expiredWalletData: any;
     disabledWalletData: any[];
     clearAllSelectedWallet: () => void;