@pisell/private-materials 6.4.69 → 6.4.71

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

@@ -117,7 +117,7 @@ export var formatProductBundle = function formatProductBundle(bundle) {
       // checkout 2.0 新增
       "price_type": d === null || d === void 0 ? void 0 : d.price_type,
       // checkout 2.0 新增
-      "custom_price": new Decimal(d === null || d === void 0 ? void 0 : d.price).sub(option_price).toNumber().toFixed(2),
+      "custom_price": Math.abs(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/forms/sendModal/useSendModal.d.ts

@@ -4,6 +4,6 @@ declare const useSendModal: (bookingId?: number) => {
     setOpen: import("react").Dispatch<import("react").SetStateAction<boolean>>;
     handleOpen: () => void;
     handleValuesChange: (val: any) => void;
-    handleOk: (values: SendModalValues) => Promise<any>;
+    handleOk: (values: SendModalValues) => Promise<boolean | undefined>;
 };
 export default useSendModal;

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

@@ -350,11 +350,6 @@ var CartClientCard = /*#__PURE__*/forwardRef(function (_ref, ref) {
       setHandleSetClient(handleSetClient);
     }
   }, [isActive]);
-  useEffect(function () {
-    return function () {
-      setHandleSetClient(null);
-    };
-  }, [isActive]);
   var tags = useMemo(function () {
     var _latest_wallet_detail;
     if (!selectedCustomer) return;

package/es/components/checkout/hooks/useWalletPass.d.ts

@@ -17,7 +17,7 @@ export declare const useWalletPass: (props: {
     cardData: any;
     handleSelectWallet: (value: number[]) => void;
     selectedWalletIds: any[];
-    expiredWalletIds: any;
+    expiredWalletIds: any[];
     expiredWalletData: any;
     disabledWalletData: any[];
     clearAllSelectedWallet: () => void;

package/es/components/eftposPay/hooks.d.ts

@@ -19,7 +19,7 @@ export declare const useStoreRef: <T extends {
     readonly netRef: React.MutableRefObject<boolean | undefined>;
     readonly symbolRef: React.MutableRefObject<string>;
     readonly amountRef: React.MutableRefObject<string | number>;
-    readonly eftposRef: React.MutableRefObject<"stripe" | "tyro" | "windcave" | "payo" | "linkly">;
+    readonly eftposRef: React.MutableRefObject<"stripe" | "payo" | "tyro" | "windcave" | "linkly">;
     readonly clientRef: React.MutableRefObject<ClientEnum>;
     readonly dataRef: React.MutableRefObject<import("./store").State>;
 };

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

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

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/lib/components/booking/components/footer/utils.js

@@ -120,7 +120,7 @@ var formatProductBundle = (bundle) => {
       // checkout 2.0 新增
       "price_type": d == null ? void 0 : d.price_type,
       // checkout 2.0 新增
-      "custom_price": new import_decimal.default(d == null ? void 0 : d.price).sub(option_price).toNumber().toFixed(2),
+      "custom_price": Math.abs(new import_decimal.default(d == null ? void 0 : d.price).sub(option_price).toNumber()).toFixed(2),
       "custom_price_type": d == null ? void 0 : d.price_type,
       "option": option
     };

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

@@ -4,6 +4,6 @@ declare const useSendModal: (bookingId?: number) => {
     setOpen: import("react").Dispatch<import("react").SetStateAction<boolean>>;
     handleOpen: () => void;
     handleValuesChange: (val: any) => void;
-    handleOk: (values: SendModalValues) => Promise<any>;
+    handleOk: (values: SendModalValues) => Promise<boolean | undefined>;
 };
 export default useSendModal;

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

@@ -262,11 +262,6 @@ var CartClientCard = (0, import_react.forwardRef)(({
       (0, import_utils3.setHandleSetClient)(handleSetClient);
     }
   }, [isActive]);
-  (0, import_react.useEffect)(() => {
-    return () => {
-      (0, import_utils3.setHandleSetClient)(null);
-    };
-  }, [isActive]);
   const tags = (0, import_react.useMemo)(() => {
     var _a2;
     if (!selectedCustomer) return;

package/lib/components/checkout/hooks/useWalletPass.d.ts

@@ -17,7 +17,7 @@ export declare const useWalletPass: (props: {
     cardData: any;
     handleSelectWallet: (value: number[]) => void;
     selectedWalletIds: any[];
-    expiredWalletIds: any;
+    expiredWalletIds: any[];
     expiredWalletData: any;
     disabledWalletData: any[];
     clearAllSelectedWallet: () => void;

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

@@ -19,7 +19,7 @@ export declare const useStoreRef: <T extends {
     readonly netRef: React.MutableRefObject<boolean | undefined>;
     readonly symbolRef: React.MutableRefObject<string>;
     readonly amountRef: React.MutableRefObject<string | number>;
-    readonly eftposRef: React.MutableRefObject<"stripe" | "tyro" | "windcave" | "payo" | "linkly">;
+    readonly eftposRef: React.MutableRefObject<"stripe" | "payo" | "tyro" | "windcave" | "linkly">;
     readonly clientRef: React.MutableRefObject<ClientEnum>;
     readonly dataRef: React.MutableRefObject<import("./store").State>;
 };

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

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

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

@@ -27,18 +27,24 @@ var import_bookingTicket = require("./bookingTicket");
 var import_react = require("react");
 var import_OsKeyContext = require("../../context/OsKeyContext");
 var import_productCache = require("../../utils/productCache");
+var import_hooks = require("../../../../hooks");
+var sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
 var useProducts = (notAvailableRef) => {
+  var _a;
   const bookingTicket = (0, import_bookingTicket.useBookingTicket)();
   const osKey = (0, import_OsKeyContext.useOsKey)();
   const [products, setProducts] = (0, import_react.useState)([]);
   const [loading, setLoading] = (0, import_react.useState)(true);
   const isFirstLoadRef = (0, import_react.useRef)(true);
   const isFirstLoadDataRef = (0, import_react.useRef)(true);
+  const context = (0, import_hooks.useEngineContext)();
+  const { getApp } = ((_a = context.appHelper) == null ? void 0 : _a.utils) || {};
+  const app = getApp();
   const getProducts = (0, import_ahooks.useMemoizedFn)(async (params) => {
-    var _a;
+    var _a2, _b, _c, _d, _e;
     if (isFirstLoadRef.current && osKey) {
       const cachedProducts = (0, import_productCache.getProductCache)(osKey);
-      if (cachedProducts) {
+      if (cachedProducts && cachedProducts.length > 0) {
         setProducts(cachedProducts);
         setLoading(false);
       }
@@ -46,23 +52,62 @@ var useProducts = (notAvailableRef) => {
     } else {
       setLoading(true);
     }
-    try {
-      const freshProducts = await bookingTicket.loadProducts(params);
+    const maxRetries = 3;
+    let lastError = null;
+    let freshProducts = [];
+    for (let attempt = 1; attempt <= maxRetries; attempt++) {
+      try {
+        console.log(`[ProductCache] 尝试加载数据，第 ${attempt}/${maxRetries} 次`);
+        freshProducts = await bookingTicket.loadProducts(params);
+        if (freshProducts && freshProducts.length > 0) {
+          console.log(`[ProductCache] 第 ${attempt} 次尝试成功，获取到 ${freshProducts.length} 条数据`);
+          break;
+        }
+        console.log(`[ProductCache] 第 ${attempt} 次尝试返回空数据`);
+        if (attempt < maxRetries) {
+          console.log(`[ProductCache] 等待 1 秒后重试...`);
+          await sleep(1e3);
+        }
+      } catch (error) {
+        lastError = error;
+        console.log(`[ProductCache] 第 ${attempt} 次尝试失败:`, error);
+        (_b = (_a2 = app == null ? void 0 : app.logger) == null ? void 0 : _a2.addLog) == null ? void 0 : _b.call(_a2, {
+          type: "info",
+          title: `[getProduct] bookingTicket.loadProducts error (attempt ${attempt}/${maxRetries})`,
+          metadata: {
+            error,
+            attempt
+          }
+        });
+        if (attempt < maxRetries) {
+          console.log(`[ProductCache] 等待 1 秒后重试...`);
+          await sleep(1e3);
+        }
+      }
+    }
+    if (freshProducts && freshProducts.length > 0) {
       isFirstLoadDataRef.current = false;
       setProducts(freshProducts);
       if (osKey) {
         (0, import_productCache.setProductCache)(osKey, freshProducts);
         console.log("[ProductCache] 已更新缓存");
       }
-    } catch (error) {
-      if ((error == null ? void 0 : error.code) === 607100 && (isFirstLoadDataRef.current || products.length > 0)) {
-        (_a = notAvailableRef.current) == null ? void 0 : _a.open();
+      setLoading(false);
+    } else {
+      console.log("[ProductCache] 3次尝试后仍未获取到数据");
+      (_d = (_c = app == null ? void 0 : app.logger) == null ? void 0 : _c.addLog) == null ? void 0 : _d.call(_c, {
+        type: "error",
+        title: "[getProduct] 3次尝试后仍未获取到数据",
+        metadata: {
+          error: lastError
+        }
+      });
+      if ((lastError == null ? void 0 : lastError.code) === 607100 && (isFirstLoadDataRef.current || products.length > 0)) {
+        (_e = notAvailableRef.current) == null ? void 0 : _e.open();
       }
       setLoading(false);
       setProducts([]);
       isFirstLoadDataRef.current = false;
-    } finally {
-      setLoading(false);
     }
   });
   return {

package/package.json

@@ -1,6 +1,12 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.4.69",
+  "version": "6.4.71",
+  "scripts": {
+    "dev": "father dev",
+    "build": "father build",
+    "lowcode:dev": "build-scripts start --config ./build.lowcode.js",
+    "lowcode:build": " build-scripts build --config ./build.lowcode.js"
+  },
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -50,6 +56,10 @@
     "@dnd-kit/modifiers": "^6.0.1",
     "@dnd-kit/sortable": "^7.0.2",
     "@dnd-kit/utilities": "^3.2.1",
+    "@pisell/date-picker": "workspace:*",
+    "@pisell/icon": "workspace:*",
+    "@pisell/materials": "workspace:*",
+    "@pisell/utils": "workspace:*",
     "ahooks": "^3.7.6",
     "antd": "^5.6.3",
     "classnames": "^2.3.2",
@@ -60,11 +70,7 @@
     "react-resizable": "^3.0.5",
     "styled-components": "^6.0.0-rc.3",
     "@react-spring/web": "^9.6.1",
-    "@use-gesture/react": "^10.3.1",
-    "@pisell/icon": "0.0.11",
-    "@pisell/date-picker": "3.0.7",
-    "@pisell/utils": "3.0.2",
-    "@pisell/materials": "6.4.17"
+    "@use-gesture/react": "^10.3.1"
   },
   "peerDependencies": {
     "react": "^18.0.0",
@@ -72,11 +78,5 @@
   },
   "componentConfig": {
     "materialSchema": "https://unpkg.com/@pisell/materials@1.0.1/build/lowcode/assets-prod.json"
-  },
-  "scripts": {
-    "dev": "father dev",
-    "build": "father build",
-    "lowcode:dev": "build-scripts start --config ./build.lowcode.js",
-    "lowcode:build": " build-scripts build --config ./build.lowcode.js"
   }
-}
+}