@pisell/private-materials 6.5.14 → 6.5.15

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

@@ -3,6 +3,7 @@ interface AddServiceVariantProps {
     globalState: any;
     setGlobalState: any;
     onPrerenderComplete?: () => void;
+    onGetProductsReady?: (getProducts: any) => void;
     productDisplayConfig?: ProductDisplayPresetKey | ProductDisplayConfig;
 }
 declare const AddServiceVariant: (props: AddServiceVariantProps) => JSX.Element;

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

@@ -10,6 +10,7 @@ var AddServiceVariant = function AddServiceVariant(props) {
   var globalState = props.globalState,
     setGlobalState = props.setGlobalState,
     onPrerenderComplete = props.onPrerenderComplete,
+    onGetProductsReady = props.onGetProductsReady,
     productDisplayConfig = props.productDisplayConfig;
   var stateRef = useRef(globalState);
   stateRef.current = globalState;
@@ -26,6 +27,7 @@ var AddServiceVariant = function AddServiceVariant(props) {
     state: globalState,
     dispatch: dispatch,
     onPrerenderComplete: onPrerenderComplete,
+    onGetProductsReady: onGetProductsReady,
     productDisplayConfig: productDisplayConfig
   });
 };

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

@@ -32,7 +32,7 @@ import dayjs from 'dayjs';
 import useEngineContext from "../../../../hooks/useEngineContext";
 import { useStore } from "../../miniRedux";
 import BookingInfo from "../../../../components/booking/info";
-import { formatDateToStr, getNextTimeSlice, getDisabledEdit, restoreProductOtherData, getIsParallelResourcesBooking, formatHolder } from "../../utils";
+import { formatDateToStr, getNextTimeSlice, getDisabledEdit, restoreProductOtherData, getIsParallelResourcesBooking, formatHolder, getBoardConfigCache, setBoardConfigCache } from "../../utils";
 import AddServiceVariant from "../addServiceVariant";
 import TimeBar from "../timeBar";
 import { formatProducts } from "../../../booking/info/service2/utils";
@@ -49,6 +49,7 @@ import { useCustomer } from "../../hooks/pisellos";
 import { useMemoizedFn } from 'ahooks';
 import useScanManager from "../../hooks/pisellos/useScanManager";
 import { useDebounceFn } from 'ahooks';
+import { useOsKey } from "../../context";
 import { useIsActive } from "../../context/IsActiveContext";
 import { useShopDiscountModule } from "../../hooks/pisellos/useShopDiscountModule";
 export var _formatBookingDetail = function _formatBookingDetail(data, modalState) {
@@ -221,7 +222,7 @@ var formatProductValues = function formatProductValues(data) {
   });
 };
 var TicketBooking = function TicketBooking(props) {
-  var _engineContext$appHel2, _state$modalState2, _state$modalState4;
+  var _engineContext$appHel2, _state$modalState3, _state$modalState5;
   var onPrerenderComplete = props.onPrerenderComplete,
     productDisplayConfig = props.productDisplayConfig,
     _props$isShowTimeBar = props.isShowTimeBar,
@@ -232,6 +233,12 @@ var TicketBooking = function TicketBooking(props) {
     _useStore2 = _slicedToArray(_useStore, 2),
     state = _useStore2[0],
     setState = _useStore2[1];
+  var getProductsRef = useRef(null);
+
+  // 处理 getProducts 函数准备就绪
+  var handleGetProductsReady = useMemoizedFn(function (getProducts) {
+    getProductsRef.current = getProducts;
+  });
   var engineContext = useEngineContext();
   var engineProps = engineContext.engine.props;
   var _engineContext$appHel = (_engineContext$appHel2 = engineContext.appHelper) === null || _engineContext$appHel2 === void 0 ? void 0 : _engineContext$appHel2.utils,
@@ -252,6 +259,7 @@ var TicketBooking = function TicketBooking(props) {
   var _listTimerRef = useRef();
   var _timerRef = useRef();
   var _callbackFnRef = useRef();
+  var _isFirstLoadBoardConfigRef = useRef(true); // 跟踪 boardConfig 是否首次加载
   var _useState = useState(0),
     _useState2 = _slicedToArray(_useState, 2),
     activeBookingId = _useState2[0],
@@ -264,6 +272,7 @@ var TicketBooking = function TicketBooking(props) {
   var closeRef = useRef(null);
   var shopDiscount = useShopDiscountModule();
   var isActive = useIsActive();
+  var osKey = useOsKey();
   var bookingTicket = useBookingTicket();
   var _useScanGlobal = useScanGlobal(),
     openScan = _useScanGlobal.openScan,
@@ -463,6 +472,19 @@ var TicketBooking = function TicketBooking(props) {
       if (_listTimerRef.current) clearInterval(_listTimerRef.current);
     };
   }, []);
+  var _getProducts = function _getProducts(date) {
+    var _state$modalState, _state$bookingConfig;
+    var currentDate = date.format('YYYY-MM-DD');
+    var currentDatetime = date.format('YYYY-MM-DD HH:mm:ss');
+    var customerId = (_state$modalState = state.modalState) === null || _state$modalState === void 0 || (_state$modalState = _state$modalState.client) === null || _state$modalState === void 0 || (_state$modalState = _state$modalState.value) === null || _state$modalState === void 0 ? void 0 : _state$modalState.id;
+    var menuList = ((_state$bookingConfig = state.bookingConfig) === null || _state$bookingConfig === void 0 || (_state$bookingConfig = _state$bookingConfig.config) === null || _state$bookingConfig === void 0 || (_state$bookingConfig = _state$bookingConfig.menu_list_tab) === null || _state$bookingConfig === void 0 ? void 0 : _state$bookingConfig.menu_list) || [];
+    getProductsRef.current({
+      schedule_date: currentDate,
+      customer_id: customerId,
+      menu_list_ids: menuList,
+      schedule_datetime: currentDatetime
+    });
+  };
 
   // 日期选择变更事件
   var _onDateChange = function _onDateChange(date, dateString) {
@@ -471,6 +493,11 @@ var TicketBooking = function TicketBooking(props) {
       isDateChange: true
     });
     _setDataChange(date, dateString);
+
+    // 手动获取 products
+    if (getProductsRef.current) {
+      _getProducts(date);
+    }
   };
 
   // 是否定时设置开始时间为当前时间
@@ -532,8 +559,8 @@ var TicketBooking = function TicketBooking(props) {
 
   // 商品加购信息发生变化时，需要发送至native端
   useEffect(function () {
-    var _state$modalState, _locales$getText, _interaction$utils4, _interaction$utils4$p;
-    var cartItems = state === null || state === void 0 || (_state$modalState = state.modalState) === null || _state$modalState === void 0 || (_state$modalState = _state$modalState.service) === null || _state$modalState === void 0 ? void 0 : _state$modalState.value;
+    var _state$modalState2, _locales$getText, _interaction$utils4, _interaction$utils4$p;
+    var cartItems = state === null || state === void 0 || (_state$modalState2 = state.modalState) === null || _state$modalState2 === void 0 || (_state$modalState2 = _state$modalState2.service) === null || _state$modalState2 === void 0 ? void 0 : _state$modalState2.value;
     if (!Array.isArray(cartItems) || cartItems.length === 0) {
       var _interaction$utils3, _interaction$utils3$p;
       interaction === null || interaction === void 0 || (_interaction$utils3 = interaction.utils) === null || _interaction$utils3 === void 0 || (_interaction$utils3$p = _interaction$utils3.postMessageToApp) === null || _interaction$utils3$p === void 0 || _interaction$utils3$p.call(_interaction$utils3, {
@@ -644,7 +671,7 @@ var TicketBooking = function TicketBooking(props) {
         fees: fees
       }
     });
-  }, [state === null || state === void 0 || (_state$modalState2 = state.modalState) === null || _state$modalState2 === void 0 || (_state$modalState2 = _state$modalState2.service) === null || _state$modalState2 === void 0 ? void 0 : _state$modalState2.value]);
+  }, [state === null || state === void 0 || (_state$modalState3 = state.modalState) === null || _state$modalState3 === void 0 || (_state$modalState3 = _state$modalState3.service) === null || _state$modalState3 === void 0 ? void 0 : _state$modalState3.value]);
 
   /**
    * 设置弹窗内的状态
@@ -675,6 +702,11 @@ var TicketBooking = function TicketBooking(props) {
         edit: true
       })
     });
+
+    // 如果是时间变化，手动获取 products
+    if (isTimeChange && getProductsRef.current) {
+      _getProducts(date);
+    }
     setTimeout(function () {
       var _state$modalState$ser;
       if ((_state$modalState$ser = state.modalState.service) !== null && _state$modalState$ser !== void 0 && (_state$modalState$ser = _state$modalState$ser.value) !== null && _state$modalState$ser !== void 0 && _state$modalState$ser.length) {
@@ -729,27 +761,57 @@ var TicketBooking = function TicketBooking(props) {
    */
   var _getBoardConfig = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-      var _data$config;
-      var bookingConfigParams, data;
+      var bookingConfigParams, isHasCache, cachedBoardConfig, _cachedBoardConfig$co, data;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
-            bookingConfigParams = state.bookingConfigParams; // 获取board设置
-            _context2.next = 3;
+            bookingConfigParams = state.bookingConfigParams;
+            isHasCache = false; // 1. 如果是首次加载，尝试从缓存中获取数据
+            if (_isFirstLoadBoardConfigRef.current && osKey) {
+              cachedBoardConfig = getBoardConfigCache(osKey);
+              if (cachedBoardConfig) {
+                isHasCache = true;
+                // 先展示缓存数据
+                setState({
+                  bookingConfig: cachedBoardConfig
+                });
+                console.log('[BoardConfigCache] 使用缓存数据展示');
+
+                // 如果缓存数据中有 quick_time 配置，也加载快捷时间产品
+                if (cachedBoardConfig !== null && cachedBoardConfig !== void 0 && (_cachedBoardConfig$co = cachedBoardConfig.config) !== null && _cachedBoardConfig$co !== void 0 && (_cachedBoardConfig$co = _cachedBoardConfig$co.information_tab) !== null && _cachedBoardConfig$co !== void 0 && (_cachedBoardConfig$co = _cachedBoardConfig$co.appointment_card) !== null && _cachedBoardConfig$co !== void 0 && _cachedBoardConfig$co.quick_time) {
+                  _getAddTimeProducts();
+                }
+              }
+              _isFirstLoadBoardConfigRef.current = false;
+            }
+
+            // 2. 无论是否有缓存，都调用接口获取最新数据
+            _context2.prev = 3;
+            _context2.next = 6;
             return getBookingConfig(_objectSpread({}, bookingConfigParams));
-          case 3:
+          case 6:
             data = _context2.sent;
-            if (data !== null && data !== void 0 && (_data$config = data.config) !== null && _data$config !== void 0 && (_data$config = _data$config.information_tab) !== null && _data$config !== void 0 && (_data$config = _data$config.appointment_card) !== null && _data$config !== void 0 && _data$config.quick_time) {
-              _getAddTimeProducts();
+            if (!isHasCache) {
+              setState({
+                bookingConfig: data
+              });
             }
-            setState({
-              bookingConfig: data
-            });
-          case 6:
+            // 4. 将新数据缓存到 storage
+            if (osKey && data) {
+              setBoardConfigCache(osKey, data);
+              console.log('[BoardConfigCache] 已更新缓存');
+            }
+            _context2.next = 14;
+            break;
+          case 11:
+            _context2.prev = 11;
+            _context2.t0 = _context2["catch"](3);
+            console.error('[BoardConfigCache] 获取配置失败:', _context2.t0);
+          case 14:
           case "end":
             return _context2.stop();
         }
-      }, _callee2);
+      }, _callee2, null, [[3, 11]]);
     }));
     return function _getBoardConfig() {
       return _ref2.apply(this, arguments);
@@ -894,8 +956,8 @@ var TicketBooking = function TicketBooking(props) {
     setState(_objectSpread(_objectSpread({}, initState), {}, _defineProperty(_defineProperty({}, state.renderType === 'eventBooking' ? 'eventOpen' : 'open', true), "bookingId", state.bookingId)));
   };
   var _rebook = useMemoizedFn(function () {
-    var _state$bookingConfig;
-    var date = getNextTimeSlice(((_state$bookingConfig = state.bookingConfig) === null || _state$bookingConfig === void 0 || (_state$bookingConfig = _state$bookingConfig.config) === null || _state$bookingConfig === void 0 || (_state$bookingConfig = _state$bookingConfig.basic) === null || _state$bookingConfig === void 0 ? void 0 : _state$bookingConfig.service_time.value) || 10);
+    var _state$bookingConfig2;
+    var date = getNextTimeSlice(((_state$bookingConfig2 = state.bookingConfig) === null || _state$bookingConfig2 === void 0 || (_state$bookingConfig2 = _state$bookingConfig2.config) === null || _state$bookingConfig2 === void 0 || (_state$bookingConfig2 = _state$bookingConfig2.basic) === null || _state$bookingConfig2 === void 0 ? void 0 : _state$bookingConfig2.service_time.value) || 10);
     setState({
       rebookState: _objectSpread(_objectSpread({}, state.rebookState), {}, {
         open: true,
@@ -1144,9 +1206,9 @@ var TicketBooking = function TicketBooking(props) {
     });
   });
   var currentDate = useMemo(function () {
-    var _state$modalState3;
-    return (_state$modalState3 = state.modalState) === null || _state$modalState3 === void 0 || (_state$modalState3 = _state$modalState3.date) === null || _state$modalState3 === void 0 || (_state$modalState3 = _state$modalState3.value) === null || _state$modalState3 === void 0 ? void 0 : _state$modalState3.format('YYYY-MM-DD');
-  }, [(_state$modalState4 = state.modalState) === null || _state$modalState4 === void 0 || (_state$modalState4 = _state$modalState4.date) === null || _state$modalState4 === void 0 ? void 0 : _state$modalState4.value]);
+    var _state$modalState4;
+    return (_state$modalState4 = state.modalState) === null || _state$modalState4 === void 0 || (_state$modalState4 = _state$modalState4.date) === null || _state$modalState4 === void 0 || (_state$modalState4 = _state$modalState4.value) === null || _state$modalState4 === void 0 ? void 0 : _state$modalState4.format('YYYY-MM-DD');
+  }, [(_state$modalState5 = state.modalState) === null || _state$modalState5 === void 0 || (_state$modalState5 = _state$modalState5.date) === null || _state$modalState5 === void 0 ? void 0 : _state$modalState5.value]);
   var floatButtons = useMemo(function () {
     return [{
       icon: /*#__PURE__*/React.createElement(Iconfont, {
@@ -1276,6 +1338,7 @@ var TicketBooking = function TicketBooking(props) {
       isBookingTicket2: true
     }),
     setGlobalState: _setModalState,
+    onGetProductsReady: handleGetProductsReady,
     productDisplayConfig: productDisplayConfig
   }), isShowFloatButtons && /*#__PURE__*/React.createElement(FloatButtons, {
     items: floatButtons

package/es/components/ticketBooking/components/timeBar/index.d.ts

@@ -8,6 +8,7 @@ interface ITimeBarProps {
     setIntervalTime: (value: boolean) => void;
     locale: string;
     onCreateClick: () => void;
+    setNowTime?: (time: Dayjs) => void;
 }
 declare const TimeBar: (props: ITimeBarProps) => JSX.Element;
 export default TimeBar;

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

@@ -18,7 +18,8 @@ var TimeBar = function TimeBar(props) {
   var state = props.globalState,
     setGlobalState = props.setGlobalState,
     locale = props.locale,
-    onCreateClick = props.onCreateClick;
+    onCreateClick = props.onCreateClick,
+    setNowTime = props.setNowTime;
   var _onClickNext = useMemoizedFn(function () {
     var _state$modalState, _props$onDateChange, _props$setIntervalTim;
     var currentTime = (_state$modalState = state.modalState) === null || _state$modalState === void 0 || (_state$modalState = _state$modalState.date) === null || _state$modalState === void 0 ? void 0 : _state$modalState.value;
@@ -35,10 +36,12 @@ var TimeBar = function TimeBar(props) {
   });
   var _onClickToday = useMemoizedFn(function () {
     var _props$setIntervalTim3;
+    setNowTime === null || setNowTime === void 0 || setNowTime(dayjs());
     (_props$setIntervalTim3 = props.setIntervalTime) === null || _props$setIntervalTim3 === void 0 || _props$setIntervalTim3.call(props, true);
   });
   var _onClickNow = useMemoizedFn(function () {
     var _props$setIntervalTim4;
+    setNowTime === null || setNowTime === void 0 || setNowTime(dayjs());
     (_props$setIntervalTim4 = props.setIntervalTime) === null || _props$setIntervalTim4 === void 0 || _props$setIntervalTim4.call(props, true);
   });
 

package/es/components/ticketBooking/context/OsKeyContext.d.ts

@@ -22,5 +22,5 @@ export declare const OsKeyProvider: React.FC<OsKeyProviderProps>;
  * useOsKey Hook
  * 在子组件中使用此 hook 获取 osKey
  */
-export declare const useOsKey: () => string | undefined;
+export declare const useOsKey: () => string;
 export default OsKeyContext;

package/es/components/ticketBooking/context/OsKeyContext.js

@@ -32,6 +32,6 @@ export var useOsKey = function useOsKey() {
   if (!context) {
     throw new Error('useOsKey must be used within an OsKeyProvider');
   }
-  return context.osKey;
+  return (context === null || context === void 0 ? void 0 : context.osKey) || "ticket";
 };
 export default OsKeyContext;

package/es/components/ticketBooking/hooks/pisellos/bookingTicket.js

@@ -12,6 +12,6 @@ export var useBookingTicket = function useBookingTicket() {
   var osKey = useOsKey();
 
   // 根据 osKey 生成模块名称
-  var moduleKey = getBookingTicketKey(osKey || '');
+  var moduleKey = getBookingTicketKey(osKey || 'ticket');
   return pisellOS.getModule(moduleKey);
 };

package/es/components/ticketBooking/hooks/pisellos/useProducts.d.ts

@@ -4,7 +4,11 @@ interface IGetProductsParams {
     menu_list_ids?: number[];
     schedule_datetime?: string;
 }
+interface IGetScheduleTimePointsParams {
+    menu_list_ids?: number[];
+}
 export declare const useProducts: () => {
+    getScheduleTimePoints: (params?: IGetScheduleTimePointsParams) => Promise<void>;
     getProducts: (params?: IGetProductsParams) => Promise<void>;
     products: any[];
     loading: boolean;

package/es/components/ticketBooking/hooks/pisellos/useProducts.js

@@ -1,4 +1,9 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 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); }); }; }
@@ -10,9 +15,12 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { useMemoizedFn } from 'ahooks';
 import { useBookingTicket } from "./bookingTicket";
-import { useState } from 'react';
+import { useState, useEffect, useRef } from 'react';
+import useEngineContext from "../../../../hooks/useEngineContext";
+import dayjs from 'dayjs';
 export var useProducts = function useProducts() {
   var bookingTicket = useBookingTicket();
+  var context = useEngineContext();
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
     products = _useState2[0],
@@ -21,6 +29,14 @@ export var useProducts = function useProducts() {
     _useState4 = _slicedToArray(_useState3, 2),
     loading = _useState4[0],
     setLoading = _useState4[1];
+
+  // 日程时间段列表 HH:mm格式
+  var _useState5 = useState([]),
+    _useState6 = _slicedToArray(_useState5, 2),
+    scheduleTimePoints = _useState6[0],
+    setScheduleTimePoints = _useState6[1];
+  var scheduledTaskQueueIdRef = useRef('booking-schedule-products');
+  var paramsRef = useRef(undefined);
   var getProducts = useMemoizedFn( /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(params) {
       var products;
@@ -28,13 +44,14 @@ export var useProducts = function useProducts() {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             setLoading(true);
-            _context.next = 3;
+            paramsRef.current = params;
+            _context.next = 4;
             return bookingTicket.loadProducts(params);
-          case 3:
+          case 4:
             products = _context.sent;
             setProducts(products);
             setLoading(false);
-          case 6:
+          case 7:
           case "end":
             return _context.stop();
         }
@@ -44,7 +61,127 @@ export var useProducts = function useProducts() {
       return _ref.apply(this, arguments);
     };
   }());
+
+  // 注册任务函数并在 scheduleTimePoints 改变时添加定时任务
+  useEffect(function () {
+    try {
+      var _context$appHelper, _context$appHelper$ge;
+      var app = context === null || context === void 0 || (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 || (_context$appHelper = _context$appHelper.utils) === null || _context$appHelper === void 0 || (_context$appHelper$ge = _context$appHelper.getApp) === null || _context$appHelper$ge === void 0 ? void 0 : _context$appHelper$ge.call(_context$appHelper);
+      if (!app || !app.tasksManager) {
+        console.warn('App 或 tasksManager 不可用');
+        return;
+      }
+
+      // 注册 getProducts 任务函数
+      app.tasksManager.addTaskFunction('getProducts', /*#__PURE__*/function () {
+        var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref2) {
+          var task;
+          return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+            while (1) switch (_context2.prev = _context2.next) {
+              case 0:
+                task = _ref2.task;
+                console.log('定时执行 getProducts，参数：', task.payload);
+                _context2.next = 4;
+                return getProducts(task.payload);
+              case 4:
+                return _context2.abrupt("return", {
+                  status: 'success'
+                });
+              case 5:
+              case "end":
+                return _context2.stop();
+            }
+          }, _callee2);
+        }));
+        return function (_x2) {
+          return _ref3.apply(this, arguments);
+        };
+      }());
+
+      // 如果有 scheduleTimePoints，创建定时任务
+      if (scheduleTimePoints && scheduleTimePoints.length > 0) {
+        // 先清除之前的定时任务
+        app.tasksManager.clearTasks({
+          module: 'scheduledTasks',
+          queueId: scheduledTaskQueueIdRef.current
+        });
+
+        // 为每个时间点创建定时任务
+        var tasks = scheduleTimePoints.map(function (timePoint) {
+          // 将 HH:mm 格式转换为今天的完整时间格式
+          var _timePoint$split = timePoint.split(':'),
+            _timePoint$split2 = _slicedToArray(_timePoint$split, 2),
+            hours = _timePoint$split2[0],
+            minutes = _timePoint$split2[1];
+          var executeAt = dayjs().hour(parseInt(hours, 10)).minute(parseInt(minutes, 10)).second(4).format('YYYY-MM-DD HH:mm:ss');
+          return {
+            action: 'getProducts',
+            payload: _objectSpread(_objectSpread({}, paramsRef.current), {}, {
+              schedule_datetime: executeAt
+            }),
+            scheduled: {
+              executeAt: executeAt
+            }
+          };
+        });
+
+        // 添加定时任务到 scheduledTasks 模块
+        app.tasksManager.addTask({
+          module: 'scheduledTasks',
+          queueId: scheduledTaskQueueIdRef.current,
+          tasks: tasks
+        });
+
+        // 开始执行定时任务队列
+        app.tasksManager.run({
+          module: 'scheduledTasks',
+          queueId: scheduledTaskQueueIdRef.current
+        });
+        console.log("\u5DF2\u4E3A ".concat(tasks.length, " \u4E2A\u65F6\u95F4\u70B9\u521B\u5EFA\u5B9A\u65F6\u4EFB\u52A1"));
+      }
+    } catch (error) {
+      console.error('创建定时任务失败：', error);
+    }
+
+    // 清理函数：组件卸载时清除定时任务
+    return function () {
+      try {
+        var _context$appHelper2, _context$appHelper2$g;
+        var _app = context === null || context === void 0 || (_context$appHelper2 = context.appHelper) === null || _context$appHelper2 === void 0 || (_context$appHelper2 = _context$appHelper2.utils) === null || _context$appHelper2 === void 0 || (_context$appHelper2$g = _context$appHelper2.getApp) === null || _context$appHelper2$g === void 0 ? void 0 : _context$appHelper2$g.call(_context$appHelper2);
+        if (_app && _app.tasksManager) {
+          _app.tasksManager.clearTasks({
+            module: 'scheduledTasks',
+            queueId: scheduledTaskQueueIdRef.current
+          });
+        }
+      } catch (error) {
+        console.error('清理定时任务失败：', error);
+      }
+    };
+  }, [scheduleTimePoints]);
+  var getScheduleTimePoints = useMemoizedFn( /*#__PURE__*/function () {
+    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(params) {
+      var scheduleTimePoints;
+      return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+        while (1) switch (_context3.prev = _context3.next) {
+          case 0:
+            _context3.next = 2;
+            return bookingTicket.getScheduleTimePoints(params);
+          case 2:
+            scheduleTimePoints = _context3.sent;
+            setScheduleTimePoints(scheduleTimePoints);
+          case 4:
+          case "end":
+            return _context3.stop();
+        }
+      }, _callee3);
+    }));
+    return function (_x3) {
+      return _ref4.apply(this, arguments);
+    };
+  }());
   return {
+    getScheduleTimePoints: getScheduleTimePoints,
     getProducts: getProducts,
     products: products,
     loading: loading

package/es/components/ticketBooking/hooks/pisellos/useShopDiscountModule.js

@@ -12,6 +12,6 @@ export var useShopDiscountModule = function useShopDiscountModule() {
   var osKey = useOsKey();
 
   // 根据 osKey 生成模块名称
-  var moduleKey = getShopDiscountKey(osKey || '');
+  var moduleKey = getShopDiscountKey(osKey || 'ticket');
   return pisellOS.getModule(moduleKey);
 };

package/es/components/ticketBooking/index.js

@@ -147,9 +147,9 @@ export default (function (props) {
   var _context$appHelper, _context$appHelper$ut2, _context$appHelper$ut3, _context$appHelper$ut4, _context$appHelper$ut5;
   var productExtensionType = props.productExtensionType,
     propsBookingConfigParams = props.bookingConfigParams,
-    onPrerenderComplete = props.onPrerenderComplete,
     _props$isShowMenuBar = props.isShowMenuBar,
     isShowMenuBar = _props$isShowMenuBar === void 0 ? true : _props$isShowMenuBar,
+    onPrerenderComplete = props.onPrerenderComplete,
     _props$isShowTimeBar = props.isShowTimeBar,
     propsIsShowTimeBar = _props$isShowTimeBar === void 0 ? true : _props$isShowTimeBar,
     _props$isShowFloatBut = props.isShowFloatButtons,

package/es/components/ticketBooking/utils/index.d.ts

@@ -41,7 +41,7 @@ declare type ScanData = {
     };
 };
 export declare const formatScanCustomer: (data: ScanData) => {
-    searchType: "customer" | "product" | "wallet" | "walletPass" | "local_product";
+    searchType: "product" | "customer" | "wallet" | "walletPass" | "local_product";
     data: any;
     scanCode: string;
 } | null;
@@ -86,4 +86,5 @@ export declare const rulesHooks: {
         _extend: any;
     };
 };
-export {};
+export { getCache, setCache, clearCache, clearAllCache, clearAllCacheByOsKey, getProductCache, setProductCache, clearProductCache, clearAllProductCache, getBoardConfigCache, setBoardConfigCache, clearBoardConfigCache, } from './productCache';
+export type { CacheType } from './productCache';

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

@@ -138,8 +138,24 @@ export var addService = function addService(list, addItem, state) {
   var count;
   // 预约商品 并且配置商品卡片不叠加 直接添加
   if (!isNormalProductByDurationSchedule(addItem) && !getIsOverlayProduct(addItem, state)) {
-    value.unshift(addItem);
-    count = addItem._extend.quantity;
+    // 不能合并的商品，如果 quantity > 1，需要拆分成多个独立卡片
+    var quantity = addItem._extend.quantity || 1;
+    count = quantity;
+    for (var i = 0; i < quantity; i++) {
+      var _addItem$_extend;
+      // 每个卡片都是独立的，quantity 为 1
+      var singleItem = _objectSpread(_objectSpread({}, addItem), {}, {
+        _id: getUniqueId(),
+        // 每个卡片都有独立的 ID
+        _extend: _objectSpread(_objectSpread({}, addItem._extend), {}, {
+          quantity: 1,
+          other: _objectSpread(_objectSpread({}, ((_addItem$_extend = addItem._extend) === null || _addItem$_extend === void 0 ? void 0 : _addItem$_extend.other) || {}), {}, {
+            quantity: 1
+          })
+        })
+      });
+      value.unshift(singleItem);
+    }
   } else {
     // 非预约商品判断是否相同，相同合并
     var isNotSame = true;
@@ -152,16 +168,16 @@ export var addService = function addService(list, addItem, state) {
       });
       var isEdit = item === null || item === void 0 ? void 0 : item.edit;
       if (isSameProduct(item, addItem) && !isSetCount && !isGoodPassDiscountProduct && !isEdit) {
-        var _item$_extend, _addItem$_extend, _item$_extend2;
+        var _item$_extend, _addItem$_extend2, _item$_extend2;
         isNotSame = false;
-        var quantity = ((item === null || item === void 0 || (_item$_extend = item._extend) === null || _item$_extend === void 0 ? void 0 : _item$_extend.quantity) || 1) + ((addItem === null || addItem === void 0 || (_addItem$_extend = addItem._extend) === null || _addItem$_extend === void 0 ? void 0 : _addItem$_extend.quantity) || 1);
-        count = quantity;
+        var _quantity = ((item === null || item === void 0 || (_item$_extend = item._extend) === null || _item$_extend === void 0 ? void 0 : _item$_extend.quantity) || 1) + ((addItem === null || addItem === void 0 || (_addItem$_extend2 = addItem._extend) === null || _addItem$_extend2 === void 0 ? void 0 : _addItem$_extend2.quantity) || 1);
+        count = _quantity;
         isSetCount = true;
         return _objectSpread(_objectSpread({}, item), {}, {
           _extend: _objectSpread(_objectSpread({}, item._extend), {}, {
-            quantity: quantity,
+            quantity: _quantity,
             other: _objectSpread(_objectSpread({}, ((_item$_extend2 = item._extend) === null || _item$_extend2 === void 0 ? void 0 : _item$_extend2.other) || {}), {}, {
-              quantity: quantity
+              quantity: _quantity
             })
           })
         });
@@ -372,4 +388,13 @@ export var rulesHooks = {
     });
     return detail;
   }
-};
+};
+
+// 导出缓存工具函数
+export {
+// 通用缓存函数
+getCache, setCache, clearCache, clearAllCache, clearAllCacheByOsKey,
+// 产品缓存
+getProductCache, setProductCache, clearProductCache, clearAllProductCache,
+// BoardConfig 缓存
+getBoardConfigCache, setBoardConfigCache, clearBoardConfigCache } from "./productCache";