@pisell/private-materials 6.5.1 → 6.5.2

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

@@ -31,6 +31,7 @@ import { useCustomer } from "../../../ticketBooking/hooks/pisellos/useCustomer";
 import { useMemoizedFn } from 'ahooks';
 import useEngineContext, { usePisellOS } from "../../../../hooks/useEngineContext";
 import useScanManager from "../../../ticketBooking/hooks/pisellos/useScanManager";
+import { useShopDiscount } from "../../../appointmentBooking/hooks";
 // Toast 内容包装器，统一设置行高
 var createToastContent = function createToastContent(text) {
   return /*#__PURE__*/React.createElement("div", {
@@ -60,6 +61,7 @@ var ActionButtons = function ActionButtons(_ref) {
     _useState8 = _slicedToArray(_useState7, 2),
     showVoucherModal = _useState8[0],
     setShowVoucherModal = _useState8[1];
+  var shopDiscount = useShopDiscount();
   var context = useEngineContext();
   var _context$appHelper$ut = (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.utils,
     Toast = _context$appHelper$ut.Toast,
@@ -268,8 +270,8 @@ var ActionButtons = function ActionButtons(_ref) {
 
   // 清空所有内容并重置购物车
   var handleClearAllAndReset = function handleClearAllAndReset() {
-    var _window;
-    (_window = window) === null || _window === void 0 || (_window = _window.shopApi) === null || _window === void 0 || (_window = _window.bookingTicket) === null || _window === void 0 || _window.clearAllCart();
+    var _shopDiscount$clear;
+    // (window as any)?.shopApi?.bookingTicket?.clearAllCart();
     clearAllScanListenersTaskQueue();
     // 清空服务项目
     dispatch({
@@ -328,6 +330,8 @@ var ActionButtons = function ActionButtons(_ref) {
     // TODO: 如果需要重置更多信息，可以在这里添加
     // 比如重置优惠券、表单数据、宠物信息等
 
+    // 清空商品券
+    shopDiscount === null || shopDiscount === void 0 || (_shopDiscount$clear = shopDiscount.clear) === null || _shopDiscount$clear === void 0 || _shopDiscount$clear.call(shopDiscount);
     setShowClearModal(false);
     Toast === null || Toast === void 0 || Toast.success(createToastContent(locales.getText('pisell2.action-buttons.clear-success')));
   };

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

@@ -45,6 +45,8 @@ import { Iconfont } from '@pisell/materials';
 import { useCustomer } from "../../../ticketBooking/hooks/pisellos/useCustomer";
 import { useDebounceEffect, useMemoizedFn } from 'ahooks';
 import { cloneDeep } from 'lodash';
+import { useShopDiscount } from "../../../appointmentBooking/hooks";
+
 /**
  * @title: 底部
  * @description:
@@ -654,12 +656,12 @@ var Footer = function Footer(props) {
             setPaymentCallback(function () {
               return function (paymentResult) {
                 console.log('Payment result:', paymentResult);
+                setIsPaymentModalOpen(false);
                 if ((paymentResult === null || paymentResult === void 0 ? void 0 : paymentResult.status) === 'success') {
                   var _window5;
                   console.log('Payment completed successfully');
                   (_window5 = window) === null || _window5 === void 0 || (_window5 = _window5.shopApi) === null || _window5 === void 0 || (_window5 = _window5.bookingTicket) === null || _window5 === void 0 || _window5.clearAllCart();
                   // 支付成功后关闭弹窗
-                  setIsPaymentModalOpen(false);
                   setPaymentModalData(null);
                   setPaymentCallback(null);
                 } else if ((paymentResult === null || paymentResult === void 0 ? void 0 : paymentResult.status) === 'cancelled') {
@@ -669,13 +671,11 @@ var Footer = function Footer(props) {
                     (_window6 = window) === null || _window6 === void 0 || (_window6 = _window6.shopApi) === null || _window6 === void 0 || (_window6 = _window6.booking) === null || _window6 === void 0 || _window6.voidBooking(res.order_id);
                   }
                   // 支付取消后关闭弹窗
-                  setIsPaymentModalOpen(false);
                   setPaymentModalData(null);
                   setPaymentCallback(null);
                 } else {
                   console.log('Payment status:', paymentResult === null || paymentResult === void 0 ? void 0 : paymentResult.status);
                   // 其他状态也关闭弹窗
-                  setIsPaymentModalOpen(false);
                   setPaymentModalData(null);
                   setPaymentCallback(null);
                 }
@@ -1656,12 +1656,15 @@ var Footer = function Footer(props) {
       changeCustomerToGlobalState: changeCustomerToGlobalState
     }),
     selectCustomer = _useCustomer.selectCustomer;
+  var shopDiscount = useShopDiscount();
   var _useScanManager2 = useScanManager(),
     clearAllScanListenersTaskQueue = _useScanManager2.clearAllScanListenersTaskQueue;
   // 清空所有内容并重置购物车
   var handleClearAllAndReset = function handleClearAllAndReset() {
-    var _window7;
-    (_window7 = window) === null || _window7 === void 0 || (_window7 = _window7.shopApi) === null || _window7 === void 0 || (_window7 = _window7.bookingTicket) === null || _window7 === void 0 || _window7.clearAllCart();
+    var _shopDiscount$clear;
+    // setTimeout(() => {
+    //   (window as any)?.shopApi?.bookingTicket?.clearAllCart();
+    // }, 0);
     clearAllScanListenersTaskQueue();
     // 清空服务项目
     dispatch({
@@ -1716,6 +1719,9 @@ var Footer = function Footer(props) {
         orderNote: ''
       }
     });
+
+    // 清空商品券
+    shopDiscount === null || shopDiscount === void 0 || (_shopDiscount$clear = shopDiscount.clear) === null || _shopDiscount$clear === void 0 || _shopDiscount$clear.call(shopDiscount);
   };
   return /*#__PURE__*/React.createElement(Skeleton, {
     title: false,
@@ -1800,13 +1806,23 @@ var Footer = function Footer(props) {
     state: state,
     dispatch: dispatch,
     onClose: function onClose(reset) {
-      console.log('🔄 Footer: Closing PaymentModal');
+      // console.log('🔄 Footer: Closing PaymentModal');
       setIsPaymentModalOpen(false);
       setPaymentModalData(null);
       setPaymentCallback(null);
+      // if (reset) {
+      //   handleClearAllAndReset();
+      // }
       if (reset) {
-        handleClearAllAndReset();
+        setTimeout(function () {
+          handleClearAllAndReset();
+        }, 0);
       }
+      // setPaymentModalData(null);
+      // setPaymentCallback(null);
+      // if (reset) {
+      //   handleClearAllAndReset();
+      // }
     }
   }));
 };

package/es/components/checkout/PaymentModal.js

@@ -1619,7 +1619,7 @@ var PaymentModal = function PaymentModal(_ref17) {
               // 获取 checkout 模块并处理订单数据
               checkout = pisellos === null || pisellos === void 0 ? void 0 : pisellos.getModule('checkout');
               if (!(checkout && data && !isLocalOrderCreated.current)) {
-                _context17.next = 20;
+                _context17.next = 18;
                 break;
               }
               isLocalOrderCreated.current = true;
@@ -1639,19 +1639,16 @@ var PaymentModal = function PaymentModal(_ref17) {
                 order_rounding_setting: getData('order_rounding_setting'),
                 shop_wallet_pass_id: shop_wallet_pass_id
               });
-              console.time('initCheckoutData');
               newData = cloneDeep(data); // setTotalAmount(newData.total.expectAmount);
               // 先往 checkout 解决方案推送一条 local 数据
-              _context17.next = 12;
+              _context17.next = 11;
               return checkout.createLocalOrderAsync({
                 orderData: newData.order_info,
                 cartSummary: (_newData$subtotal_inf = newData.subtotal_info) === null || _newData$subtotal_inf === void 0 ? void 0 : _newData$subtotal_inf.subTotalList,
                 autoPayment: true,
                 totalInfo: newData.subtotal_info
               });
-            case 12:
-              console.timeEnd('initCheckoutData');
-
+            case 11:
               // 获取订单总金额
               _orderInfo2 = checkout.getCurrentOrderInfo();
               if (_orderInfo2 && _orderInfo2.totalAmount) {
@@ -1771,27 +1768,27 @@ var PaymentModal = function PaymentModal(_ref17) {
                 // 可以在这里执行同步完成后的业务逻辑
                 // 比如：通知其他系统、更新UI状态等
               });
-              _context17.next = 31;
+              _context17.next = 29;
               break;
-            case 20:
+            case 18:
               if (!isLocalOrderCreated.current) {
-                _context17.next = 31;
+                _context17.next = 29;
                 break;
               }
               // // 如果本地订单已创建，这时候还更新了 data，则需要销毁当前的订单数据，然后更新新的订单数据了
               console.log('🔄 PaymentModal: data changed, updating checkout data...');
               isLocalOrderCreated.current = false;
-              _context17.next = 25;
+              _context17.next = 23;
               return checkout.cancelCurrentOrderAsync();
-            case 25:
-              _context17.next = 27;
+            case 23:
+              _context17.next = 25;
               return checkout.createLocalOrderAsync({
                 orderData: data === null || data === void 0 ? void 0 : data.order_info,
                 cartSummary: data === null || data === void 0 || (_data$subtotal_info = data.subtotal_info) === null || _data$subtotal_info === void 0 ? void 0 : _data$subtotal_info.subTotalList,
                 autoPayment: true,
                 totalInfo: data === null || data === void 0 ? void 0 : data.subtotal_info
               });
-            case 27:
+            case 25:
               // 获取订单总金额
               _orderInfo3 = checkout.getCurrentOrderInfo();
               if (_orderInfo3 && _orderInfo3.totalAmount) {
@@ -1799,11 +1796,11 @@ var PaymentModal = function PaymentModal(_ref17) {
               }
               setOrderInfo(_orderInfo3);
               isLocalOrderCreated.current = true;
-            case 31:
-              _context17.next = 37;
+            case 29:
+              _context17.next = 35;
               break;
-            case 33:
-              _context17.prev = 33;
+            case 31:
+              _context17.prev = 31;
               _context17.t0 = _context17["catch"](0);
               console.error('Failed to initialize checkout data:', _context17.t0);
               logger === null || logger === void 0 || logger.addLog({
@@ -1813,11 +1810,11 @@ var PaymentModal = function PaymentModal(_ref17) {
                   error: _context17.t0
                 }
               });
-            case 37:
+            case 35:
             case "end":
               return _context17.stop();
           }
-        }, _callee17, null, [[0, 33]]);
+        }, _callee17, null, [[0, 31]]);
       }));
       return function initCheckoutData() {
         return _ref22.apply(this, arguments);

package/es/components/checkout/components/PaymentResultToast/PaymentResultToastProvider.js

@@ -27,7 +27,7 @@ var globalPaymentResultToastContext = null;
 var DEFAULT_TOAST_CONFIG = {
   width: 680,
   mask: true,
-  maskClosable: false,
+  maskClosable: true,
   closable: true,
   zIndex: 2000
 };

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

@@ -51,7 +51,7 @@ var PaymentResultToast = /*#__PURE__*/memo(function (props) {
     _props$mask = props.mask,
     mask = _props$mask === void 0 ? true : _props$mask,
     _props$maskClosable = props.maskClosable,
-    maskClosable = _props$maskClosable === void 0 ? false : _props$maskClosable,
+    maskClosable = _props$maskClosable === void 0 ? true : _props$maskClosable,
     _props$closable = props.closable,
     closable = _props$closable === void 0 ? true : _props$closable,
     zIndex = props.zIndex;

package/es/components/ticketBooking/components/addServiceVariant/addService.js

@@ -270,7 +270,7 @@ var AddSerivce = function AddSerivce(props) {
     // 创建新的防抖定时器
     debounceTimersRef.current[productId] = setTimeout(function () {
       executeCacheValues(productId, cacheValues, item, callback);
-    }, 0);
+    }, 200);
   });
   var handleSelectProduct = useMemoizedFn(function (item) {
     var type = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'select';

package/es/components/ticketBooking/components/ticketBooking/index.js

@@ -306,6 +306,8 @@ var TicketBooking = function TicketBooking(props) {
     openScan(function (data) {
       handleScan(data);
     });
+  }, []);
+  useEffect(function () {
     return function () {
       closeScan();
     };
@@ -434,7 +436,6 @@ var TicketBooking = function TicketBooking(props) {
       intervalSetTime: isInterval
     });
   };
-  useEffect(function () {}, []);
   var getDataFromHost = function getDataFromHost() {
     try {
       var is_price_include_tax = getData('is_price_include_tax');

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

@@ -48,6 +48,7 @@ var import_useCustomer = require("../../../ticketBooking/hooks/pisellos/useCusto
 var import_ahooks = require("ahooks");
 var import_useEngineContext = __toESM(require("../../../../hooks/useEngineContext"));
 var import_useScanManager = __toESM(require("../../../ticketBooking/hooks/pisellos/useScanManager"));
+var import_hooks = require("../../../appointmentBooking/hooks");
 var createToastContent = (text) => /* @__PURE__ */ import_react.default.createElement("div", { className: "action-buttons-toast-content" }, text);
 var ActionButtons = ({
   state,
@@ -60,6 +61,7 @@ var ActionButtons = ({
   const [showPriceAdjustModal, setShowPriceAdjustModal] = (0, import_react.useState)(false);
   const [showCustomiseModal, setShowCustomiseModal] = (0, import_react.useState)(false);
   const [showVoucherModal, setShowVoucherModal] = (0, import_react.useState)(false);
+  const shopDiscount = (0, import_hooks.useShopDiscount)();
   const context = (0, import_useEngineContext.default)();
   const { Toast, getData, pisellosAllModule } = (_a = context.appHelper) == null ? void 0 : _a.utils;
   const pisellOS = (0, import_useEngineContext.usePisellOS)();
@@ -224,8 +226,7 @@ var ActionButtons = ({
     );
   };
   const handleClearAllAndReset = () => {
-    var _a2, _b2;
-    (_b2 = (_a2 = window == null ? void 0 : window.shopApi) == null ? void 0 : _a2.bookingTicket) == null ? void 0 : _b2.clearAllCart();
+    var _a2;
     clearAllScanListenersTaskQueue();
     dispatch({
       type: "setService",
@@ -263,6 +264,7 @@ var ActionButtons = ({
         orderNote: ""
       }
     });
+    (_a2 = shopDiscount == null ? void 0 : shopDiscount.clear) == null ? void 0 : _a2.call(shopDiscount);
     setShowClearModal(false);
     Toast == null ? void 0 : Toast.success(
       createToastContent(

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

@@ -59,6 +59,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 Footer = (props) => {
   var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o;
   const { state, buttons, dispatch, source } = props;
@@ -482,10 +483,10 @@ var Footer = (props) => {
         setPaymentCallback(() => (paymentResult) => {
           var _a2, _b2, _c2, _d2;
           console.log("Payment result:", paymentResult);
+          setIsPaymentModalOpen(false);
           if ((paymentResult == null ? void 0 : paymentResult.status) === "success") {
             console.log("Payment completed successfully");
             (_b2 = (_a2 = window == null ? void 0 : window.shopApi) == null ? void 0 : _a2.bookingTicket) == null ? void 0 : _b2.clearAllCart();
-            setIsPaymentModalOpen(false);
             setPaymentModalData(null);
             setPaymentCallback(null);
           } else if ((paymentResult == null ? void 0 : paymentResult.status) === "cancelled") {
@@ -493,12 +494,10 @@ var Footer = (props) => {
             if (res == null ? void 0 : res.order_id) {
               (_d2 = (_c2 = window == null ? void 0 : window.shopApi) == null ? void 0 : _c2.booking) == null ? void 0 : _d2.voidBooking(res.order_id);
             }
-            setIsPaymentModalOpen(false);
             setPaymentModalData(null);
             setPaymentCallback(null);
           } else {
             console.log("Payment status:", paymentResult == null ? void 0 : paymentResult.status);
-            setIsPaymentModalOpen(false);
             setPaymentModalData(null);
             setPaymentCallback(null);
           }
@@ -1195,10 +1194,10 @@ var Footer = (props) => {
   const { selectCustomer } = (0, import_useCustomer.useCustomer)({
     changeCustomerToGlobalState
   });
+  const shopDiscount = (0, import_hooks.useShopDiscount)();
   const { clearAllScanListenersTaskQueue } = (0, import_useScanManager.default)();
   const handleClearAllAndReset = () => {
-    var _a2, _b2;
-    (_b2 = (_a2 = window == null ? void 0 : window.shopApi) == null ? void 0 : _a2.bookingTicket) == null ? void 0 : _b2.clearAllCart();
+    var _a2;
     clearAllScanListenersTaskQueue();
     dispatch({
       type: "setService",
@@ -1236,6 +1235,7 @@ var Footer = (props) => {
         orderNote: ""
       }
     });
+    (_a2 = shopDiscount == null ? void 0 : shopDiscount.clear) == null ? void 0 : _a2.call(shopDiscount);
   };
   return /* @__PURE__ */ import_react.default.createElement(import_antd.Skeleton, { title: false, round: true, loading: showFooter, active: true }, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-footer-total" }, /* @__PURE__ */ import_react.default.createElement("span", { className: "pisell-lowcode__booking-footer-left" }, /* @__PURE__ */ import_react.default.createElement("span", { className: "pisell-lowcode__booking-footer-left-total" }, totalText), /* @__PURE__ */ import_react.default.createElement("span", { className: "pisell-lowcode__booking-footer-left-arrears" }, arrearsText)), /* @__PURE__ */ import_react.default.createElement(
     "span",
@@ -1325,12 +1325,13 @@ var Footer = (props) => {
       state,
       dispatch,
       onClose: (reset) => {
-        console.log("🔄 Footer: Closing PaymentModal");
         setIsPaymentModalOpen(false);
         setPaymentModalData(null);
         setPaymentCallback(null);
         if (reset) {
-          handleClearAllAndReset();
+          setTimeout(() => {
+            handleClearAllAndReset();
+          }, 0);
         }
       }
     }

package/lib/components/checkout/PaymentModal.js

@@ -1223,7 +1223,6 @@ var PaymentModal = ({
             order_rounding_setting: getData("order_rounding_setting"),
             shop_wallet_pass_id
           });
-          console.time("initCheckoutData");
           const newData = (0, import_lodash.cloneDeep)(data);
           await checkout.createLocalOrderAsync({
             orderData: newData.order_info,
@@ -1231,7 +1230,6 @@ var PaymentModal = ({
             autoPayment: true,
             totalInfo: newData.subtotal_info
           });
-          console.timeEnd("initCheckoutData");
           const orderInfo2 = checkout.getCurrentOrderInfo();
           if (orderInfo2 && orderInfo2.totalAmount) {
             setTotalAmount(orderInfo2.totalAmount);

package/lib/components/checkout/components/PaymentResultToast/PaymentResultToastProvider.js

@@ -46,7 +46,7 @@ var globalPaymentResultToastContext = null;
 var DEFAULT_TOAST_CONFIG = {
   width: 680,
   mask: true,
-  maskClosable: false,
+  maskClosable: true,
   closable: true,
   zIndex: 2e3
 };

package/lib/components/checkout/components/PaymentResultToast/index.js

@@ -78,7 +78,7 @@ var PaymentResultToast = (0, import_react.memo)((props) => {
     width,
     height,
     mask = true,
-    maskClosable = false,
+    maskClosable = true,
     closable = true,
     zIndex
   } = props;

package/lib/components/ticketBooking/components/addServiceVariant/addService.js

@@ -179,7 +179,7 @@ var AddSerivce = (props) => {
       }
       debounceTimersRef.current[productId] = setTimeout(() => {
         executeCacheValues(productId, cacheValues, item, callback);
-      }, 0);
+      }, 200);
     }
   );
   const handleSelectProduct = (0, import_ahooks.useMemoizedFn)(

package/lib/components/ticketBooking/components/ticketBooking/index.js

@@ -306,6 +306,8 @@ var TicketBooking = (props) => {
     openScan((data) => {
       handleScan(data);
     });
+  }, []);
+  (0, import_react.useEffect)(() => {
     return () => {
       closeScan();
     };
@@ -416,8 +418,6 @@ var TicketBooking = (props) => {
       intervalSetTime: isInterval
     });
   };
-  (0, import_react.useEffect)(() => {
-  }, []);
   const getDataFromHost = () => {
     try {
       const is_price_include_tax = getData("is_price_include_tax");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.5.1",
+  "version": "6.5.2",
   "scripts": {
     "dev": "father dev",
     "build": "father build",