@pisell/private-materials 6.5.31 → 6.5.32

package/lib/components/eftposPay/component/fail/failCustom.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { ActionProps } from '../../const';
 declare const _default: ({ className, isMobile, onChange }: ActionProps) => JSX.Element;
 export default _default;

package/lib/components/eftposPay/component/fail/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { ActionProps } from '../../const';
 declare const _default: ({ onChange, className, isMobile }: ActionProps) => JSX.Element;
 export default _default;

package/lib/components/eftposPay/component/fail/network.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { ActionProps } from '../../const';
 /**
  * @title: 断网(客户端)提示页

package/lib/components/eftposPay/component/fail/unknow.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { ActionProps } from '../../const';
 /**
  * @title: 支付状态未知页面

package/lib/components/eftposPay/component/header/titlebar.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './titlebar.less';
 declare enum EPopupTitleBarVariantType {
     BackTitleClose = "back-title-cancel",

package/lib/components/eftposPay/component/manual/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { ActionProps } from '../../const';
 import './index.less';
 /**

package/lib/components/eftposPay/component/signature/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { ActionProps } from '../../const';
 /**
  * @title: 取消签名确认页

package/lib/components/eftposPay/component/step/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { StatusType } from '../../const';
 declare const _default: (props: {
     status: StatusType;

package/lib/components/eftposPay/component/step/step.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 declare const _default: (props: {
     status: string;
     pedding?: string;

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

@@ -11,7 +11,7 @@ import './device.less';
 declare const _default: ({ api, onChange, onClose, className, device_number, isMobile, net, client, formatAmount, containerStyle, }: {
     api: PayProps['api'];
     className?: string | undefined;
-    onChange?: ((status: "success" | "page" | "print" | "fail" | "mark_tx_processed", params?: string | {
+    onChange?: ((status: "page" | "success" | "print" | "fail" | "mark_tx_processed", params?: string | {
         [keys: string]: unknown;
     } | undefined, other?: any) => void) | undefined;
     onClose: () => void;

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

@@ -15,11 +15,11 @@ export declare const useStoreRef: <T extends {
     readonly numRef: React.MutableRefObject<string | number | undefined>;
     readonly orderIdRef: React.MutableRefObject<string | number>;
     readonly modeRef: React.MutableRefObject<ModeEnum>;
-    readonly statusRef: React.MutableRefObject<"success" | "warn" | "loading" | "fail" | "pedding" | "resove" | "reject" | "question">;
+    readonly statusRef: React.MutableRefObject<"loading" | "success" | "warn" | "fail" | "pedding" | "resove" | "reject" | "question">;
     readonly netRef: React.MutableRefObject<boolean | undefined>;
     readonly symbolRef: React.MutableRefObject<string>;
     readonly amountRef: React.MutableRefObject<string | number>;
-    readonly eftposRef: React.MutableRefObject<"tyro" | "windcave" | "stripe" | "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/linkly/hooks/useTimeQuery.js

@@ -41,6 +41,7 @@ var import_const = require("../../const");
 var import_const2 = require("../const");
 var GlobalTimeout = 1e3 * 60 * 2;
 var RequestTimeout = 1e3 * 5;
+var QUERY_INTERVAL = 1e3 * 2;
 var useTimeResultQuery = (api, resultCheck, handleLinklySuccess) => {
   const dispatch = (0, import_store.useDispatch)();
   const { numRef, modeRef, deviceRef, orderIdRef } = (0, import_hooks.useStoreRef)();
@@ -56,6 +57,7 @@ var useTimeResultQuery = (api, resultCheck, handleLinklySuccess) => {
   const startTimeRef = (0, import_react.useRef)(null);
   const isQueryFinishedRef = (0, import_react.useRef)(true);
   const queryIdRef = (0, import_react.useRef)(null);
+  const queryIntervalTimerRef = (0, import_react.useRef)(null);
   const _resultQuery = async () => {
     var _a, _b;
     if (controllerRef.current) {
@@ -107,9 +109,9 @@ var useTimeResultQuery = (api, resultCheck, handleLinklySuccess) => {
         console.log("交易状态为0需要继续查询");
         _log("Querying" /* Querying */, result);
         isQueryFinishedRef.current = false;
-        setTimeout(() => {
+        queryIntervalTimerRef.current = setTimeout(() => {
           _resultQuery();
-        }, 1500);
+        }, QUERY_INTERVAL);
         return;
       }
       if (data.status < 0) {
@@ -145,18 +147,18 @@ var useTimeResultQuery = (api, resultCheck, handleLinklySuccess) => {
         _log("AbortError" /* AbortError */);
         console.log("Error: 请求被取消，将继续查询");
         isQueryFinishedRef.current = false;
-        setTimeout(() => {
+        queryIntervalTimerRef.current = setTimeout(() => {
           _resultQuery();
-        }, 1500);
+        }, QUERY_INTERVAL);
         return;
       }
       if (!(error == null ? void 0 : error.code) || `${error.code}` === import_const.PayStatus.Timeout) {
         _log("NetworkError" /* NetworkError */);
         console.log("Error: 网关类报错，将继续查询");
         isQueryFinishedRef.current = false;
-        setTimeout(() => {
+        queryIntervalTimerRef.current = setTimeout(() => {
           _resultQuery();
-        }, 1500);
+        }, QUERY_INTERVAL);
         return;
       }
       _log("Error" /* Error */, error);
@@ -203,6 +205,10 @@ var useTimeResultQuery = (api, resultCheck, handleLinklySuccess) => {
       clearTimeout(requestTimeoutIdRef.current);
       requestTimeoutIdRef.current = null;
     }
+    if (queryIntervalTimerRef.current) {
+      clearTimeout(queryIntervalTimerRef.current);
+      queryIntervalTimerRef.current = null;
+    }
     if (controllerRef.current) {
       controllerRef.current.abort();
       controllerRef.current = null;

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { PayProps } from './const';
 import './index.less';
 /**

package/lib/components/eftposPay/payo/config.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { StatusEnum } from '../const';
 export declare const POS: ({ api, onChange, }: {
     api: {

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

@@ -42,6 +42,7 @@ var import_helper = require("../helper");
 var import_hooks = require("../hooks");
 var import_store = require("../store");
 var import_hooks2 = require("./hooks");
+var import_payment = require("./payment");
 var POS = ({
   api,
   onChange
@@ -68,6 +69,13 @@ var POS = ({
   const initRef = (0, import_react.useRef)(false);
   const unloadRef = (0, import_react.useRef)(false);
   const [check] = (0, import_hooks2.useValidate)(1e3 * 60);
+  const { run: paymentRun, clean: paymentClean } = (0, import_payment.usePayment)({
+    payApi: api.pay,
+    checkApi: api.check,
+    shouldContinue: () => {
+      return !(unloadRef.current || !netRef.current);
+    }
+  });
   (0, import_react.useEffect)(() => {
     failRef.current = fail;
   }, [fail]);
@@ -126,7 +134,7 @@ var POS = ({
     );
   };
   (0, import_react.useEffect)(() => {
-    var _a, _b;
+    var _a, _b, _c;
     if (statusRef.current === import_const.StatusEnum.Success || statusRef.current === import_const.StatusEnum.Fail) {
       return;
     }
@@ -145,82 +153,98 @@ var POS = ({
       })
     );
     controllerRef.current = new AbortController();
-    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
-          },
-          original_amount: payRef.current.amount
-        } : {},
-        order_id: orderIdRef.current,
-        amount: payRef.current.total,
-        card_reader_type: eftposRef.current,
-        card_reader_id: (_a = deviceRef.current) == null ? void 0 : _a.id,
-        number: numRef.current,
-        pay_param_base64: encodeURIComponent(
-          btoa(
-            encodeURIComponent(
-              JSON.stringify({
-                ...dataRef.current,
-                number: numRef.current
-              })
-            )
+    const isPay = modeRef.current === import_const.ModeEnum.Pay || modeRef.current === import_const.ModeEnum.FullPay;
+    const apiParams = isPay ? {
+      ...(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
+      } : {},
+      original_amount: payRef.current.amount,
+      service_charge: {
+        amount: payRef.current.surMoney,
+        percentage: payRef.current.surPercentRate
+      },
+      order_id: orderIdRef.current,
+      amount: payRef.current.total,
+      card_reader_type: eftposRef.current,
+      card_reader_id: (_a = deviceRef.current) == null ? void 0 : _a.id,
+      number: numRef.current,
+      pay_param_base64: encodeURIComponent(
+        btoa(
+          encodeURIComponent(
+            JSON.stringify({
+              ...dataRef.current,
+              number: numRef.current
+            })
           )
         )
-      },
-      { signal: controllerRef.current.signal }
-    ) : api.refund(
-      {
-        order_id: orderIdRef.current,
-        amount: amountRef.current,
-        card_reader_type: eftposRef.current,
-        card_reader_id: (_b = deviceRef.current) == null ? void 0 : _b.id,
-        number: numRef.current,
-        pay_param_base64: encodeURIComponent(
-          btoa(
-            encodeURIComponent(
-              JSON.stringify({
-                ...dataRef.current,
-                number: numRef.current
-              })
-            )
+      )
+    } : {
+      order_id: orderIdRef.current,
+      amount: amountRef.current,
+      card_reader_type: eftposRef.current,
+      card_reader_id: (_b = deviceRef.current) == null ? void 0 : _b.id,
+      number: numRef.current,
+      pay_param_base64: encodeURIComponent(
+        btoa(
+          encodeURIComponent(
+            JSON.stringify({
+              ...dataRef.current,
+              number: numRef.current
+            })
           )
         )
-      },
-      { signal: controllerRef.current.signal }
-    );
-    resultPromise.then((res) => {
-      console.log("netRef.current111 = ", netRef.current);
-      if (unloadRef.current || !netRef.current) {
-        return;
-      }
-      if (res && `${res.code}` === "200") {
-        success(res);
-        return;
-      }
-      return Promise.reject(res);
-    }).catch((err) => {
-      console.log(
-        "netRef.current222 = ",
-        netRef.current,
-        unloadRef.current,
-        err
-      );
-      if (unloadRef.current || !netRef.current) {
-        return;
-      }
-      if (!(err == null ? void 0 : err.code) || `${err.code}` === import_const.PayStatus.Timeout) {
-        checkApi();
-        return;
-      }
-      failRef.current(err, true);
-    });
+      )
+    };
+    if (isPay) {
+      paymentRun({
+        paymentType: import_payment.ActionType.Pay,
+        paymentNum: numRef.current,
+        orderId: orderIdRef.current,
+        deviceId: (_c = deviceRef.current) == null ? void 0 : _c.id,
+        params: apiParams,
+        callbacks: {
+          onSuccess: (res) => {
+            success(res);
+          },
+          onError: (err) => {
+            console.log("err = >>>>>", err);
+            failRef.current(err, true);
+          }
+        }
+      });
+      return;
+    } else {
+      const resultPromise = api.refund(apiParams, { signal: controllerRef.current.signal });
+      resultPromise.then((res) => {
+        console.log("netRef.current111 = ", netRef.current);
+        if (unloadRef.current || !netRef.current) {
+          return;
+        }
+        if (res && `${res.code}` === "200") {
+          success(res);
+          return;
+        }
+        return Promise.reject(res);
+      }).catch((err) => {
+        console.log(
+          "netRef.current222 = ",
+          netRef.current,
+          unloadRef.current,
+          err
+        );
+        if (unloadRef.current || !netRef.current) {
+          return;
+        }
+        if (!(err == null ? void 0 : err.code) || `${err.code}` === import_const.PayStatus.Timeout) {
+          checkApi();
+          return;
+        }
+        failRef.current(err, true);
+      });
+    }
   }, [api, check, dispatch, onChange]);
   (0, import_react.useEffect)(
     () => () => {
@@ -230,6 +254,7 @@ var POS = ({
       if (clearRef.current) {
         clearTimeout(clearRef.current);
       }
+      paymentClean();
     },
     []
   );

package/lib/components/eftposPay/payo/payment.d.ts

@@ -0,0 +1,66 @@
+interface RunApiParams {
+    [key: string]: any;
+}
+export declare enum ActionType {
+    Pay = "pay",
+    Refund = "refund",
+    Query = "query"
+}
+interface UsePaymentOptions {
+    /**
+     * 支付接口
+     */
+    payApi: (params: RunApiParams, options?: {
+        signal?: AbortSignal;
+    }) => Promise<any>;
+    /**
+     * 退款接口
+     */
+    refundApi?: (params: RunApiParams, options?: {
+        signal?: AbortSignal;
+    }) => Promise<any>;
+    /**
+     * 查询接口
+     */
+    checkApi: (params: {
+        number: string;
+    }, options?: {
+        signal?: AbortSignal;
+    }) => Promise<any>;
+    /**
+     * 检查是否应该继续处理结果（用于处理网络断开、组件卸载等情况）
+     */
+    shouldContinue?: () => boolean;
+}
+interface RunParams {
+    /** 支付类型 */
+    paymentType: ActionType;
+    /** 支付交易号 */
+    paymentNum: string;
+    /** 订单ID */
+    orderId?: string | number;
+    /** 设备ID */
+    deviceId?: string | number;
+    /** 支付参数 */
+    params: RunApiParams;
+    /** 回调方法 */
+    callbacks: RunCallbacks;
+}
+interface RunCallbacks {
+    /**
+     * 成功回调
+     */
+    onSuccess: (res: any) => void;
+    /**
+     * 失败回调
+     */
+    onError: (error: any) => void;
+}
+export declare const usePayment: (options: UsePaymentOptions) => {
+    run: (options: RunParams) => Promise<void>;
+    stop: () => void;
+    clean: (params?: {
+        clearCallbacks?: boolean;
+    }) => void;
+};
+export {};