@pisell/private-materials 6.2.50 → 6.2.51

package/lib/components/eftposPay/linkly/hooks/useTimeQuery.js

@@ -1,6 +1,8 @@
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -14,6 +16,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/components/eftposPay/linkly/hooks/useTimeQuery.ts
@@ -24,15 +34,16 @@ __export(useTimeQuery_exports, {
 module.exports = __toCommonJS(useTimeQuery_exports);
 var import_react = require("react");
 var import_utils = require("@pisell/utils");
+var import_dayjs = __toESM(require("dayjs"));
 var import_store = require("../../store");
 var import_hooks = require("../../hooks");
 var import_const = require("../../const");
 var import_const2 = require("../const");
-var GlobalTimeout = 1e3 * 60;
+var GlobalTimeout = 1e3 * 60 * 2;
 var RequestTimeout = 1e3 * 5;
 var useTimeResultQuery = (api, resultCheck, handleLinklySuccess) => {
   const dispatch = (0, import_store.useDispatch)();
-  const { numRef, modeRef, deviceRef } = (0, import_hooks.useStoreRef)();
+  const { numRef, modeRef, deviceRef, orderIdRef } = (0, import_hooks.useStoreRef)();
   const fail = (0, import_hooks.useFail)(0);
   const failRef = (0, import_react.useRef)(fail);
   const isPay = modeRef.current === import_const.ModeEnum.Pay || modeRef.current === import_const.ModeEnum.FullPay;
@@ -80,7 +91,6 @@ var useTimeResultQuery = (api, resultCheck, handleLinklySuccess) => {
         console.log("Success: 全局超时或不需要处理结果，终止查询");
         return;
       }
-      _log("Success" /* Success */, result);
       isQueryFinishedRef.current = true;
       const data = (result == null ? void 0 : result.data) || {};
       if (data.status == 1) {
@@ -95,8 +105,11 @@ var useTimeResultQuery = (api, resultCheck, handleLinklySuccess) => {
       }
       if ((data == null ? void 0 : data.status) == 0 && (data == null ? void 0 : data.signature_flag) != 1) {
         console.log("交易状态为0需要继续查询");
+        _log("Querying" /* Querying */, result);
         isQueryFinishedRef.current = false;
-        _resultQuery();
+        setTimeout(() => {
+          _resultQuery();
+        }, 1500);
         return;
       }
       if (data.status < 0) {
@@ -132,7 +145,18 @@ var useTimeResultQuery = (api, resultCheck, handleLinklySuccess) => {
         _log("AbortError" /* AbortError */);
         console.log("Error: 请求被取消，将继续查询");
         isQueryFinishedRef.current = false;
-        _resultQuery();
+        setTimeout(() => {
+          _resultQuery();
+        }, 1500);
+        return;
+      }
+      if (!(error == null ? void 0 : error.code) || `${error.code}` === import_const.PayStatus.Timeout) {
+        _log("NetworkError" /* NetworkError */);
+        console.log("Error: 网关类报错，将继续查询");
+        isQueryFinishedRef.current = false;
+        setTimeout(() => {
+          _resultQuery();
+        }, 1500);
         return;
       }
       _log("Error" /* Error */, error);
@@ -197,13 +221,21 @@ var useTimeResultQuery = (api, resultCheck, handleLinklySuccess) => {
       session_id: numRef.current
     };
     const content = [
-      { key: "queryId", value: JSON.stringify(queryIdRef.current) },
+      {
+        key: "description",
+        value: JSON.stringify({
+          queryId: queryIdRef.current,
+          orderId: orderIdRef.current,
+          type,
+          date: (0, import_dayjs.default)().format("YYYY-MM-DD HH:mm:ss")
+        })
+      },
       { key: "params", value: JSON.stringify(params) }
     ];
-    if (type === "Success" /* Success */) {
-      content.push({ key: "response", value: JSON.stringify(res) });
-    } else if (type === "Error" /* Error */) {
+    if (type === "Error" /* Error */) {
       content.push({ key: "error", value: JSON.stringify(res) });
+    } else {
+      content.push({ key: "response", value: JSON.stringify(res) });
     }
     (0, import_utils.sendWarningLog)({
       title: `Linkly-${isPay ? "Pay" : "Refund"}-交易结果轮询`,
@@ -212,8 +244,6 @@ var useTimeResultQuery = (api, resultCheck, handleLinklySuccess) => {
   };
   const run = () => {
     reset();
-    console.log("开始查询linkly结果---->>>>>>>");
-    _log("Start" /* Start */);
     globalTimeoutIdRef.current = setTimeout(() => {
       var _a;
       console.log("全局超时，终止所有重试");
@@ -224,6 +254,8 @@ var useTimeResultQuery = (api, resultCheck, handleLinklySuccess) => {
     startTimeRef.current = Date.now();
     isQueryFinishedRef.current = false;
     queryIdRef.current = (0, import_utils.getUniqueId)();
+    console.log("开始查询linkly结果---->>>>>>>");
+    _log("Start" /* Start */);
     return _resultQuery();
   };
   return { run, stop: reset };

package/lib/components/eftposPay/payo/config.js

@@ -148,15 +148,15 @@ var POS = ({
     const resultPromise = modeRef.current === import_const.ModeEnum.Pay || modeRef.current === import_const.ModeEnum.FullPay ? api.pay(
       {
         ...(custom == null ? void 0 : custom.platform) ? {
-          "operator_id": custom.operator_id,
-          "operator_type": custom.operator_type,
-          "platform": custom.platform,
-          "custom_payment_id": custom.custom_payment_id,
-          "service_charge": {
-            "amount": payRef.current.surMoney,
-            "percentage": payRef.current.surPercentRate
+          operator_id: custom.operator_id,
+          operator_type: custom.operator_type,
+          platform: custom.platform,
+          custom_payment_id: custom.custom_payment_id,
+          service_charge: {
+            amount: payRef.current.surMoney,
+            percentage: payRef.current.surPercentRate
           },
-          "original_amount": payRef.current.amount
+          original_amount: payRef.current.amount
         } : {},
         order_id: orderIdRef.current,
         amount: payRef.current.total,
@@ -215,7 +215,7 @@ var POS = ({
       if (unloadRef.current || !netRef.current) {
         return;
       }
-      if (err && `${err.code}` === import_const.PayStatus.Timeout) {
+      if (!(err == null ? void 0 : err.code) || `${err.code}` === import_const.PayStatus.Timeout) {
         checkApi();
         return;
       }

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

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

package/lib/components/pay/toC/model.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 export interface FormState {
     platform: 'pc' | 'h5' | '' | undefined;
     order: any;
@@ -28,4 +29,11 @@ export interface PayGroup {
     pay_number?: string;
     _order: any;
 }
-export declare const Provider: any, Context: any;
+export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
+    state: FormState;
+} & {
+    dispatch: (params: {
+        type: string;
+        payload: any;
+    }) => void;
+}>;

package/lib/components/schedules/model.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { CalendarDataItem, ScheduleItem } from "./type";
 import dayjs from "dayjs";
 export interface FormState {
@@ -68,4 +69,11 @@ export interface FormState {
     };
     setGlobalState: Function | null;
 }
-export declare const Provider: any, Context: any;
+export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
+    state: FormState;
+} & {
+    dispatch: (params: {
+        type: string;
+        payload: any;
+    }) => void;
+}>;

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

@@ -41,7 +41,7 @@ declare type ScanData = {
     };
 };
 export declare const formatScanCustomer: (data: ScanData) => {
-    searchType: "wallet" | "walletPass" | "product" | "local_product" | "customer";
+    searchType: "customer" | "product" | "wallet" | "walletPass" | "local_product";
     data: any;
     scanCode: string;
 } | null;

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

@@ -1 +1,13 @@
-export declare const Provider: any, Context: any;
+/// <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 {};

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

@@ -1 +1,14 @@
-export declare const Provider: any, Context: any;
+/// <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 {};

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

@@ -1 +1,13 @@
-export declare const Provider: any, Context: any;
+/// <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 {};

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

@@ -1 +1,29 @@
-export declare const Provider: any, Context: any;
+/// <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 {};

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

@@ -1 +1,13 @@
-export declare const Provider: any, Context: any;
+/// <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 {};

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

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.2.50",
+  "version": "6.2.51",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -59,10 +59,10 @@
     "react-infinite-scroll-component": "^6.1.0",
     "react-resizable": "^3.0.5",
     "styled-components": "^6.0.0-rc.3",
+    "@pisell/materials": "6.2.40",
     "@pisell/icon": "0.0.11",
     "@pisell/date-picker": "3.0.4",
-    "@pisell/utils": "3.0.1",
-    "@pisell/materials": "6.2.40"
+    "@pisell/utils": "3.0.1"
   },
   "peerDependencies": {
     "react": "^18.0.0",