@pisell/private-materials 6.4.70 → 6.4.72

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

@@ -13,7 +13,15 @@ import { useBookingTicket } from "./bookingTicket";
 import { useState, useRef } from 'react';
 import { useOsKey } from "../../context/OsKeyContext";
 import { getProductCache, setProductCache } from "../../utils/productCache";
+import { useEngineContext } from "../../../../hooks";
+// 等待函数
+var sleep = function sleep(ms) {
+  return new Promise(function (resolve) {
+    return setTimeout(resolve, ms);
+  });
+};
 export var useProducts = function useProducts(notAvailableRef) {
+  var _context$appHelper;
   var bookingTicket = useBookingTicket();
   var osKey = useOsKey();
   var _useState = useState([]),
@@ -26,17 +34,21 @@ export var useProducts = function useProducts(notAvailableRef) {
     setLoading = _useState4[1];
   var isFirstLoadRef = useRef(true);
   var isFirstLoadDataRef = useRef(true);
+  var context = useEngineContext();
+  var _ref = ((_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.utils) || {},
+    getApp = _ref.getApp;
+  var app = getApp();
   var getProducts = useMemoizedFn( /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(params) {
-      var cachedProducts, freshProducts, _notAvailableRef$curr;
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(params) {
+      var cachedProducts, maxRetries, lastError, freshProducts, attempt, _app$logger, _app$logger$addLog, _app$logger2, _app$logger3, _app$logger3$addLog, _lastError, _notAvailableRef$curr;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             // 1. 如果是首次加载，尝试从缓存中获取数据
             if (isFirstLoadRef.current && osKey) {
               cachedProducts = getProductCache(osKey);
-              if (cachedProducts) {
-                // 先展示缓存数据
+              if (cachedProducts && cachedProducts.length > 0) {
+                // 先展示缓存数据（只有非空时才展示）
                 setProducts(cachedProducts);
                 setLoading(false);
               }
@@ -45,45 +57,107 @@ export var useProducts = function useProducts(notAvailableRef) {
               setLoading(true);
             }
 
-            // 2. 无论是否有缓存，都调用接口获取最新数据
-            _context.prev = 1;
-            _context.next = 4;
+            // 2. 重试逻辑：最多尝试3次，每次等待1秒
+            maxRetries = 3;
+            lastError = null;
+            freshProducts = [];
+            attempt = 1;
+          case 5:
+            if (!(attempt <= maxRetries)) {
+              _context.next = 33;
+              break;
+            }
+            _context.prev = 6;
+            console.log("[ProductCache] \u5C1D\u8BD5\u52A0\u8F7D\u6570\u636E\uFF0C\u7B2C ".concat(attempt, "/").concat(maxRetries, " \u6B21"));
+            _context.next = 10;
             return bookingTicket.loadProducts(params);
-          case 4:
+          case 10:
             freshProducts = _context.sent;
-            isFirstLoadDataRef.current = false;
-            // 3. 更新展示数据
-            setProducts(freshProducts);
+            if (!(freshProducts && freshProducts.length > 0)) {
+              _context.next = 14;
+              break;
+            }
+            console.log("[ProductCache] \u7B2C ".concat(attempt, " \u6B21\u5C1D\u8BD5\u6210\u529F\uFF0C\u83B7\u53D6\u5230 ").concat(freshProducts.length, " \u6761\u6570\u636E"));
+            return _context.abrupt("break", 33);
+          case 14:
+            // 数据为空，记录并准备重试
+            console.log("[ProductCache] \u7B2C ".concat(attempt, " \u6B21\u5C1D\u8BD5\u8FD4\u56DE\u7A7A\u6570\u636E"));
+            if (!(attempt < maxRetries)) {
+              _context.next = 19;
+              break;
+            }
+            console.log("[ProductCache] \u7B49\u5F85 1 \u79D2\u540E\u91CD\u8BD5...");
+            _context.next = 19;
+            return sleep(1000);
+          case 19:
+            _context.next = 30;
+            break;
+          case 21:
+            _context.prev = 21;
+            _context.t0 = _context["catch"](6);
+            lastError = _context.t0;
+            console.log("[ProductCache] \u7B2C ".concat(attempt, " \u6B21\u5C1D\u8BD5\u5931\u8D25:"), _context.t0);
+            app === null || app === void 0 || (_app$logger = app.logger) === null || _app$logger === void 0 || (_app$logger$addLog = (_app$logger2 = _app$logger).addLog) === null || _app$logger$addLog === void 0 || _app$logger$addLog.call(_app$logger2, {
+              type: 'info',
+              title: "[getProduct] bookingTicket.loadProducts error (attempt ".concat(attempt, "/").concat(maxRetries, ")"),
+              metadata: {
+                error: _context.t0,
+                attempt: attempt
+              }
+            });
 
-            // 4. 将新数据缓存到 storage
-            if (osKey) {
-              setProductCache(osKey, freshProducts);
-              console.log('[ProductCache] 已更新缓存');
+            // 如果还有重试机会，等待后继续
+            if (!(attempt < maxRetries)) {
+              _context.next = 30;
+              break;
             }
-            _context.next = 16;
+            console.log("[ProductCache] \u7B49\u5F85 1 \u79D2\u540E\u91CD\u8BD5...");
+            _context.next = 30;
+            return sleep(1000);
+          case 30:
+            attempt++;
+            _context.next = 5;
             break;
-          case 10:
-            _context.prev = 10;
-            _context.t0 = _context["catch"](1);
-            // 只有在第一次加载或之前有数据时才显示 notAvailable
-            if ((_context.t0 === null || _context.t0 === void 0 ? void 0 : _context.t0.code) === 607100 && (isFirstLoadDataRef.current || products.length > 0)) {
-              (_notAvailableRef$curr = notAvailableRef.current) === null || _notAvailableRef$curr === void 0 || _notAvailableRef$curr.open();
+          case 33:
+            // 3. 处理最终结果
+            if (freshProducts && freshProducts.length > 0) {
+              // 成功获取到数据
+              isFirstLoadDataRef.current = false;
+              setProducts(freshProducts);
+
+              // 将新数据缓存到 storage
+              if (osKey) {
+                setProductCache(osKey, freshProducts);
+                console.log('[ProductCache] 已更新缓存');
+              }
+              setLoading(false);
+            } else {
+              // 3次尝试后仍然没有数据
+              console.log('[ProductCache] 3次尝试后仍未获取到数据');
+              app === null || app === void 0 || (_app$logger3 = app.logger) === null || _app$logger3 === void 0 || (_app$logger3$addLog = _app$logger3.addLog) === null || _app$logger3$addLog === void 0 || _app$logger3$addLog.call(_app$logger3, {
+                type: 'error',
+                title: '[getProduct] 3次尝试后仍未获取到数据',
+                metadata: {
+                  error: lastError
+                }
+              });
+
+              // 只有在第一次加载或之前有数据时才显示 notAvailable
+              if (((_lastError = lastError) === null || _lastError === void 0 ? void 0 : _lastError.code) === 607100 && (isFirstLoadDataRef.current || products.length > 0)) {
+                (_notAvailableRef$curr = notAvailableRef.current) === null || _notAvailableRef$curr === void 0 || _notAvailableRef$curr.open();
+              }
+              setLoading(false);
+              setProducts([]);
+              isFirstLoadDataRef.current = false;
             }
-            setLoading(false);
-            setProducts([]);
-            isFirstLoadDataRef.current = false;
-          case 16:
-            _context.prev = 16;
-            setLoading(false);
-            return _context.finish(16);
-          case 19:
+          case 34:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[1, 10, 16, 19]]);
+      }, _callee, null, [[6, 21]]);
     }));
     return function (_x) {
-      return _ref.apply(this, arguments);
+      return _ref2.apply(this, arguments);
     };
   }());
   return {

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

@@ -15,9 +15,14 @@ export declare const restoreProductOtherData: (data: any) => {
     quantity: number;
 } | undefined;
 export declare const isSameProduct: (a: any, b: any) => boolean;
-export declare const addService: (list: any[], addItem: any, state: any) => {
+export declare const addService: (list: any[], addItem: any, state: any, isMultiDay?: boolean) => {
+    list: any[];
+    count: number;
+    quantity?: undefined;
+} | {
     list: any[];
     quantity: any;
+    count?: undefined;
 };
 export declare const addServiceScroll: (rowKey: string, cacheItem: any) => void;
 export declare const getCartProductOverlay: (state: any) => any;

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

@@ -2,10 +2,14 @@ var _excluded = ["detail"];
 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 _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 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; }
@@ -16,6 +20,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 import dayjs from 'dayjs';
 import { isNormalProductByDurationSchedule } from "../../booking/info/service2/utils";
 import { isArr, getUniqueId } from '@pisell/utils';
+import { isMultiDayProduct } from "../../booking/info2/service/addService/utils";
 
 /** dayjs对象格式化为字符串时间 */
 export var formatDateToStr = function formatDateToStr(date) {
@@ -133,9 +138,18 @@ export var isSameProduct = function isSameProduct(a, b) {
   }
   return ((_a$_extend2 = a._extend) === null || _a$_extend2 === void 0 || (_a$_extend2 = _a$_extend2.other) === null || _a$_extend2 === void 0 ? void 0 : _a$_extend2.rowKey) === ((_b$_extend2 = b._extend) === null || _b$_extend2 === void 0 || (_b$_extend2 = _b$_extend2.other) === null || _b$_extend2 === void 0 ? void 0 : _b$_extend2.rowKey) && a._serviceKey === b._serviceKey;
 };
-export var addService = function addService(list, addItem, state) {
+export var addService = function addService(list, addItem, state, isMultiDay) {
   var value = list;
   var count;
+
+  // 跨日预约 不需要叠加
+  if (isMultiDay && isArr(addItem)) {
+    return {
+      list: [].concat(_toConsumableArray(addItem), _toConsumableArray(value)),
+      count: 1
+    };
+  }
+
   // 预约商品 并且配置商品卡片不叠加 直接添加
   if (!isNormalProductByDurationSchedule(addItem) && !getIsOverlayProduct(addItem, state)) {
     value.unshift(addItem);
@@ -232,6 +246,10 @@ export var getIsOverlayProduct = function getIsOverlayProduct(item, state) {
 // 获取购物车商品是否显示数量
 export var getIsShowNumber = function getIsShowNumber(item, state) {
   var isBookingTicket2 = state.isBookingTicket2;
+  // 跨日商品不允许选多个
+  if (isMultiDayProduct(item)) {
+    return false;
+  }
   return isNormalProductByDurationSchedule(item) || isBookingTicket2 && getIsOverlayProduct(item, state);
 };
 

package/es/components/wallet/Detail/model.d.ts

@@ -1,13 +1 @@
-/// <reference types="react" />
-interface RechargeState {
-    addWalletCard: any;
-}
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    walletDetailState: RechargeState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
-export {};
+export declare const Provider: any, Context: any;

package/es/components/wallet/DiscountCard/model.d.ts

@@ -1,14 +1 @@
-/// <reference types="react" />
-interface RechargeState {
-    total: number;
-    setup?: 'menu' | 'list' | 'detail' | string;
-}
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: RechargeState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
-export {};
+export declare const Provider: any, Context: any;

package/es/components/wallet/PointCard/model.d.ts

@@ -1,13 +1 @@
-/// <reference types="react" />
-interface RechargeState {
-    total: number;
-}
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: RechargeState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
-export {};
+export declare const Provider: any, Context: any;

package/es/components/wallet/RechargeableCard/model.d.ts

@@ -1,29 +1 @@
-/// <reference types="react" />
-interface RechargeState {
-    selectedGiftOptionId: string | null;
-    cardList: Array<{
-        id: string;
-        name: string;
-        price: number;
-    }>;
-    selectedItem: {
-        id?: string;
-        gift_price?: number;
-        price?: number;
-        name?: string;
-        variant_id?: string;
-    };
-    productId?: string;
-    detailId?: string;
-    total: string | number;
-    rechargeModalOpen: boolean;
-}
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: RechargeState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
-export {};
+export declare const Provider: any, Context: any;

package/es/components/wallet/Voucher/model.d.ts

@@ -1,13 +1 @@
-/// <reference types="react" />
-interface RechargeState {
-    total: 0;
-}
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: RechargeState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
-export {};
+export declare const Provider: any, Context: any;

package/es/components/wallet/model.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { IWalletListItemProps } from './serve';
 export interface WalletCardItemProps {
     id: string;
@@ -27,11 +26,4 @@ export interface WalletListProps {
     currentSearchListItemCode?: string;
     [key: string]: any;
 }
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    global_wallet: WalletListProps;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
+export declare const Provider: any, Context: any;

package/es/pro/multiDayTimeSelect/MultiDayTimeSelect.d.ts

@@ -0,0 +1,9 @@
+import React from 'react';
+import { MultiDayTimeSelectProps, MultiDayTimeSelectValue } from './types';
+import './MultiDayTimeSelect.less';
+export interface MultiDayTimeSelectRef {
+    validate: () => Promise<void>;
+    getValue: () => MultiDayTimeSelectValue | null;
+}
+declare const MultiDayTimeSelect: React.ForwardRefExoticComponent<MultiDayTimeSelectProps & React.RefAttributes<MultiDayTimeSelectRef>>;
+export default MultiDayTimeSelect;