@pisell/private-materials 6.4.55 → 6.4.57

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

@@ -60,7 +60,7 @@ var import_materials = require("@pisell/materials");
 var import_useCustomer = require("../../../ticketBooking/hooks/pisellos/useCustomer");
 var import_ahooks = require("ahooks");
 var import_lodash = require("lodash");
-var import_hooks = require("../../../appointmentBooking/hooks");
+var import_useShopDiscountModule = require("../../../ticketBooking/hooks/pisellos/useShopDiscountModule");
 var Footer = (props) => {
   var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p;
   const { state, buttons, dispatch, source } = props;
@@ -1252,7 +1252,7 @@ var Footer = (props) => {
   const { selectCustomer } = (0, import_useCustomer.useCustomer)({
     changeCustomerToGlobalState
   });
-  const shopDiscount = (0, import_hooks.useShopDiscount)();
+  const shopDiscount = (0, import_useShopDiscountModule.useShopDiscountModule)();
   const { clearAllScanListenersTaskQueue } = (0, import_useScanManager.default)();
   const handleClearAllAndReset = () => {
     var _a2;

package/lib/components/booking/components/footer/utils.js

@@ -49,6 +49,7 @@ var import_utils5 = require("@pisell/utils");
 var import_materials = require("@pisell/materials");
 var import_utils6 = require("../../../../plus/clientName/utils");
 var import_lodash = require("lodash");
+var import_decimal = __toESM(require("decimal.js"));
 var formatNote = (data) => {
   var _a;
   return ((_a = data.notes) == null ? void 0 : _a.orderNote) || "";
@@ -101,6 +102,10 @@ var formatProductBundle = (bundle) => {
   } catch (error) {
   }
   return bundle.map((d) => {
+    const option = formatProductOption(d.option);
+    const option_price = option.reduce((temp, item) => {
+      return temp + Number(item.num) * item.custom_add_price;
+    }, 0);
     return {
       "bundle_group_id": d.group_id,
       "bundle_id": d.id,
@@ -113,7 +118,9 @@ var formatProductBundle = (bundle) => {
       // checkout 2.0 新增
       "price_type": d == null ? void 0 : d.price_type,
       // checkout 2.0 新增
-      "option": formatProductOption(d.option)
+      "custom_price": new import_decimal.default(d == null ? void 0 : d.price).sub(option_price).toNumber().toFixed(2),
+      "custom_price_type": d == null ? void 0 : d.price_type,
+      "option": option
     };
   });
 };

package/lib/components/booking/components/reloadResourceModal/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 interface IProps {
     modal: any;

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

@@ -45,16 +45,7 @@ var import_ahooks = require("ahooks");
 var import_utils2 = require("./utils");
 var import_pisellos = require("../../../ticketBooking/hooks/pisellos");
 var import_utils3 = require("../../info/clientVariant/utils");
-var ShopDiscountHooks = {
-  onInited: "shopDiscount:onInited",
-  onDestroy: "shopDiscount:onDestroy",
-  onLoadDiscountList: "shopDiscount:onLoadDiscountList",
-  onCustomerChange: "shopDiscount:onCustomerChange",
-  onScanCustomerChange: "shopDiscount:onScanCustomerChange",
-  onDiscountListChange: "shopDiscount:onDiscountListChange",
-  onRulesListChange: "shopDiscount:onRulesListChange",
-  onLoadPrepareCalcResult: "shopDiscount:onLoadPrepareCalcResult"
-};
+var import_useShopDiscountModule = require("../../../ticketBooking/hooks/pisellos/useShopDiscountModule");
 var services = {};
 var VoucherCard = (props) => {
   var _a, _b, _c, _d;
@@ -67,7 +58,8 @@ var VoucherCard = (props) => {
   const serviceValueRef = (0, import_react.useRef)(state.service.value);
   const addonsValueRef = (0, import_react.useRef)(state.addons.value);
   const isBooking4Shop = (0, import_useIsBooking4Shop.useIsBooking4Shop)(state);
-  const shopDiscount = pisellos.getModule("shopDiscount");
+  const shopDiscount = (0, import_useShopDiscountModule.useShopDiscountModule)();
+  const { executeIfActive } = (0, import_pisellos.useActiveExecute)();
   services = state.service;
   const changeCustomerToGlobalState = (0, import_ahooks.useMemoizedFn)((value) => {
     dispatch({
@@ -93,7 +85,7 @@ var VoucherCard = (props) => {
     }
   );
   (0, import_react.useEffect)(() => {
-    if (isBooking4Shop) {
+    if (isBooking4Shop && shopDiscount) {
       shopDiscount.setProductList([
         ...state.service.value,
         ...state.addons.value
@@ -123,9 +115,10 @@ var VoucherCard = (props) => {
     onScanCode(e.detail.code);
   });
   (0, import_react.useEffect)(() => {
-    window.addEventListener("onScanWallPassCode", onScanWallPassCode);
+    const wrappedOnScanWallPassCode = executeIfActive(onScanWallPassCode);
+    window.addEventListener("onScanWallPassCode", wrappedOnScanWallPassCode);
     return () => {
-      window.removeEventListener("onScanWallPassCode", onScanWallPassCode);
+      window.removeEventListener("onScanWallPassCode", wrappedOnScanWallPassCode);
     };
   }, []);
   const addonsMemo = (0, import_react.useMemo)(() => {
@@ -176,14 +169,13 @@ var VoucherCard = (props) => {
     run();
   }, [JSON.stringify(serviceMemo), JSON.stringify(addonsMemo), isBooking4Shop]);
   (0, import_react.useEffect)(() => {
-    var _a2;
-    if (pisellos) {
-      (_a2 = pisellos == null ? void 0 : pisellos.effects) == null ? void 0 : _a2.on("shopDiscount:onSelectedDiscountListChange", fn);
+    if (shopDiscount) {
+      const wrappedHandler = executeIfActive(fn);
+      shopDiscount == null ? void 0 : shopDiscount.effectsOn("onSelectedDiscountListChange", wrappedHandler);
       return () => {
-        var _a3;
-        (_a3 = pisellos == null ? void 0 : pisellos.effects) == null ? void 0 : _a3.off(
-          "shopDiscount:onSelectedDiscountListChange",
-          fn
+        shopDiscount == null ? void 0 : shopDiscount.effectsOff(
+          "onSelectedDiscountListChange",
+          wrappedHandler
         );
       };
     }
@@ -196,7 +188,7 @@ var VoucherCard = (props) => {
     productListToValue(result.productList);
   });
   (0, import_react.useEffect)(() => {
-    if (!isBooking4Shop) return;
+    if (!isBooking4Shop || !shopDiscount) return;
     const onScanCustomerChange = (customer) => {
       const clientVariantClose = (0, import_utils3.getClientVariantClose)();
       if (clientVariantClose) {
@@ -207,25 +199,28 @@ var VoucherCard = (props) => {
     const onDiscountListChange = (discount) => {
       setDisCountList(discount);
     };
-    pisellos.effects.on(
-      ShopDiscountHooks.onScanCustomerChange,
-      onScanCustomerChange
+    const wrappedOnScanCustomerChangeHandler = executeIfActive(onScanCustomerChange);
+    const wrappedOnDiscountListChangeHandler = executeIfActive(onDiscountListChange);
+    const wrappedFn = executeIfActive(fn);
+    shopDiscount.effectsOn(
+      "onScanCustomerChange",
+      wrappedOnScanCustomerChangeHandler
     );
-    pisellos.effects.on(ShopDiscountHooks.onLoadPrepareCalcResult, fn);
-    pisellos.effects.on(
-      ShopDiscountHooks.onDiscountListChange,
-      onDiscountListChange
+    shopDiscount.effectsOn("onLoadPrepareCalcResult", wrappedFn);
+    shopDiscount.effectsOn(
+      "onDiscountListChange",
+      wrappedOnDiscountListChangeHandler
     );
     return () => {
       shopDiscount.clear();
-      pisellos.effects.off(
-        ShopDiscountHooks.onScanCustomerChange,
-        onScanCustomerChange
+      shopDiscount.effectsOff(
+        "onScanCustomerChange",
+        wrappedOnScanCustomerChangeHandler
       );
-      pisellos.effects.off(ShopDiscountHooks.onLoadPrepareCalcResult, fn);
-      pisellos.effects.off(
-        ShopDiscountHooks.onDiscountListChange,
-        onDiscountListChange
+      shopDiscount.effectsOff("onLoadPrepareCalcResult", wrappedFn);
+      shopDiscount.effectsOff(
+        "onDiscountListChange",
+        wrappedOnDiscountListChangeHandler
       );
     };
   }, [state.bookingId, isBooking4Shop, fn]);
@@ -273,12 +268,11 @@ var VoucherCard = (props) => {
   };
   const availableData = (0, import_react.useMemo)(() => {
     if (!isBooking4Shop) return [];
-    const shopDiscount2 = pisellos.getModule("shopDiscount");
     return discountList.filter((item) => !!item.isAvailable).map((discount) => {
       return {
         ...discount,
         isDisabled: discount.isDisabled || discount.isDisabledForProductUsed || disabled,
-        savedAmount: shopDiscount2.calcDiscountApplicableProductTotalPrice(discount)
+        savedAmount: shopDiscount.calcDiscountApplicableProductTotalPrice(discount)
       };
     });
   }, [discountList, isBooking4Shop, disabled]);
@@ -321,8 +315,7 @@ var VoucherCard = (props) => {
         dataSource: ((_d = (_c = state.service) == null ? void 0 : _c.value) == null ? void 0 : _d.length) ? availableData : [],
         mixedSort,
         onChange: (val) => {
-          const shopDiscount2 = pisellos.getModule("shopDiscount");
-          const detail = shopDiscount2.setDiscountSelected({
+          const detail = shopDiscount.setDiscountSelected({
             discountId: val.id,
             isSelected: val.isSelected
           });

package/lib/components/booking/forms/footer.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 interface FooterProps {
     state: any;
     reload: () => void;

package/lib/components/booking/forms/sendModal/useSendModal.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { SendModalValues } from './index';
 declare const useSendModal: (bookingId?: number) => {
     open: boolean;

package/lib/components/booking/forms/single/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 /**
  * @title: 表单选择器

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

@@ -48,6 +48,7 @@ var import_useTranslationOriginal = __toESM(require("../../../../hooks/useTransl
 var import_useEngineContext = __toESM(require("../../../../hooks/useEngineContext"));
 var import_model = require("../../info/model");
 var import_index = require("./index.less");
+var import_IsActiveContext = require("../../../ticketBooking/context/IsActiveContext");
 var CartClientCard = (0, import_react.forwardRef)(({
   clientCardProps = {},
   beforeSwitchModalOpen,
@@ -64,6 +65,7 @@ var CartClientCard = (0, import_react.forwardRef)(({
   const translationOriginal = (0, import_useTranslationOriginal.default)();
   const [keyword, setKeyword] = (0, import_react.useState)("");
   const keywordRef = (0, import_react.useRef)("");
+  const isActive = (0, import_IsActiveContext.useIsActive)();
   keywordRef.current = keyword;
   const Toast = (0, import_materials.useToast)();
   const { openScan, closeScan } = (0, import_useScanCustomer.default)();
@@ -231,13 +233,15 @@ var CartClientCard = (0, import_react.forwardRef)(({
     setPendingCustomer(null);
   };
   (0, import_react.useMemo)(() => {
-    (0, import_utils3.setHandleSetClient)(handleSetClient);
-  }, []);
+    if (isActive) {
+      (0, import_utils3.setHandleSetClient)(handleSetClient);
+    }
+  }, [isActive]);
   (0, import_react.useEffect)(() => {
     return () => {
       (0, import_utils3.setHandleSetClient)(null);
     };
-  }, []);
+  }, [isActive]);
   const tags = (0, import_react.useMemo)(() => {
     var _a2;
     if (!selectedCustomer) return;

package/lib/components/booking/materiels/contacts/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 declare type ContactType = {
     country_calling_code: string;

package/lib/components/checkout/PaymentModal.js

@@ -64,6 +64,7 @@ var import_utils2 = require("./utils");
 var import_usePaymentLogger = __toESM(require("./hooks/usePaymentLogger"));
 var import_antd = require("antd");
 var import_priceKeyboard = require("../../pro/priceKeyboard");
+var import_pisellos = require("../ticketBooking/hooks/pisellos");
 var CheckoutHooks = {
   OnStateAmountChanged: "checkout:onStateAmountChanged",
   OnBalanceDueAmountChanged: "checkout:onBalanceDueAmountChanged",
@@ -104,6 +105,7 @@ var PaymentContent = (0, import_react.forwardRef)(
     const utils = context.appHelper.utils || {};
     const { pisellos, getData, pisellosAllModule, interaction } = utils;
     const Toast = (0, import_materials.useToast)();
+    const { executeIfActive } = (0, import_pisellos.useActiveExecute)();
     const checkoutRef = (0, import_react.useRef)(null);
     const savePayLaterHandlerRef = (0, import_react.useRef)(null);
     const [customAmount, setCustomAmount] = (0, import_react.useState)("");
@@ -191,7 +193,7 @@ var PaymentContent = (0, import_react.forwardRef)(
       return surcharge;
     };
     const onPaymentOptionClick = async (method) => {
-      var _a2, _b2, _c2, _d;
+      var _a2, _b2, _c2, _d, _e;
       const { id, code, name, type } = method || {};
       const finalAmount = method.totalAmount ?? customAmount;
       const eftposCodes = [
@@ -211,6 +213,7 @@ var PaymentContent = (0, import_react.forwardRef)(
         let data;
         const isSynced = await checkoutModule.isCurrentOrderSynced();
         if (!isSynced) {
+          (_a2 = Toast == null ? void 0 : Toast.loading) == null ? void 0 : _a2.call(Toast);
           data = await checkoutModule.manualSyncOrderAsync();
         } else {
           const orderId = await checkoutModule.getCurrentOrderId();
@@ -218,7 +221,7 @@ var PaymentContent = (0, import_react.forwardRef)(
             orderId
           };
         }
-        (_a2 = paymentMethodsRef.current) == null ? void 0 : _a2.onPay(payType, {
+        (_b2 = paymentMethodsRef.current) == null ? void 0 : _b2.onPay(payType, {
           source: "normal",
           data: {
             payMethod: { id, code, name, type },
@@ -280,13 +283,13 @@ var PaymentContent = (0, import_react.forwardRef)(
             percentage: (method == null ? void 0 : method.percentage) || "0"
           };
         }
-        if (method.type === "custom" && ((_b2 = method.metadata) == null ? void 0 : _b2.order_open_cash_drawer)) {
+        if (method.type === "custom" && ((_c2 = method.metadata) == null ? void 0 : _c2.order_open_cash_drawer)) {
           logger == null ? void 0 : logger.addLog({
             type: "info",
             title: "open_till",
             metadata: {}
           });
-          (_d = (_c2 = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _c2.postMessageToApp) == null ? void 0 : _d.call(_c2, {
+          (_e = (_d = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _d.postMessageToApp) == null ? void 0 : _e.call(_d, {
             module: "till",
             key: "open_till",
             data: {
@@ -377,7 +380,7 @@ var PaymentContent = (0, import_react.forwardRef)(
           if (core.effects && typeof core.effects.on === "function") {
             const unsubscribe = core.effects.on(
               CheckoutHooks.OnStateAmountChanged,
-              async (data) => {
+              executeIfActive(async (data) => {
                 var _a2, _b2;
                 console.log(
                   `Amount changed from ${data.oldAmount} to ${data.newAmount}`
@@ -403,26 +406,26 @@ var PaymentContent = (0, import_react.forwardRef)(
                 setCustomAmount(data.newAmount);
                 const items = await checkoutModule.getCurrentOrderPaymentItemsAsync();
                 setPaymentItems(items);
-              }
+              })
             );
             const amountChangedUnsubscribe = core.effects.on(
               CheckoutHooks.OnBalanceDueAmountChanged,
-              (data) => {
+              executeIfActive((data) => {
                 setBalanceDueAmount(data.newAmount);
                 setBalanceDueTotalAmount(data.totalAmount || "0");
-              }
+              })
             );
             const orderSubmitStartUnsubscribe = core.effects.on(
               CheckoutHooks.OnOrderSubmitStart,
-              () => {
+              executeIfActive(() => {
                 var _a2;
                 setSyncingLock(true);
                 (_a2 = Toast == null ? void 0 : Toast.loading) == null ? void 0 : _a2.call(Toast);
-              }
+              })
             );
             const orderSubmitEndUnsubscribe = core.effects.on(
               CheckoutHooks.OnOrderSubmitEnd,
-              (res) => {
+              executeIfActive((res) => {
                 var _a2, _b2;
                 setSyncingLock(false);
                 if (res.success) {
@@ -437,11 +440,11 @@ var PaymentContent = (0, import_react.forwardRef)(
                     );
                   }
                 }
-              }
+              })
             );
             const orderPaymentAddedUnsubscribe = core.effects.on(
               CheckoutHooks.OnOrderPaymentAdded,
-              async (data) => {
+              executeIfActive(async (data) => {
                 var _a2, _b2;
                 console.log("orderPaymentAddedUnsubscribe>>>>", data);
                 const orderInfo2 = checkoutModule.getCurrentOrderInfo();
@@ -504,7 +507,7 @@ var PaymentContent = (0, import_react.forwardRef)(
                     }
                   });
                 }
-              }
+              })
             );
             return () => {
               if (unsubscribe && typeof unsubscribe === "function") {
@@ -1060,6 +1063,7 @@ var PaymentModal = ({
   const [windowHeight, setWindowHeight] = (0, import_react.useState)(0);
   const [showRetryModal, setShowRetryModal] = (0, import_react.useState)(false);
   const [currentEditOrderId, setCurrentEditOrderId] = (0, import_react.useState)(editOrderId || 0);
+  const { executeIfActive } = (0, import_pisellos.useActiveExecute)();
   const Toast = (0, import_materials.useToast)();
   const handleRetry = async () => {
     const checkoutModule = pisellos == null ? void 0 : pisellos.getModule("checkout");
@@ -1462,7 +1466,7 @@ var PaymentModal = ({
           }
           unsubscribeRef.current = checkout.core.effects.on(
             "checkout:onOrderSynced",
-            async (data2) => {
+            executeIfActive(async (data2) => {
               var _a3, _b3, _c3, _d3, _e2;
               const currentOrderId = checkout.getCurrentOrderId();
               setCurrentEditOrderId(currentOrderId);
@@ -1568,7 +1572,7 @@ var PaymentModal = ({
               } else {
                 handlePaymentComplete(data2);
               }
-            }
+            })
           );
         } else if (isLocalOrderCreated.current) {
           console.log(

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

@@ -41,9 +41,12 @@ var import_useEngineContext = require("../../../hooks/useEngineContext");
 var import_utils2 = require("../components/WalletPassModule/utils");
 var import_usePaymentLogger = __toESM(require("./usePaymentLogger"));
 var import_utils3 = require("../../booking/utils");
+var import_pisellos = require("../../ticketBooking/hooks/pisellos");
+var import_useShopDiscountModule = require("../../ticketBooking/hooks/pisellos/useShopDiscountModule");
 var useWalletPass = (props) => {
   const { onSelectChange, customAmount, clientId } = props;
   const logger = (0, import_usePaymentLogger.default)();
+  const { executeIfActive } = (0, import_pisellos.useActiveExecute)();
   const [walletRecommendList, setWalletRecommendList] = (0, import_react.useState)([]);
   const [userIdentificationCodes, setUserIdentificationCodes] = (0, import_react.useState)(
     []
@@ -68,7 +71,7 @@ var useWalletPass = (props) => {
   const [error, setError] = (0, import_react.useState)(null);
   const [discountList, setDiscountList] = (0, import_react.useState)([]);
   const checkoutModule = pisellos.getModule("checkout");
-  const shopDiscount = pisellos.getModule("shopDiscount");
+  const shopDiscount = (0, import_useShopDiscountModule.useShopDiscountModule)();
   const paymentModule = checkoutModule == null ? void 0 : checkoutModule.payment;
   const setWalletSelect = (0, import_ahooks.useMemoizedFn)((data2) => {
     setSelectedWallet(data2);
@@ -325,62 +328,71 @@ var useWalletPass = (props) => {
   (0, import_react.useEffect)(() => {
     if (!paymentModule) return;
     const core = pisellos;
-    core.effects.on(
-      "wallet:onWalletRecommendListUpdated",
-      handleWalletRecommendListUpdated
+    const wrappedHandlePaymentStarted = executeIfActive(handlePaymentStarted);
+    const wrappedOnOrderCreated = executeIfActive(onOrderCreated);
+    const wrappedHandleWalletRecommendListUpdated = executeIfActive(handleWalletRecommendListUpdated);
+    const wrappedHandleUserIdentificationCodesUpdated = executeIfActive(handleUserIdentificationCodesUpdated);
+    const wrappedHandleWalletCacheCleared = executeIfActive(handleWalletCacheCleared);
+    const wrappedHandleSearchIdentificationCodeCompleted = executeIfActive(handleSearchIdentificationCodeCompleted);
+    const wrappedHandleWalletInitializationStarted = executeIfActive(handleWalletInitializationStarted);
+    const wrappedHandleWalletInitializationCompleted = executeIfActive(handleWalletInitializationCompleted);
+    const wrappedHandleWalletInitializationFailed = executeIfActive(handleWalletInitializationFailed);
+    paymentModule.effectsOn(
+      "onWalletRecommendListUpdated",
+      wrappedHandleWalletRecommendListUpdated
     );
-    core.effects.on("checkout:onPaymentStarted", handlePaymentStarted);
-    core.effects.on("checkout:onPaymentItemAdded", handlePaymentStarted);
-    core.effects.on(
-      "wallet:onUserIdentificationCodesUpdated",
-      handleUserIdentificationCodesUpdated
+    checkoutModule.effectsOn("onPaymentStarted", wrappedHandlePaymentStarted);
+    checkoutModule.effectsOn("onPaymentItemAdded", wrappedHandlePaymentStarted);
+    paymentModule.effectsOn(
+      "onUserIdentificationCodesUpdated",
+      wrappedHandleUserIdentificationCodesUpdated
     );
-    core.effects.on("wallet:onWalletCacheCleared", handleWalletCacheCleared);
-    core.effects.on(
-      "wallet:onSearchIdentificationCodeCompleted",
-      handleSearchIdentificationCodeCompleted
+    paymentModule.effectsOn("onWalletCacheCleared", wrappedHandleWalletCacheCleared);
+    paymentModule.effectsOn(
+      "onSearchIdentificationCodeCompleted",
+      wrappedHandleSearchIdentificationCodeCompleted
     );
-    core.effects.on("checkout:onWalletDataInitialized", onOrderCreated);
-    core.effects.on(
-      "wallet:onWalletInitializationStarted",
-      handleWalletInitializationStarted
+    checkoutModule.effectsOn("onWalletDataInitialized", wrappedOnOrderCreated);
+    paymentModule.effectsOn(
+      "onWalletInitializationStarted",
+      wrappedHandleWalletInitializationStarted
     );
-    core.effects.on(
-      "wallet:onWalletInitializationCompleted",
-      handleWalletInitializationCompleted
+    paymentModule.effectsOn(
+      "onWalletInitializationCompleted",
+      wrappedHandleWalletInitializationCompleted
     );
-    core.effects.on(
-      "wallet:onWalletInitializationFailed",
-      handleWalletInitializationFailed
+    paymentModule.effectsOn(
+      "onWalletInitializationFailed",
+      wrappedHandleWalletInitializationFailed
     );
     return () => {
-      core.effects.off(
-        "wallet:onWalletRecommendListUpdated",
-        handleWalletRecommendListUpdated
+      paymentModule.effectsOff(
+        "onWalletRecommendListUpdated",
+        wrappedHandleWalletRecommendListUpdated
       );
-      core.effects.off("checkout:onPaymentStarted", handlePaymentStarted);
-      core.effects.off("checkout:onPaymentItemAdded", handlePaymentStarted);
-      core.effects.off(
-        "wallet:onUserIdentificationCodesUpdated",
-        handleUserIdentificationCodesUpdated
+      checkoutModule.effectsOff("onPaymentStarted", wrappedHandlePaymentStarted);
+      checkoutModule.effectsOff("onPaymentItemAdded", wrappedHandlePaymentStarted);
+      paymentModule.effectsOff(
+        "onUserIdentificationCodesUpdated",
+        wrappedHandleUserIdentificationCodesUpdated
       );
-      core.effects.off("wallet:onWalletCacheCleared", handleWalletCacheCleared);
-      core.effects.off(
-        "wallet:onSearchIdentificationCodeCompleted",
-        handleSearchIdentificationCodeCompleted
+      paymentModule.effectsOff("onWalletCacheCleared", wrappedHandleWalletCacheCleared);
+      paymentModule.effectsOff(
+        "onSearchIdentificationCodeCompleted",
+        wrappedHandleSearchIdentificationCodeCompleted
       );
-      core.effects.off("checkout:onWalletDataInitialized", onOrderCreated);
-      core.effects.off(
-        "wallet:onWalletInitializationStarted",
-        handleWalletInitializationStarted
+      checkoutModule.effectsOff("onWalletDataInitialized", wrappedOnOrderCreated);
+      paymentModule.effectsOff(
+        "onWalletInitializationStarted",
+        wrappedHandleWalletInitializationStarted
       );
-      core.effects.off(
-        "wallet:onWalletInitializationCompleted",
-        handleWalletInitializationCompleted
+      paymentModule.effectsOff(
+        "onWalletInitializationCompleted",
+        wrappedHandleWalletInitializationCompleted
       );
-      core.effects.off(
-        "wallet:onWalletInitializationFailed",
-        handleWalletInitializationFailed
+      paymentModule.effectsOff(
+        "onWalletInitializationFailed",
+        wrappedHandleWalletInitializationFailed
       );
     };
   }, [paymentModule]);

package/lib/components/eftpos/form/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 /**
  * @title: 递归循环表单数据
  * @Author: hongbing.wang

package/lib/components/eftpos/hooks.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { Eftpos } from './const';
 /**
  * @title: tyro 设备连接

package/lib/components/eftpos/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { Eftpos, DeviceStatus } from './const';
 import './index.less';
 interface PosProps {

package/lib/components/eftpos/pos.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { DeviceProp } from "./const";
 interface PosProps {
     eftposName: string;

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { PosProps } from './const';
 /**
  * @title: 支付金额信息配置页

package/lib/components/eftposPay/component/fail/failCustom.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { ActionProps } from '../../const';
 declare const _default: ({ className, isMobile, onChange }: ActionProps) => JSX.Element;
 export default _default;

package/lib/components/eftposPay/component/fail/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { ActionProps } from '../../const';
 declare const _default: ({ onChange, className, isMobile }: ActionProps) => JSX.Element;
 export default _default;

package/lib/components/eftposPay/component/fail/network.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { ActionProps } from '../../const';
 /**
  * @title: 断网(客户端)提示页

package/lib/components/eftposPay/component/fail/unknow.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { ActionProps } from '../../const';
 /**
  * @title: 支付状态未知页面

package/lib/components/eftposPay/component/manual/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { ActionProps } from '../../const';
 import './index.less';
 /**

package/lib/components/eftposPay/component/signature/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { ActionProps } from '../../const';
 /**
  * @title: 取消签名确认页

package/lib/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<"stripe" | "payo" | "tyro" | "windcave" | "linkly">;
+    readonly eftposRef: React.MutableRefObject<"stripe" | "tyro" | "windcave" | "payo" | "linkly">;
     readonly clientRef: React.MutableRefObject<ClientEnum>;
     readonly dataRef: React.MutableRefObject<import("./store").State>;
 };

package/lib/components/eftposPay/pay.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { PayProps } from './const';
 import './index.less';
 /**

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

@@ -297,8 +297,8 @@ export declare const backUpFree: (payload: Partial<State>) => {
         amount?: string | number | undefined;
         mode?: "pay" | "refund" | "fullPay" | "query" | undefined;
         order_id?: string | number | undefined;
-        eftpos?: "stripe" | "payo" | "tyro" | "windcave" | "linkly" | undefined;
-        action?: "pay" | "amount" | "deviceList" | undefined;
+        eftpos?: "stripe" | "tyro" | "windcave" | "payo" | "linkly" | undefined;
+        action?: "amount" | "pay" | "deviceList" | undefined;
         key?: number | undefined;
         step?: number | undefined;
         title?: string | undefined;