@pisell/private-materials 6.4.56 → 6.4.58

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

@@ -32,6 +32,8 @@ import { useMemoizedFn } from 'ahooks';
 import useEngineContext, { usePisellOS } from "../../../../hooks/useEngineContext";
 import useScanManager from "../../../ticketBooking/hooks/pisellos/useScanManager";
 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", {
@@ -61,13 +63,17 @@ var ActionButtons = function ActionButtons(_ref) {
     _useState8 = _slicedToArray(_useState7, 2),
     showVoucherModal = _useState8[0],
     setShowVoucherModal = _useState8[1];
+  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) {
@@ -88,7 +94,7 @@ var ActionButtons = function ActionButtons(_ref) {
 
   // 监听客户选择变化，清空手动折扣
   useEffect(function () {
-    if (!pisellOS) return;
+    if (!bookingTicket) return;
     var handleCustomerSelected = function handleCustomerSelected() {
       // 当客户选择改变时，清空 shop_discount
       dispatch({
@@ -98,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() {
@@ -222,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/amount.js

@@ -285,7 +285,7 @@ var getTax = function getTax(state, options) {
   if (!isEdit) {
     var _state$bookingDetail2;
     return {
-      tax: Number((_state$bookingDetail2 = state.bookingDetail) === null || _state$bookingDetail2 === void 0 ? void 0 : _state$bookingDetail2.tax_fee)
+      tax: Number((_state$bookingDetail2 = state.bookingDetail) === null || _state$bookingDetail2 === void 0 ? void 0 : _state$bookingDetail2.tax_fee) || 0
     };
   }
   var totalOriginTax = new Decimal(0);

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/footer/utils.js

@@ -15,6 +15,7 @@ import { isArr, locales, sendWarningLog, getUniqueId } from '@pisell/utils';
 import { PisellToast } from "@pisell/materials";
 import { getClientName } from "../../../../plus/clientName/utils";
 import { cloneDeep } from 'lodash';
+import Decimal from 'decimal.js';
 var formatNote = function formatNote(data) {
   var _data$notes;
   return ((_data$notes = data.notes) === null || _data$notes === void 0 ? void 0 : _data$notes.orderNote) || "";
@@ -100,6 +101,10 @@ export var formatProductBundle = function formatProductBundle(bundle) {
     }
   } catch (error) {}
   return bundle.map(function (d) {
+    var option = formatProductOption(d.option);
+    var option_price = option.reduce(function (temp, item) {
+      return temp + Number(item.num) * item.custom_add_price;
+    }, 0);
     return {
       "bundle_group_id": d.group_id,
       "bundle_id": d.id,
@@ -112,9 +117,9 @@ export var formatProductBundle = function formatProductBundle(bundle) {
       // checkout 2.0 新增
       "price_type": d === null || d === void 0 ? void 0 : d.price_type,
       // checkout 2.0 新增
-      "custom_price": d === null || d === void 0 ? void 0 : d.price,
+      "custom_price": new Decimal(d === null || d === void 0 ? void 0 : d.price).sub(option_price).toNumber().toFixed(2),
       "custom_price_type": d === null || d === void 0 ? void 0 : d.price_type,
-      "option": formatProductOption(d.option)
+      "option": option
     };
   });
 };

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/sendModal/useSendModal.d.ts

@@ -4,6 +4,6 @@ declare const useSendModal: (bookingId?: number) => {
     setOpen: import("react").Dispatch<import("react").SetStateAction<boolean>>;
     handleOpen: () => void;
     handleValuesChange: (val: any) => void;
-    handleOk: (values: SendModalValues) => Promise<boolean | undefined>;
+    handleOk: (values: SendModalValues) => Promise<any>;
 };
 export default useSendModal;

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/checkout/PaymentModal.js

@@ -47,6 +47,7 @@ import { getShopWalletPassId, reorderPaymentMethodList } from "./utils";
 import usePaymentLogger from "./hooks/usePaymentLogger";
 import { Button } from 'antd';
 import { DiscountKeyboard } from "../../pro/priceKeyboard";
+import { useActiveExecute } from "../ticketBooking/hooks/pisellos";
 
 // Checkout 模块的事件常量
 var CheckoutHooks = {
@@ -98,6 +99,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);
@@ -491,7 +494,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) {
@@ -521,17 +524,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$loading2;
             setSyncingLock(true);
             Toast === null || Toast === void 0 || (_Toast$loading2 = Toast.loading) === null || _Toast$loading2 === void 0 || _Toast$loading2.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;
@@ -547,7 +550,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,
@@ -556,7 +559,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) {
@@ -646,7 +649,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
             return function (_x5) {
               return _ref8.apply(this, arguments);
             };
-          }());
+          }()));
           return function () {
             if (unsubscribe && typeof unsubscribe === 'function') {
               unsubscribe();
@@ -1405,6 +1408,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();
 
   // 重试处理函数（逻辑由用户自己实现）
@@ -2079,7 +2084,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;
@@ -2224,7 +2229,7 @@ var PaymentModal = function PaymentModal(_ref18) {
                 return function (_x17) {
                   return _ref29.apply(this, arguments);
                 };
-              }());
+              }()));
               _context23.next = 42;
               break;
             case 25:

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;

package/es/components/checkout/hooks/useWalletPass.js

@@ -27,6 +27,8 @@ import { usePisellOS } from "../../../hooks/useEngineContext";
 import { formatDiscountWalletData, formatMachineCodeServer2CardList, isSameContent } from "../components/WalletPassModule/utils";
 import usePaymentLogger from "./usePaymentLogger";
 import { isWalkIn } from "../../booking/utils";
+import { useActiveExecute } from "../../ticketBooking/hooks/pisellos";
+import { useShopDiscountModule } from "../../ticketBooking/hooks/pisellos/useShopDiscountModule";
 
 /**
  * 自定义Hook：使用WalletPass功能
@@ -36,6 +38,8 @@ export var useWalletPass = function useWalletPass(props) {
     customAmount = props.customAmount,
     clientId = props.clientId;
   var logger = usePaymentLogger();
+  var _useActiveExecute = useActiveExecute(),
+    executeIfActive = _useActiveExecute.executeIfActive;
 
   // 钱包推荐列表
   var _useState = useState([]),
@@ -114,7 +118,7 @@ export var useWalletPass = function useWalletPass(props) {
 
   // 获取checkout模块
   var checkoutModule = pisellos.getModule('checkout');
-  var shopDiscount = pisellos.getModule('shopDiscount');
+  var shopDiscount = useShopDiscountModule();
   var paymentModule = checkoutModule === null || checkoutModule === void 0 ? void 0 : checkoutModule.payment;
   var setWalletSelect = useMemoizedFn(function (data) {
     setSelectedWallet(data);
@@ -515,30 +519,41 @@ export var useWalletPass = function useWalletPass(props) {
     if (!paymentModule) return;
     var core = pisellos; // 获取core实例
 
+    // checkout 单实例，执行时判断是否active
+    var wrappedHandlePaymentStarted = executeIfActive(handlePaymentStarted);
+    var wrappedOnOrderCreated = executeIfActive(onOrderCreated);
+    var wrappedHandleWalletRecommendListUpdated = executeIfActive(handleWalletRecommendListUpdated);
+    var wrappedHandleUserIdentificationCodesUpdated = executeIfActive(handleUserIdentificationCodesUpdated);
+    var wrappedHandleWalletCacheCleared = executeIfActive(handleWalletCacheCleared);
+    var wrappedHandleSearchIdentificationCodeCompleted = executeIfActive(handleSearchIdentificationCodeCompleted);
+    var wrappedHandleWalletInitializationStarted = executeIfActive(handleWalletInitializationStarted);
+    var wrappedHandleWalletInitializationCompleted = executeIfActive(handleWalletInitializationCompleted);
+    var wrappedHandleWalletInitializationFailed = executeIfActive(handleWalletInitializationFailed);
     // 注册事件监听器
-    core.effects.on('wallet:onWalletRecommendListUpdated', handleWalletRecommendListUpdated);
-    core.effects.on('checkout:onPaymentStarted', handlePaymentStarted);
-    core.effects.on('checkout:onPaymentItemAdded', handlePaymentStarted);
-    core.effects.on('wallet:onUserIdentificationCodesUpdated', handleUserIdentificationCodesUpdated);
-    core.effects.on('wallet:onWalletCacheCleared', handleWalletCacheCleared);
-    core.effects.on('wallet:onSearchIdentificationCodeCompleted', handleSearchIdentificationCodeCompleted);
-    core.effects.on('checkout:onWalletDataInitialized', onOrderCreated);
-    core.effects.on('wallet:onWalletInitializationStarted', handleWalletInitializationStarted);
-    core.effects.on('wallet:onWalletInitializationCompleted', handleWalletInitializationCompleted);
-    core.effects.on('wallet:onWalletInitializationFailed', handleWalletInitializationFailed);
+    paymentModule.effectsOn('onWalletRecommendListUpdated', wrappedHandleWalletRecommendListUpdated);
+    // checkout 单实例，执行时判断是否active
+    checkoutModule.effectsOn('onPaymentStarted', wrappedHandlePaymentStarted);
+    checkoutModule.effectsOn('onPaymentItemAdded', wrappedHandlePaymentStarted);
+    paymentModule.effectsOn('onUserIdentificationCodesUpdated', wrappedHandleUserIdentificationCodesUpdated);
+    paymentModule.effectsOn('onWalletCacheCleared', wrappedHandleWalletCacheCleared);
+    paymentModule.effectsOn('onSearchIdentificationCodeCompleted', wrappedHandleSearchIdentificationCodeCompleted);
+    checkoutModule.effectsOn('onWalletDataInitialized', wrappedOnOrderCreated);
+    paymentModule.effectsOn('onWalletInitializationStarted', wrappedHandleWalletInitializationStarted);
+    paymentModule.effectsOn('onWalletInitializationCompleted', wrappedHandleWalletInitializationCompleted);
+    paymentModule.effectsOn('onWalletInitializationFailed', wrappedHandleWalletInitializationFailed);
 
     // 清理事件监听器
     return function () {
-      core.effects.off('wallet:onWalletRecommendListUpdated', handleWalletRecommendListUpdated);
-      core.effects.off('checkout:onPaymentStarted', handlePaymentStarted);
-      core.effects.off('checkout:onPaymentItemAdded', handlePaymentStarted);
-      core.effects.off('wallet:onUserIdentificationCodesUpdated', handleUserIdentificationCodesUpdated);
-      core.effects.off('wallet:onWalletCacheCleared', handleWalletCacheCleared);
-      core.effects.off('wallet:onSearchIdentificationCodeCompleted', handleSearchIdentificationCodeCompleted);
-      core.effects.off('checkout:onWalletDataInitialized', onOrderCreated);
-      core.effects.off('wallet:onWalletInitializationStarted', handleWalletInitializationStarted);
-      core.effects.off('wallet:onWalletInitializationCompleted', handleWalletInitializationCompleted);
-      core.effects.off('wallet:onWalletInitializationFailed', handleWalletInitializationFailed);
+      paymentModule.effectsOff('onWalletRecommendListUpdated', wrappedHandleWalletRecommendListUpdated);
+      checkoutModule.effectsOff('onPaymentStarted', wrappedHandlePaymentStarted);
+      checkoutModule.effectsOff('onPaymentItemAdded', wrappedHandlePaymentStarted);
+      paymentModule.effectsOff('onUserIdentificationCodesUpdated', wrappedHandleUserIdentificationCodesUpdated);
+      paymentModule.effectsOff('onWalletCacheCleared', wrappedHandleWalletCacheCleared);
+      paymentModule.effectsOff('onSearchIdentificationCodeCompleted', wrappedHandleSearchIdentificationCodeCompleted);
+      checkoutModule.effectsOff('onWalletDataInitialized', wrappedOnOrderCreated);
+      paymentModule.effectsOff('onWalletInitializationStarted', wrappedHandleWalletInitializationStarted);
+      paymentModule.effectsOff('onWalletInitializationCompleted', wrappedHandleWalletInitializationCompleted);
+      paymentModule.effectsOff('onWalletInitializationFailed', wrappedHandleWalletInitializationFailed);
     };
   }, [paymentModule]);
 

package/es/components/eftposPay/amount.d.ts

@@ -8,7 +8,7 @@ import { PosProps } from './const';
  */
 declare const _default: ({ className, onChange, onClose, formatAmount, isMobile, net, client }: {
     className?: string | undefined;
-    onChange?: ((status: "success" | "page" | "print" | "fail" | "mark_tx_processed", params?: string | {
+    onChange?: ((status: "success" | "page" | "fail" | "print" | "mark_tx_processed", params?: string | {
         [keys: string]: unknown;
     } | undefined, other?: any) => void) | undefined;
     onClose: () => void;

package/es/components/eftposPay/device.d.ts

@@ -11,7 +11,7 @@ import './device.less';
 declare const _default: ({ api, onChange, onClose, className, device_number, isMobile, net, client, formatAmount, containerStyle, }: {
     api: PayProps['api'];
     className?: string | undefined;
-    onChange?: ((status: "success" | "page" | "print" | "fail" | "mark_tx_processed", params?: string | {
+    onChange?: ((status: "success" | "page" | "fail" | "print" | "mark_tx_processed", params?: string | {
         [keys: string]: unknown;
     } | undefined, other?: any) => void) | undefined;
     onClose: () => void;

package/es/components/eftposPay/hooks.d.ts

@@ -19,7 +19,7 @@ export declare const useStoreRef: <T extends {
     readonly netRef: React.MutableRefObject<boolean | undefined>;
     readonly symbolRef: React.MutableRefObject<string>;
     readonly amountRef: React.MutableRefObject<string | number>;
-    readonly eftposRef: React.MutableRefObject<"payo" | "tyro" | "windcave" | "stripe" | "linkly">;
+    readonly eftposRef: React.MutableRefObject<"stripe" | "payo" | "tyro" | "windcave" | "linkly">;
     readonly clientRef: React.MutableRefObject<ClientEnum>;
     readonly dataRef: React.MutableRefObject<import("./store").State>;
 };

package/es/components/eftposPay/store/index.d.ts

@@ -295,15 +295,15 @@ export declare const backUpFree: (payload: Partial<State>) => {
         name?: string | undefined;
         symbol?: string | undefined;
         amount?: string | number | undefined;
-        mode?: "refund" | "pay" | "fullPay" | "query" | undefined;
+        mode?: "pay" | "refund" | "fullPay" | "query" | undefined;
         order_id?: string | number | undefined;
-        eftpos?: "payo" | "tyro" | "windcave" | "stripe" | "linkly" | undefined;
+        eftpos?: "stripe" | "payo" | "tyro" | "windcave" | "linkly" | undefined;
         action?: "amount" | "pay" | "deviceList" | undefined;
         key?: number | undefined;
         step?: number | undefined;
         title?: string | undefined;
         subTitle?: string | undefined;
-        type?: "step" | "unset" | undefined;
+        type?: "unset" | "step" | undefined;
         render?: boolean | undefined;
         net?: boolean | undefined;
         component?: string | undefined;

package/es/components/list/List.d.ts

@@ -0,0 +1,5 @@
+import React from 'react';
+import './List.less';
+import { ListProps, BaseListItem } from './types';
+declare const List: <TItem extends BaseListItem = BaseListItem>(props: ListProps<TItem>) => React.ReactElement;
+export default List;