@pisell/private-materials 6.4.55 → 6.4.57

package/es/components/appointmentBooking/components/Cart/Item/Total.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const Total: ({ className, isFooter }: any) => JSX.Element;
 export default Total;

package/es/components/appointmentBooking/components/Cart/Item/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const CartItem: ({ onNext }: any) => JSX.Element;
 export default CartItem;

package/es/components/appointmentBooking/components/Cart/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const Cart: ({ open, onCancel, onNext }: any) => JSX.Element;
 export default Cart;

package/es/components/appointmentBooking/components/Deposit/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 export declare const DepositContent: (props: {
     isAgreeDepositPolicy: boolean;

package/es/components/appointmentBooking/components/Footer/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const Footer: ({ onNext, isOpen }: any) => JSX.Element;
 export default Footer;

package/es/components/appointmentBooking/deposit/components/PolicyModal/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const DepositModal: (props: any) => JSX.Element;
 export default DepositModal;

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 interface TabProductProps {
     list: any[];

package/es/components/booking/components/TabProduct/productItem/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const ProductItem: ({ item, onClick, amountSymbol, style, className, }: any) => JSX.Element;
 export default ProductItem;

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,7 +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 新增
-      "option": formatProductOption(d.option)
+      "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": option
     };
   });
 };

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

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

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

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

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

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

package/es/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/es/components/booking/forms/single/index.d.ts

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

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

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

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

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

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);
@@ -253,7 +256,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
   var onPaymentOptionClick = /*#__PURE__*/function () {
     var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(method) {
       var _method$totalAmount;
-      var _ref4, id, code, name, type, finalAmount, eftposCodes, mx51Code, payType, _paymentMethodsRef$cu, data, isSynced, _orderId, _method$metadata, service_charge, _interaction$utils2, _interaction$utils2$p;
+      var _ref4, id, code, name, type, finalAmount, eftposCodes, mx51Code, payType, _paymentMethodsRef$cu, data, isSynced, _Toast$loading, _orderId, _method$metadata, service_charge, _interaction$utils2, _interaction$utils2$p;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
@@ -268,7 +271,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
               payType = 'mx51';
             }
             if (!payType) {
-              _context2.next = 23;
+              _context2.next = 24;
               break;
             }
             _context2.next = 9;
@@ -276,24 +279,25 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
           case 9:
             isSynced = _context2.sent;
             if (isSynced) {
-              _context2.next = 16;
+              _context2.next = 17;
               break;
             }
-            _context2.next = 13;
+            Toast === null || Toast === void 0 || (_Toast$loading = Toast.loading) === null || _Toast$loading === void 0 || _Toast$loading.call(Toast);
+            _context2.next = 14;
             return checkoutModule.manualSyncOrderAsync();
-          case 13:
+          case 14:
             data = _context2.sent;
-            _context2.next = 20;
+            _context2.next = 21;
             break;
-          case 16:
-            _context2.next = 18;
+          case 17:
+            _context2.next = 19;
             return checkoutModule.getCurrentOrderId();
-          case 18:
+          case 19:
             _orderId = _context2.sent;
             data = {
               orderId: _orderId
             };
-          case 20:
+          case 21:
             (_paymentMethodsRef$cu = paymentMethodsRef.current) === null || _paymentMethodsRef$cu === void 0 || _paymentMethodsRef$cu.onPay(payType, {
               source: 'normal',
               data: {
@@ -357,9 +361,9 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
                 }
               }
             });
-            _context2.next = 28;
+            _context2.next = 29;
             break;
-          case 23:
+          case 24:
             service_charge = null;
             if (method !== null && method !== void 0 && method.fixed || method !== null && method !== void 0 && method.percentage) {
               service_charge = {
@@ -384,7 +388,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
               });
             }
             // 从支付方式列表中查找现金支付方式
-            _context2.next = 28;
+            _context2.next = 29;
             return checkoutModule === null || checkoutModule === void 0 ? void 0 : checkoutModule.addPaymentItemAsync({
               amount: finalAmount,
               /** 支付类型，跟支付列表上对应的支付方式保持一致 */
@@ -400,7 +404,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
               /** 支付手续费 */
               service_charge: service_charge
             });
-          case 28:
+          case 29:
           case "end":
             return _context2.stop();
         }
@@ -490,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) {
@@ -520,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 _Toast$loading;
+          }));
+          var orderSubmitStartUnsubscribe = core.effects.on(CheckoutHooks.OnOrderSubmitStart, executeIfActive(function () {
+            var _Toast$loading2;
             setSyncingLock(true);
-            Toast === null || Toast === void 0 || (_Toast$loading = Toast.loading) === null || _Toast$loading === void 0 || _Toast$loading.call(Toast);
-          });
-          var orderSubmitEndUnsubscribe = core.effects.on(CheckoutHooks.OnOrderSubmitEnd, function (res) {
+            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, executeIfActive(function (res) {
             setSyncingLock(false);
             if (res.success) {
               var _Toast$hide;
@@ -546,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,
@@ -555,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) {
@@ -645,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();
@@ -1404,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();
 
   // 重试处理函数（逻辑由用户自己实现）
@@ -2078,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;
@@ -2223,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.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/eftpos/form/index.d.ts

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