@pisell/private-materials 6.3.125 → 6.3.126

package/es/components/eftposPay/linkly/hooks/normal.js

@@ -1,12 +1,11 @@
 import { useRequest } from 'ahooks';
 import { useEffect, useRef } from 'react';
-import { locales } from '@pisell/utils';
+import { locales, sendWarningLog } from '@pisell/utils';
 import { linklyPayCancelApi, linklyPayApi, linklyRefundCancelApi, linklyRefundApi, linklyPaySignatureApi, linklyRefundSignatureApi } from "../service";
 import { useFail, useStoreRef } from "../../hooks";
 import { ModeEnum, PayStatus, StatusEnum } from "../../const";
 import { useDispatch, updateState, updateCustom, updateStatus } from "../../store";
 import { LinklyActionStatus } from "../const";
-import payLog from "../../utils/payLog";
 
 /**
  * 支付或退款
@@ -62,8 +61,12 @@ export var useLinklyPayOrRefund = function useLinklyPayOrRefund(handleCheck) {
     if (!handleCheck()) {
       return;
     }
-    payLog.log("Linkly\uFF1A".concat(isPay ? '支付' : '退款', "\u63A5\u53E3\u6210\u529F"), {
-      res: res
+    sendWarningLog({
+      title: "Linkly-".concat(isPay ? 'Pay' : 'Refund', "-\u63A5\u53E3\u6210\u529F"),
+      content: [{
+        key: 'response',
+        value: JSON.stringify(res)
+      }]
     });
 
     // status 交易状态 0:未知，继续查询 1:成功 -1:失败 -2:交易错误
@@ -117,8 +120,12 @@ export var useLinklyPayOrRefund = function useLinklyPayOrRefund(handleCheck) {
     if (!handleCheck()) {
       return;
     }
-    payLog.log("Linkly\uFF1A".concat(isPay ? '支付' : '退款', "\u63A5\u53E3\u5931\u8D25"), {
-      error: JSON.stringify(error || {})
+    sendWarningLog({
+      title: "Linkly-".concat(isPay ? 'Pay' : 'Refund', "-\u63A5\u53E3\u5931\u8D25"),
+      content: [{
+        key: 'error',
+        value: JSON.stringify(error)
+      }]
     });
     (_failRef$current2 = failRef.current) === null || _failRef$current2 === void 0 || _failRef$current2.call(failRef, error, false);
   };
@@ -134,11 +141,12 @@ export var useLinklyPayOrRefund = function useLinklyPayOrRefund(handleCheck) {
       // 交易金额, 包含选择的订单金额+手续费，订单金额+手续费=交易金额
       amount: isPay ? (_payRef$current = payRef.current) === null || _payRef$current === void 0 ? void 0 : _payRef$current.total : amountRef.current
     };
-    payLog.setContext({
-      transactionNumber: String(orderIdRef.current)
-    });
-    payLog.log("Linkly\uFF1A\u53D1\u8D77".concat(isPay ? '支付' : '退款'), {
-      param: param
+    sendWarningLog({
+      title: "Linkly-".concat(isPay ? 'Pay' : 'Refund'),
+      content: [{
+        key: 'params',
+        value: JSON.stringify(param)
+      }]
     });
     _pay.run(param);
   };
@@ -171,9 +179,23 @@ export var useLinklyCancel = function useLinklyCancel(handleCheck) {
     if (!handleCheck()) {
       return;
     }
-    payLog.log("Linkly\uFF1A\u53D6\u6D88".concat(type === 'success' ? '成功' : '失败'), {
-      res: res
-    });
+    if (type === 'success') {
+      sendWarningLog({
+        title: "Linkly-".concat(isPay ? 'Pay' : 'Refund', "-\u53D6\u6D88\u6210\u529F"),
+        content: [{
+          key: 'response',
+          value: JSON.stringify(res)
+        }]
+      });
+    } else {
+      sendWarningLog({
+        title: "Linkly-".concat(isPay ? 'Pay' : 'Refund', "-\u53D6\u6D88\u5931\u8D25"),
+        content: [{
+          key: 'error',
+          value: JSON.stringify(res)
+        }]
+      });
+    }
     (_resultQueryRef$curre2 = resultQueryRef.current) === null || _resultQueryRef$curre2 === void 0 || _resultQueryRef$curre2.call(resultQueryRef);
   };
   var _cancel = useRequest(isPay ? linklyPayCancelApi : linklyRefundCancelApi, {
@@ -188,15 +210,22 @@ export var useLinklyCancel = function useLinklyCancel(handleCheck) {
   var linklyCancel = function linklyCancel(resultQuery) {
     var _deviceRef$current2;
     resultQueryRef.current = resultQuery;
+    // 需要将按钮状态锁定，防止重复点击
     dispatch(updateCustom({
       buttonDisabled: true
     }));
     var param = {
+      // 设备id
       pinpad_id: deviceRef === null || deviceRef === void 0 || (_deviceRef$current2 = deviceRef.current) === null || _deviceRef$current2 === void 0 || (_deviceRef$current2 = _deviceRef$current2.metadata) === null || _deviceRef$current2 === void 0 ? void 0 : _deviceRef$current2.linkly_pinpad_id,
+      // 交易流水号
       session_id: numRef.current
     };
-    payLog.log('Linkly：发起取消', {
-      param: param
+    sendWarningLog({
+      title: "Linkly-".concat(isPay ? 'Pay' : 'Refund', "-\u53D6\u6D88"),
+      content: [{
+        key: 'params',
+        value: JSON.stringify(param)
+      }]
     });
     _cancel.run(param);
     dispatch(updateCustom({
@@ -229,9 +258,23 @@ export var useLinklySignature = function useLinklySignature(handleCheck) {
     if (!handleCheck()) {
       return;
     }
-    payLog.log("Linkly\uFF1A\u7B7E\u540D\u63A5\u53E3".concat(type === 'success' ? '成功' : '失败'), {
-      res: res
-    });
+    if (type === 'success') {
+      sendWarningLog({
+        title: "Linkly-".concat(isPay ? 'Pay' : 'Refund', "-\u7B7E\u540D\u6210\u529F"),
+        content: [{
+          key: 'response',
+          value: JSON.stringify(res)
+        }]
+      });
+    } else {
+      sendWarningLog({
+        title: "Linkly-".concat(isPay ? 'Pay' : 'Refund', "-\u7B7E\u540D\u5931\u8D25"),
+        content: [{
+          key: 'error',
+          value: JSON.stringify(res)
+        }]
+      });
+    }
     (_resultQueryRef$curre3 = resultQueryRef.current) === null || _resultQueryRef$curre3 === void 0 || _resultQueryRef$curre3.call(resultQueryRef);
   };
   var _signature = useRequest(isPay ? linklyPaySignatureApi : linklyRefundSignatureApi, {
@@ -260,8 +303,12 @@ export var useLinklySignature = function useLinklySignature(handleCheck) {
     dispatch(updateCustom({
       actionStatus: LinklyActionStatus.SignatureWaiting
     }));
-    payLog.log('Linkly：发起签名', {
-      param: param
+    sendWarningLog({
+      title: "Linkly-".concat(isPay ? 'Pay' : 'Refund', "-\u7B7E\u540D"),
+      content: [{
+        key: 'params',
+        value: JSON.stringify(param)
+      }]
     });
     _signature.run(param);
   };

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

@@ -3,12 +3,12 @@ function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyri
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 import { useRef } from 'react';
-import { locales } from '@pisell/utils';
+import { getUniqueId, locales, sendWarningLog } from '@pisell/utils';
+import dayjs from 'dayjs';
 import { useDispatch, updateCustom, updateStatus, updateState } from "../../store";
 import { useFail, useStoreRef } from "../../hooks";
 import { ModeEnum, PayStatus, StatusEnum } from "../../const";
 import { LinklyActionStatus } from "../const";
-import payLog from "../../utils/payLog";
 
 // 全局超时时间
 var GlobalTimeout = 1000 * 60 * 2;
@@ -21,7 +21,8 @@ export var useTimeResultQuery = function useTimeResultQuery(api, resultCheck, ha
   var _useStoreRef = useStoreRef(),
     numRef = _useStoreRef.numRef,
     modeRef = _useStoreRef.modeRef,
-    deviceRef = _useStoreRef.deviceRef;
+    deviceRef = _useStoreRef.deviceRef,
+    orderIdRef = _useStoreRef.orderIdRef;
   var fail = useFail(0);
   var failRef = useRef(fail);
   var isPay = modeRef.current === ModeEnum.Pay || modeRef.current === ModeEnum.FullPay;
@@ -37,6 +38,8 @@ export var useTimeResultQuery = function useTimeResultQuery(api, resultCheck, ha
   var startTimeRef = useRef(null);
   // 查询是否结束
   var isQueryFinishedRef = useRef(true);
+  // 每轮查询的唯一标识
+  var queryIdRef = useRef(null);
   // 轮询间隔定时器
   var queryIntervalTimerRef = useRef(null);
   var _resultQuery = /*#__PURE__*/function () {
@@ -61,7 +64,8 @@ export var useTimeResultQuery = function useTimeResultQuery(api, resultCheck, ha
             // 设置单次请求超时定时器
             requestTimeoutIdRef.current = setTimeout(function () {
               var _controllerRef$curren;
-              payLog.log('Linkly轮询：单次请求超时');
+              console.log('单次请求超时，将尝试重试');
+              _log("RequestTimeout");
               (_controllerRef$curren = controllerRef.current) === null || _controllerRef$curren === void 0 || _controllerRef$curren.abort();
               isRequestCanceledRef.current = true;
             }, RequestTimeout);
@@ -88,7 +92,14 @@ export var useTimeResultQuery = function useTimeResultQuery(api, resultCheck, ha
               var data = (result === null || result === void 0 ? void 0 : result.data) || {};
               // 交易成功，终止查询
               if (data.status == 1) {
-                payLog.log('Linkly轮询：交易成功');
+                console.log('交易成功，终止查询');
+                sendWarningLog({
+                  title: "Linkly-".concat(isPay ? 'Pay' : 'Refund', "-\u4EA4\u6613\u6210\u529F"),
+                  content: [{
+                    key: 'response',
+                    value: JSON.stringify(result)
+                  }]
+                });
                 reset();
                 handleLinklySuccess(result);
                 return;
@@ -96,9 +107,8 @@ export var useTimeResultQuery = function useTimeResultQuery(api, resultCheck, ha
 
               // 交易状态为0，且不需要签名，则继续查询
               if ((data === null || data === void 0 ? void 0 : data.status) == 0 && (data === null || data === void 0 ? void 0 : data.signature_flag) != 1) {
-                payLog.log('Linkly轮询：继续查询', {
-                  data: data
-                });
+                console.log('交易状态为0需要继续查询');
+                _log("Querying", result);
                 isQueryFinishedRef.current = false;
                 queryIntervalTimerRef.current = setTimeout(function () {
                   _resultQuery();
@@ -109,8 +119,13 @@ export var useTimeResultQuery = function useTimeResultQuery(api, resultCheck, ha
               // 交易状态为-1，则交易失败，不可前往支付标记页面
               if (data.status < 0) {
                 var _failRef$current;
-                payLog.log('Linkly轮询：交易失败', {
-                  data: data
+                console.log('交易失败，终止查询');
+                sendWarningLog({
+                  title: "Linkly-".concat(isPay ? 'Pay' : 'Refund', "-\u4EA4\u6613\u5931\u8D25"),
+                  content: [{
+                    key: 'response',
+                    value: JSON.stringify(result)
+                  }]
                 });
                 reset();
                 // 交易失败，code码转换为支付失败code码
@@ -121,8 +136,13 @@ export var useTimeResultQuery = function useTimeResultQuery(api, resultCheck, ha
 
               // 需要签名
               if (data.signature_flag == 1) {
-                payLog.log('Linkly轮询：需要签名', {
-                  data: data
+                console.log('交易需要签名，终止查询');
+                sendWarningLog({
+                  title: "Linkly-".concat(isPay ? 'Pay' : 'Refund', "-\u4EA4\u6613\u9700\u8981\u7B7E\u540D"),
+                  content: [{
+                    key: 'response',
+                    value: JSON.stringify(result)
+                  }]
                 });
                 reset();
                 gotoSignature();
@@ -138,7 +158,8 @@ export var useTimeResultQuery = function useTimeResultQuery(api, resultCheck, ha
               }
               isQueryFinishedRef.current = true;
               if ((error === null || error === void 0 ? void 0 : error.name) === "AbortError" || isRequestCanceledRef.current) {
-                payLog.log('Linkly轮询：请求被取消，继续查询');
+                _log("AbortError");
+                console.log('Error: 请求被取消，将继续查询');
                 isQueryFinishedRef.current = false;
                 queryIntervalTimerRef.current = setTimeout(function () {
                   _resultQuery();
@@ -148,16 +169,15 @@ export var useTimeResultQuery = function useTimeResultQuery(api, resultCheck, ha
 
               // 网关类报错，继续查询
               if (!(error !== null && error !== void 0 && error.code) || "".concat(error.code) === PayStatus.Timeout) {
-                payLog.log('Linkly轮询：网关报错，继续查询');
+                _log("NetworkError");
+                console.log('Error: 网关类报错，将继续查询');
                 isQueryFinishedRef.current = false;
                 queryIntervalTimerRef.current = setTimeout(function () {
                   _resultQuery();
                 }, QUERY_INTERVAL);
                 return;
               }
-              payLog.log('Linkly轮询：查询失败', {
-                error: error
-              });
+              _log("Error", error);
               reset();
               (_failRef$current2 = failRef.current) === null || _failRef$current2 === void 0 || _failRef$current2.call(failRef, error, true);
             }).finally(function () {
@@ -216,7 +236,8 @@ export var useTimeResultQuery = function useTimeResultQuery(api, resultCheck, ha
    * 重置查询状态
    */
   var reset = function reset() {
-    payLog.log('Linkly轮询：重置查询状态');
+    console.log('linkly查询状态重制<<<<<<<----');
+    _log("Reset");
     if (globalTimeoutIdRef.current) {
       clearTimeout(globalTimeoutIdRef.current);
       globalTimeoutIdRef.current = null;
@@ -236,6 +257,43 @@ export var useTimeResultQuery = function useTimeResultQuery(api, resultCheck, ha
     startTimeRef.current = null;
     isRequestCanceledRef.current = false;
     isQueryFinishedRef.current = true;
+    queryIdRef.current = null;
+  };
+  var _log = function _log(type, res) {
+    var _deviceRef$current2;
+    var params = {
+      // 设备id
+      pinpad_id: deviceRef === null || deviceRef === void 0 || (_deviceRef$current2 = deviceRef.current) === null || _deviceRef$current2 === void 0 || (_deviceRef$current2 = _deviceRef$current2.metadata) === null || _deviceRef$current2 === void 0 ? void 0 : _deviceRef$current2.linkly_pinpad_id,
+      // 交易流水号
+      session_id: numRef.current
+    };
+    var content = [{
+      key: 'description',
+      value: JSON.stringify({
+        queryId: queryIdRef.current,
+        orderId: orderIdRef.current,
+        type: type,
+        date: dayjs().format('YYYY-MM-DD HH:mm:ss')
+      })
+    }, {
+      key: 'params',
+      value: JSON.stringify(params)
+    }];
+    if (type === "Error") {
+      content.push({
+        key: 'error',
+        value: JSON.stringify(res)
+      });
+    } else {
+      content.push({
+        key: 'response',
+        value: JSON.stringify(res)
+      });
+    }
+    sendWarningLog({
+      title: "Linkly-".concat(isPay ? 'Pay' : 'Refund', "-\u4EA4\u6613\u7ED3\u679C\u8F6E\u8BE2"),
+      content: content
+    });
   };
   var run = function run() {
     // 重置状态
@@ -244,7 +302,8 @@ export var useTimeResultQuery = function useTimeResultQuery(api, resultCheck, ha
     // 设置全局超时定时器
     globalTimeoutIdRef.current = setTimeout(function () {
       var _failRef$current3;
-      payLog.log('Linkly轮询：全局超时');
+      console.log('全局超时，终止所有重试');
+      _log("GlobalTimeout");
       setTimeout(reset, 0);
       // 交易超时，需要手动标记交易状态
       (_failRef$current3 = failRef.current) === null || _failRef$current3 === void 0 || _failRef$current3.call(failRef, {
@@ -253,7 +312,9 @@ export var useTimeResultQuery = function useTimeResultQuery(api, resultCheck, ha
     }, GlobalTimeout);
     startTimeRef.current = Date.now();
     isQueryFinishedRef.current = false;
-    payLog.log('Linkly轮询：开始查询');
+    queryIdRef.current = getUniqueId();
+    console.log('开始查询linkly结果---->>>>>>>');
+    _log("Start");
     return _resultQuery();
   };
   return {

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

@@ -1,3 +1,2 @@
-import React from 'react';
-declare const Linkly: ({ api, onChange }: any) => React.JSX.Element;
+declare const Linkly: ({ api, onChange }: any) => JSX.Element;
 export default Linkly;

package/es/components/eftposPay/linkly/index.js

@@ -9,7 +9,7 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import React, { useEffect, useRef } from 'react';
 import { Button } from 'antd';
-import { locales } from '@pisell/utils';
+import { locales, sendWarningLog } from '@pisell/utils';
 import { useContextData, useDispatch, updateCustom, updateState, updateNextStep } from "../store";
 import { useFail, useStoreRef } from "../hooks";
 import useEngineContext from "../../../hooks/useEngineContext";
@@ -19,7 +19,6 @@ import { StatusEnum } from "../const";
 import { useLinklyCancel, useLinklyPayOrRefund, useTimeResultQuery, useLinklySignature } from "./hooks";
 import { LinklyActionStatus } from "./const";
 import { getPayParams } from "../helper";
-import payLog from "../utils/payLog";
 var Linkly = function Linkly(_ref) {
   var api = _ref.api,
     onChange = _ref.onChange;
@@ -53,7 +52,6 @@ var Linkly = function Linkly(_ref) {
     return !(unloadRef.current || !netRef.current);
   };
   var handleLinklySuccess = function handleLinklySuccess(res) {
-    payLog.log('Linkly：最终支付成功');
     var resData = (res === null || res === void 0 ? void 0 : res.data) || {};
     var receipt = Array.isArray(resData === null || resData === void 0 ? void 0 : resData.receipt) ? resData.receipt : [resData.receipt];
     receipt = receipt.filter(function (item) {
@@ -107,6 +105,7 @@ var Linkly = function Linkly(_ref) {
   }, [fail]);
   useEffect(function () {
     var _utils$isTerminal, _utils$interaction;
+    console.log('statusRef.current11111', statusRef.current);
     if (statusRef.current === StatusEnum.Success || statusRef.current === StatusEnum.Fail) {
       return;
     }
@@ -141,8 +140,14 @@ var Linkly = function Linkly(_ref) {
                 if (activeStatus !== 'unActive') {
                   payOrRefund(resultQuery, handleLinklySuccess);
                 } else {
-                  payLog.log('Linkly：页面非活跃状态，阻断支付', {
-                    activeStatus: activeStatus
+                  sendWarningLog({
+                    title: 'Linkly-支付-当前页面非活跃状态，无法进行支付',
+                    content: [{
+                      key: 'response',
+                      value: JSON.stringify({
+                        activeStatus: activeStatus
+                      })
+                    }]
                   });
                 }
                 _context.next = 11;
@@ -150,8 +155,12 @@ var Linkly = function Linkly(_ref) {
               case 7:
                 _context.prev = 7;
                 _context.t0 = _context["catch"](0);
-                payLog.log('Linkly：获取页面活跃状态失败', {
-                  error: _context.t0
+                sendWarningLog({
+                  title: 'Linkly-支付-获取当前页面活跃状态失败',
+                  content: [{
+                    key: 'error',
+                    value: JSON.stringify(_context.t0)
+                  }]
                 });
                 // 如果获取活跃状态失败，则进行支付，防止流程卡死
                 payOrRefund(resultQuery, handleLinklySuccess);
@@ -185,17 +194,22 @@ var Linkly = function Linkly(_ref) {
    * 取消支付
    */
   var onCancel = function onCancel() {
-    payLog.log('Linkly：点击取消支付');
     stopResultQuery();
     linklyCancel(resultQuery);
   };
+
+  /**
+   * 拒绝签名
+   */
   var onDecline = function onDecline() {
-    payLog.log('Linkly：签名-点击拒绝');
     stopResultQuery();
     linklySignature(2, resultQuery);
   };
+
+  /**
+   * 接受签名
+   */
   var onAccept = function onAccept() {
-    payLog.log('Linkly：签名-点击接受');
     stopResultQuery();
     linklySignature(3, resultQuery);
   };