@pisell/private-materials 6.2.50 → 6.2.52

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,17 @@ __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 QUERY_INTERVAL = 1e3 * 2;
 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;
@@ -45,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) {
@@ -80,7 +93,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 +107,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();
+        queryIntervalTimerRef.current = setTimeout(() => {
+          _resultQuery();
+        }, QUERY_INTERVAL);
         return;
       }
       if (data.status < 0) {
@@ -132,7 +147,18 @@ var useTimeResultQuery = (api, resultCheck, handleLinklySuccess) => {
         _log("AbortError" /* AbortError */);
         console.log("Error: 请求被取消，将继续查询");
         isQueryFinishedRef.current = false;
-        _resultQuery();
+        queryIntervalTimerRef.current = setTimeout(() => {
+          _resultQuery();
+        }, 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;
+        queryIntervalTimerRef.current = setTimeout(() => {
+          _resultQuery();
+        }, QUERY_INTERVAL);
         return;
       }
       _log("Error" /* Error */, error);
@@ -179,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;
@@ -197,13 +227,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 +250,6 @@ var useTimeResultQuery = (api, resultCheck, handleLinklySuccess) => {
   };
   const run = () => {
     reset();
-    console.log("开始查询linkly结果---->>>>>>>");
-    _log("Start" /* Start */);
     globalTimeoutIdRef.current = setTimeout(() => {
       var _a;
       console.log("全局超时，终止所有重试");
@@ -224,6 +260,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/linkly/index.js

@@ -125,6 +125,7 @@ var Linkly = ({ api, onChange }) => {
     failRef.current = fail;
   }, [fail]);
   (0, import_react.useEffect)(() => {
+    var _a, _b, _c;
     if (statusRef.current === import_const.StatusEnum.Success || statusRef.current === import_const.StatusEnum.Fail) {
       return;
     }
@@ -136,7 +137,36 @@ var Linkly = ({ api, onChange }) => {
       resultQuery();
       return;
     }
-    payOrRefund(resultQuery, handleLinklySuccess);
+    if (((_a = utils == null ? void 0 : utils.isTerminal) == null ? void 0 : _a.call(utils)) && ((_c = (_b = utils == null ? void 0 : utils.interaction) == null ? void 0 : _b.utils) == null ? void 0 : _c.asyncDataManager)) {
+      const _payOrRefund = async () => {
+        var _a2, _b2, _c2;
+        try {
+          const activeStatus = await ((_c2 = (_b2 = (_a2 = utils == null ? void 0 : utils.interaction) == null ? void 0 : _a2.utils) == null ? void 0 : _b2.asyncDataManager) == null ? void 0 : _c2.call(_b2, {
+            module: "get",
+            key: "pay_webview_active"
+          }));
+          if (activeStatus !== "unActive") {
+            payOrRefund(resultQuery, handleLinklySuccess);
+          } else {
+            (0, import_utils.sendWarningLog)({
+              title: "Linkly-支付-当前页面非活跃状态，无法进行支付",
+              content: [
+                { key: "response", value: JSON.stringify({ activeStatus }) }
+              ]
+            });
+          }
+        } catch (error) {
+          (0, import_utils.sendWarningLog)({
+            title: "Linkly-支付-获取当前页面活跃状态失败",
+            content: [{ key: "error", value: JSON.stringify(error) }]
+          });
+          payOrRefund(resultQuery, handleLinklySuccess);
+        }
+      };
+      _payOrRefund();
+    } else {
+      payOrRefund(resultQuery, handleLinklySuccess);
+    }
   }, []);
   (0, import_react.useEffect)(() => {
     return () => {

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 && `${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 {};