@pisell/private-materials 6.4.59 → 6.4.60

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

@@ -32,8 +32,6 @@ 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", {
@@ -63,17 +61,13 @@ 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) {
@@ -94,7 +88,7 @@ var ActionButtons = function ActionButtons(_ref) {
 
   // 监听客户选择变化，清空手动折扣
   useEffect(function () {
-    if (!bookingTicket) return;
+    if (!pisellOS) return;
     var handleCustomerSelected = function handleCustomerSelected() {
       // 当客户选择改变时，清空 shop_discount
       dispatch({
@@ -104,16 +98,15 @@ var ActionButtons = function ActionButtons(_ref) {
         }
       });
     };
-    var wrappedHandleCustomerSelected = executeIfActive(handleCustomerSelected);
 
     // 监听客户选择事件
-    bookingTicket.effectsOn('onCustomerSelected', wrappedHandleCustomerSelected);
+    pisellOS.effects.on('bookingTicket:onCustomerSelected', handleCustomerSelected);
 
     // 清理函数
     return function () {
-      bookingTicket.effectsOff('onCustomerSelected', wrappedHandleCustomerSelected);
+      pisellOS.effects.off('bookingTicket:onCustomerSelected', handleCustomerSelected);
     };
-  }, [dispatch, bookingTicket]);
+  }, [dispatch, pisellOS]);
 
   // 同步获取金额计算所需配置
   var getDataFromHost = function getDataFromHost() {
@@ -229,14 +222,13 @@ 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 || !shopDiscount) return;
+    if (!pisellos) return;
     var onDiscountListChange = function onDiscountListChange(discount) {
       setDiscountList(discount);
     };
-    var wrappedHandler = executeIfActive(onDiscountListChange);
-    shopDiscount.effectsOn('onDiscountListChange', wrappedHandler);
+    pisellos.effects.on('shopDiscount:onDiscountListChange', onDiscountListChange);
     return function () {
-      shopDiscount.effectsOff('onDiscountListChange', wrappedHandler);
+      pisellos.effects.off('shopDiscount:onDiscountListChange', onDiscountListChange);
     };
   }, [(_context$appHelper3 = context.appHelper) === null || _context$appHelper3 === void 0 ? void 0 : _context$appHelper3.utils]);
 

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 /**
  * @title: 底部

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 { useShopDiscountModule } from "../../../ticketBooking/hooks/pisellos/useShopDiscountModule";
+import { useShopDiscount } from "../../../appointmentBooking/hooks";
 
 /**
  * @title: 底部
@@ -1734,7 +1734,7 @@ var Footer = function Footer(props) {
       changeCustomerToGlobalState: changeCustomerToGlobalState
     }),
     selectCustomer = _useCustomer.selectCustomer;
-  var shopDiscount = useShopDiscountModule();
+  var shopDiscount = useShopDiscount();
   var _useScanManager2 = useScanManager(),
     clearAllScanListenersTaskQueue = _useScanManager2.clearAllScanListenersTaskQueue;
   // 清空所有内容并重置购物车

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

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

@@ -248,4 +248,4 @@ export declare const updateAppointmentServicePrice: (state: any, { start_date, e
  * @Author: WangHan
  * @Date: 2024-12-24 11:32
  */
-export declare const updateServicePrice: (state: any) => Promise<any> | never[];
+export declare const updateServicePrice: (state: any) => never[] | Promise<any>;

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

@@ -29,7 +29,6 @@ import useTranslationOriginal from "../../../../hooks/useTranslationOriginal";
 import useEngineContext from "../../../../hooks/useEngineContext";
 import { Context } from "../../info/model";
 import "./index.less";
-import { useIsActive } from "../../../ticketBooking/context/IsActiveContext";
 
 // 导出类型
 
@@ -61,7 +60,6 @@ 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(),
@@ -317,15 +315,13 @@ var CartClientCard = /*#__PURE__*/forwardRef(function (_ref, ref) {
     setPendingCustomer(null);
   };
   useMemo(function () {
-    if (isActive) {
-      setHandleSetClient(handleSetClient);
-    }
-  }, [isActive]);
+    setHandleSetClient(handleSetClient);
+  }, []);
   useEffect(function () {
     return function () {
       setHandleSetClient(null);
     };
-  }, [isActive]);
+  }, []);
   var tags = useMemo(function () {
     var _latest_wallet_detail;
     if (!selectedCustomer) return;

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

@@ -47,7 +47,6 @@ 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 = {
@@ -99,8 +98,6 @@ 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);
@@ -500,7 +497,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, executeIfActive( /*#__PURE__*/function () {
+          var unsubscribe = core.effects.on(CheckoutHooks.OnStateAmountChanged, /*#__PURE__*/function () {
             var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(data) {
               var _Toast$success, _Toast$success2, items;
               return _regeneratorRuntime().wrap(function _callee4$(_context4) {
@@ -530,17 +527,17 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
             return function (_x4) {
               return _ref7.apply(this, arguments);
             };
-          }()));
-          var amountChangedUnsubscribe = core.effects.on(CheckoutHooks.OnBalanceDueAmountChanged, executeIfActive(function (data) {
+          }());
+          var amountChangedUnsubscribe = core.effects.on(CheckoutHooks.OnBalanceDueAmountChanged, function (data) {
             setBalanceDueAmount(data.newAmount);
             setBalanceDueTotalAmount(data.totalAmount || '0');
-          }));
-          var orderSubmitStartUnsubscribe = core.effects.on(CheckoutHooks.OnOrderSubmitStart, executeIfActive(function () {
+          });
+          var orderSubmitStartUnsubscribe = core.effects.on(CheckoutHooks.OnOrderSubmitStart, function () {
             var _Toast$loading2;
             setSyncingLock(true);
             Toast === null || Toast === void 0 || (_Toast$loading2 = Toast.loading) === null || _Toast$loading2 === void 0 || _Toast$loading2.call(Toast, '', 0);
-          }));
-          var orderSubmitEndUnsubscribe = core.effects.on(CheckoutHooks.OnOrderSubmitEnd, executeIfActive(function (res) {
+          });
+          var orderSubmitEndUnsubscribe = core.effects.on(CheckoutHooks.OnOrderSubmitEnd, function (res) {
             setSyncingLock(false);
             if (res.success) {
               var _Toast$hide;
@@ -556,7 +553,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,
@@ -565,7 +562,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, executeIfActive( /*#__PURE__*/function () {
+          var orderPaymentAddedUnsubscribe = core.effects.on(CheckoutHooks.OnOrderPaymentAdded, /*#__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) {
@@ -655,7 +652,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
             return function (_x5) {
               return _ref8.apply(this, arguments);
             };
-          }()));
+          }());
           return function () {
             if (unsubscribe && typeof unsubscribe === 'function') {
               unsubscribe();
@@ -1414,8 +1411,6 @@ var PaymentModal = function PaymentModal(_ref18) {
     _useState36 = _slicedToArray(_useState35, 2),
     currentEditOrderId = _useState36[0],
     _setCurrentEditOrderId = _useState36[1];
-  var _useActiveExecute2 = useActiveExecute(),
-    executeIfActive = _useActiveExecute2.executeIfActive;
   var Toast = useToast();
 
   // 重试处理函数（逻辑由用户自己实现）
@@ -2090,7 +2085,7 @@ var PaymentModal = function PaymentModal(_ref18) {
                 unsubscribeRef.current = undefined;
               }
               // 监听订单同步完成，同步完成后显示订单完成 toast，关闭当前弹窗
-              unsubscribeRef.current = checkout.core.effects.on('checkout:onOrderSynced', executeIfActive( /*#__PURE__*/function () {
+              unsubscribeRef.current = checkout.core.effects.on('checkout:onOrderSynced', /*#__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;
@@ -2235,7 +2230,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.js

@@ -27,8 +27,6 @@ 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功能
@@ -38,8 +36,6 @@ export var useWalletPass = function useWalletPass(props) {
     customAmount = props.customAmount,
     clientId = props.clientId;
   var logger = usePaymentLogger();
-  var _useActiveExecute = useActiveExecute(),
-    executeIfActive = _useActiveExecute.executeIfActive;
 
   // 钱包推荐列表
   var _useState = useState([]),
@@ -118,7 +114,7 @@ export var useWalletPass = function useWalletPass(props) {
 
   // 获取checkout模块
   var checkoutModule = pisellos.getModule('checkout');
-  var shopDiscount = useShopDiscountModule();
+  var shopDiscount = pisellos.getModule('shopDiscount');
   var paymentModule = checkoutModule === null || checkoutModule === void 0 ? void 0 : checkoutModule.payment;
   var setWalletSelect = useMemoizedFn(function (data) {
     setSelectedWallet(data);
@@ -519,41 +515,30 @@ 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);
     // 注册事件监听器
-    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);
+    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);
 
     // 清理事件监听器
     return function () {
-      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);
+      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]);
 

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

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

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

@@ -15,7 +15,7 @@ export declare const useStoreRef: <T extends {
     readonly numRef: React.MutableRefObject<string | number | undefined>;
     readonly orderIdRef: React.MutableRefObject<string | number>;
     readonly modeRef: React.MutableRefObject<ModeEnum>;
-    readonly statusRef: React.MutableRefObject<"success" | "loading" | "warn" | "fail" | "pedding" | "resove" | "reject" | "question">;
+    readonly statusRef: React.MutableRefObject<"loading" | "success" | "warn" | "fail" | "pedding" | "resove" | "reject" | "question">;
     readonly netRef: React.MutableRefObject<boolean | undefined>;
     readonly symbolRef: React.MutableRefObject<string>;
     readonly amountRef: React.MutableRefObject<string | number>;

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

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const Linkly: ({ api, onChange }: any) => JSX.Element;
 export default Linkly;

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

@@ -174,7 +174,7 @@ export declare const updateCustom: (payload: {
 export declare const updateStatus: (status: 'loading' | 'warn' | 'fail' | 'success' | 'question') => {
     type: EActionTypes;
     payload: {
-        status: "success" | "loading" | "warn" | "fail" | "question";
+        status: "loading" | "success" | "warn" | "fail" | "question";
     };
 };
 /**
@@ -295,10 +295,10 @@ export declare const backUpFree: (payload: Partial<State>) => {
         name?: string | undefined;
         symbol?: string | undefined;
         amount?: string | number | undefined;
-        mode?: "pay" | "fullPay" | "refund" | "query" | undefined;
+        mode?: "refund" | "pay" | "fullPay" | "query" | undefined;
         order_id?: string | number | undefined;
         eftpos?: "payo" | "tyro" | "windcave" | "stripe" | "linkly" | undefined;
-        action?: "amount" | "pay" | "deviceList" | undefined;
+        action?: "pay" | "amount" | "deviceList" | undefined;
         key?: number | undefined;
         step?: number | undefined;
         title?: string | undefined;
@@ -308,7 +308,7 @@ export declare const backUpFree: (payload: Partial<State>) => {
         net?: boolean | undefined;
         component?: string | undefined;
         form?: string | undefined;
-        status?: "success" | "loading" | "warn" | "fail" | "pedding" | "resove" | "reject" | "question" | undefined;
+        status?: "loading" | "success" | "warn" | "fail" | "pedding" | "resove" | "reject" | "question" | undefined;
         warn?: string | undefined;
         steps?: {
             /** 用于重置当前步骤 */

package/es/components/pay/toB/store/hooks.js

@@ -2,11 +2,10 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
-import React, { useRef } from 'react';
+import React from 'react';
 import { ToBPayContext } from "./index";
 import { usePisellOS } from "../../../../hooks/useEngineContext";
 import { handlePayMethodList } from "./utils";
-import { useActiveExecute } from "../../../ticketBooking/hooks/pisellos";
 
 /**
  * 使用商家端支付的Hook
@@ -33,28 +32,15 @@ export var useOSPaymentEffect = function useOSPaymentEffect() {
   var _useToBPay = useToBPay(),
     setOrder = _useToBPay.setOrder,
     setPayMethodGroupList = _useToBPay.setPayMethodGroupList;
-  var _useActiveExecute = useActiveExecute(),
-    executeIfActive = _useActiveExecute.executeIfActive;
-  var unlisten1 = useRef(null);
-  var unlisten2 = useRef(null);
   var osPaymentEffectOn = function osPaymentEffectOn() {
-    var wrappedOnPaymentMethodsChanged = executeIfActive(onPaymentMethodsChanged);
-    var wrappedOnOrderChanged = executeIfActive(onOrderChanged);
-
     // 监听OS的支付方式列表变化
-    unlisten1.current = pisellOS.effects.on('payment:onPaymentMethodsChanged', wrappedOnPaymentMethodsChanged);
+    pisellOS.effects.on('payment:onPaymentMethodsChanged', onPaymentMethodsChanged);
     // 监听OS的订单信息变化，包括订单、支付项发生改变、删除、修改信息等操作
-    unlisten2.current = pisellOS.effects.on('payment:onOrderChanged', wrappedOnOrderChanged);
+    pisellOS.effects.on('payment:onOrderChanged', onOrderChanged);
   };
   var osPaymentEffectOff = function osPaymentEffectOff() {
-    if (unlisten1.current) {
-      var _unlisten1$current;
-      (_unlisten1$current = unlisten1.current) === null || _unlisten1$current === void 0 || _unlisten1$current.call(unlisten1);
-    }
-    if (unlisten2.current) {
-      var _unlisten2$current;
-      (_unlisten2$current = unlisten2.current) === null || _unlisten2$current === void 0 || _unlisten2$current.call(unlisten2);
-    }
+    pisellOS.effects.off('payment:onPaymentMethodsChanged', onPaymentMethodsChanged);
+    pisellOS.effects.off('payment:onOrderChanged', onOrderChanged);
   };
   var onPaymentMethodsChanged = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(res) {

package/es/components/ticketBooking/components/addServiceVariant/addService.d.ts

@@ -1,29 +1,9 @@
-import { ProductDisplayConfig, ProductDisplayPresetKey } from '../ProductDisplayAdapter';
 import './index.less';
 interface AddServiceProps {
     onEdit?: any;
     dispatch?: any;
     state?: any;
     renderMode?: 'current' | 'drawer';
-    /**
-     * 产品展示配置
-     *
-     * 支持两种方式：
-     * 1. 简易模式：传入预设字符串，如 'product-select', 'sku-list-a1', 'sku-list-a2', 'sku-list-a5'
-     * 2. 完整配置模式：传入完整的配置对象
-     *
-     * @example
-     * // 简易模式
-     * <AddService productDisplayConfig="sku-list-a1" />
-     *
-     * @example
-     * // 完整配置模式
-     * <AddService productDisplayConfig={{
-     *   displayMode: 'sku-list',
-     *   skuListConfig: { ... }
-     * }} />
-     */
-    productDisplayConfig?: ProductDisplayPresetKey | ProductDisplayConfig;
 }
 declare const AddSerivce: (props: AddServiceProps) => JSX.Element | null;
 export default AddSerivce;