@pisell/private-materials 3.4.91 → 3.4.93

package/es/components/eftposPay/index.js

@@ -26,14 +26,25 @@ import { getInitState } from "./manufacturer";
 import { Provider } from "./store";
 import "./index.less";
 import { getLocale } from "../../utils/locales";
+import payLog, { usePayLog } from "./utils/payLog";
 locales.init(localeTexts, getLocale());
 export default (function (props) {
-  var _context$appHelper, _store$getState, _props$params, _props$params2;
+  var _props$params, _context$appHelper, _props$params3, _store$getState, _props$params4, _props$params5;
   var _useState = useState(props.type === EftposEnum.Tyro ? OrderEumn.Null : props.source === RestoreEumn.Restore ? OrderEumn.Restore : OrderEumn.Normal),
     _useState2 = _slicedToArray(_useState, 2),
     check = _useState2[0],
     setCheckStatus = _useState2[1];
   var context = useEngineContext();
+  usePayLog({
+    paymentType: props.type,
+    mode: props.mode || ModeEnum.Pay,
+    orderId: (_props$params = props.params) === null || _props$params === void 0 ? void 0 : _props$params.order_id,
+    extra: {
+      initialParams: (props === null || props === void 0 ? void 0 : props.params) || null,
+      initialSource: (props === null || props === void 0 ? void 0 : props.source) || '',
+      initialDevice: (props === null || props === void 0 ? void 0 : props.device) || null
+    }
+  });
   var _useState3 = useState(0),
     _useState4 = _slicedToArray(_useState3, 2),
     cardSurcharge = _useState4[0],
@@ -69,20 +80,30 @@ export default (function (props) {
     store = _ref.store;
 
   /**
-   * terminal : terminal 内嵌
-   * android_kiosk     : kiosk 内嵌
+   * 优先从 props.params.platform 中获取渠道信息，其次读取 storage 中的 channel 字段
+   * terminal: terminal 内嵌
+   * android_kiosk / kiosk: kiosk 内嵌
+   * 默认: web
    */
   var channel = useMemo(function () {
-    var _storage$get;
-    var channel = (storage === null || storage === void 0 || (_storage$get = storage.get) === null || _storage$get === void 0 ? void 0 : _storage$get.call(storage, 'channel')) || '';
-    if (channel === 'terminal') {
+    var _props$params2, _storage$get;
+    if ((props === null || props === void 0 || (_props$params2 = props.params) === null || _props$params2 === void 0 ? void 0 : _props$params2.platform) === 'kiosk') {
+      return 'kiosk';
+    }
+    var rawChannel = (storage === null || storage === void 0 || (_storage$get = storage.get) === null || _storage$get === void 0 ? void 0 : _storage$get.call(storage, 'channel')) || '';
+    if (rawChannel === 'terminal') {
       return 'terminal';
     }
-    if (channel === 'android_kiosk') {
+    if (rawChannel === 'android_kiosk') {
       return 'kiosk';
     }
     return '';
-  }, []);
+  }, [props === null || props === void 0 || (_props$params3 = props.params) === null || _props$params3 === void 0 ? void 0 : _props$params3.platform, storage]);
+  useEffect(function () {
+    payLog.setContext({
+      channel: channel || 'web'
+    });
+  }, [channel]);
   var isMobile = useMemo(function () {
     return Boolean(channel);
   }, [channel]);
@@ -132,6 +153,11 @@ export default (function (props) {
     stateRef.current = state;
   }, [state]);
   var onChangeStatus = useCallback(function (status, params, other) {
+    payLog.log('支付状态回调', {
+      status: status,
+      params: params,
+      other: other
+    });
     props.onChangeStatus(status, params, other);
   }, []);
   var action = useMemo(function () {
@@ -167,11 +193,10 @@ export default (function (props) {
   }, [mode, state]);
   useEffect(function () {
     document.body.id = 'body';
-    console.log('初始化 ........112218017777');
   }, []);
 
   // console.log('action = ', action);
-  console.log('props?.params?.device_number = ', props === null || props === void 0 || (_props$params = props.params) === null || _props$params === void 0 ? void 0 : _props$params.device_number);
+  console.log('props?.params?.device_number = ', props === null || props === void 0 || (_props$params4 = props.params) === null || _props$params4 === void 0 ? void 0 : _props$params4.device_number);
 
   /**
    * @title: api 接口 数据
@@ -188,12 +213,14 @@ export default (function (props) {
     if (props.source === RestoreEumn.Restore || props.type === EftposEnum.Tyro) {
       return;
     }
+    payLog.log('交易检查：开始检查交易');
     api.getTransaction({
       order_id: stateRef.current.order_id,
       card_reader_type: stateRef.current.eftpos,
       receive_status: 'unprocessed'
     }).then(function (res) {
       if (!Array.isArray(res.data) || res.data.length === 0) {
+        payLog.log('交易检查：无未处理交易');
         setCheckStatus(OrderEumn.Null);
         return;
       }
@@ -210,6 +237,9 @@ export default (function (props) {
         return item.number;
       });
       if (latest.status === OrderEumn.Failed) {
+        payLog.log('交易检查：最新交易已失败', {
+          number: latest.number
+        });
         setCheckStatus(latest.status);
         onChangeStatus('mark_tx_processed', [].concat(_toConsumableArray(numberList), [latest.number]));
         return;
@@ -231,8 +261,15 @@ export default (function (props) {
       try {
         var data = JSON.parse(decodeURIComponent(atob(decodeURIComponent(pay_param_base64))));
         setHistory(data);
+        payLog.log('交易检查：发现待处理交易', {
+          status: latest.status,
+          number: latest.number
+        });
         setCheckStatus(latest.status);
       } catch (e) {
+        payLog.log('交易检查：解析交易数据失败', {
+          error: e
+        });
         setCheckStatus(OrderEumn.Failed);
         return;
       }
@@ -267,7 +304,7 @@ export default (function (props) {
     source: props.source,
     tyroUrl: props.tyroUrl,
     tyroVersion: props.tyroVersion,
-    device_number: props === null || props === void 0 || (_props$params2 = props.params) === null || _props$params2 === void 0 ? void 0 : _props$params2.device_number,
+    device_number: props === null || props === void 0 || (_props$params5 = props.params) === null || _props$params5 === void 0 ? void 0 : _props$params5.device_number,
     isMobile: isMobile,
     formatAmount: formatAmount
   }));

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

@@ -1,11 +1,12 @@
 import { useRequest } from 'ahooks';
 import { useEffect, useRef } from 'react';
-import { locales, sendWarningLog } from '@pisell/utils';
+import { locales } 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";
 
 /**
  * 支付或退款
@@ -61,12 +62,8 @@ export var useLinklyPayOrRefund = function useLinklyPayOrRefund(handleCheck) {
     if (!handleCheck()) {
       return;
     }
-    sendWarningLog({
-      title: "Linkly-".concat(isPay ? 'Pay' : 'Refund', "-\u63A5\u53E3\u6210\u529F"),
-      content: [{
-        key: 'response',
-        value: JSON.stringify(res)
-      }]
+    payLog.log("Linkly\uFF1A".concat(isPay ? '支付' : '退款', "\u63A5\u53E3\u6210\u529F"), {
+      res: res
     });
 
     // status 交易状态 0:未知，继续查询 1:成功 -1:失败 -2:交易错误
@@ -120,12 +117,8 @@ export var useLinklyPayOrRefund = function useLinklyPayOrRefund(handleCheck) {
     if (!handleCheck()) {
       return;
     }
-    sendWarningLog({
-      title: "Linkly-".concat(isPay ? 'Pay' : 'Refund', "-\u63A5\u53E3\u5931\u8D25"),
-      content: [{
-        key: 'error',
-        value: JSON.stringify(error)
-      }]
+    payLog.log("Linkly\uFF1A".concat(isPay ? '支付' : '退款', "\u63A5\u53E3\u5931\u8D25"), {
+      error: JSON.stringify(error || {})
     });
     (_failRef$current2 = failRef.current) === null || _failRef$current2 === void 0 || _failRef$current2.call(failRef, error, false);
   };
@@ -141,12 +134,11 @@ export var useLinklyPayOrRefund = function useLinklyPayOrRefund(handleCheck) {
       // 交易金额, 包含选择的订单金额+手续费，订单金额+手续费=交易金额
       amount: isPay ? (_payRef$current = payRef.current) === null || _payRef$current === void 0 ? void 0 : _payRef$current.total : amountRef.current
     };
-    sendWarningLog({
-      title: "Linkly-".concat(isPay ? 'Pay' : 'Refund'),
-      content: [{
-        key: 'params',
-        value: JSON.stringify(param)
-      }]
+    payLog.setContext({
+      transactionNumber: String(orderIdRef.current)
+    });
+    payLog.log("Linkly\uFF1A\u53D1\u8D77".concat(isPay ? '支付' : '退款'), {
+      param: param
     });
     _pay.run(param);
   };
@@ -179,23 +171,9 @@ export var useLinklyCancel = function useLinklyCancel(handleCheck) {
     if (!handleCheck()) {
       return;
     }
-    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)
-        }]
-      });
-    }
+    payLog.log("Linkly\uFF1A\u53D6\u6D88".concat(type === 'success' ? '成功' : '失败'), {
+      res: res
+    });
     (_resultQueryRef$curre2 = resultQueryRef.current) === null || _resultQueryRef$curre2 === void 0 || _resultQueryRef$curre2.call(resultQueryRef);
   };
   var _cancel = useRequest(isPay ? linklyPayCancelApi : linklyRefundCancelApi, {
@@ -210,22 +188,15 @@ 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
     };
-    sendWarningLog({
-      title: "Linkly-".concat(isPay ? 'Pay' : 'Refund', "-\u53D6\u6D88"),
-      content: [{
-        key: 'params',
-        value: JSON.stringify(param)
-      }]
+    payLog.log('Linkly：发起取消', {
+      param: param
     });
     _cancel.run(param);
     dispatch(updateCustom({
@@ -258,23 +229,9 @@ export var useLinklySignature = function useLinklySignature(handleCheck) {
     if (!handleCheck()) {
       return;
     }
-    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)
-        }]
-      });
-    }
+    payLog.log("Linkly\uFF1A\u7B7E\u540D\u63A5\u53E3".concat(type === 'success' ? '成功' : '失败'), {
+      res: res
+    });
     (_resultQueryRef$curre3 = resultQueryRef.current) === null || _resultQueryRef$curre3 === void 0 || _resultQueryRef$curre3.call(resultQueryRef);
   };
   var _signature = useRequest(isPay ? linklyPaySignatureApi : linklyRefundSignatureApi, {
@@ -303,12 +260,8 @@ export var useLinklySignature = function useLinklySignature(handleCheck) {
     dispatch(updateCustom({
       actionStatus: LinklyActionStatus.SignatureWaiting
     }));
-    sendWarningLog({
-      title: "Linkly-".concat(isPay ? 'Pay' : 'Refund', "-\u7B7E\u540D"),
-      content: [{
-        key: 'params',
-        value: JSON.stringify(param)
-      }]
+    payLog.log('Linkly：发起签名', {
+      param: 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 { getUniqueId, locales, sendWarningLog } from '@pisell/utils';
-import dayjs from 'dayjs';
+import { locales } from '@pisell/utils';
 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,8 +21,7 @@ export var useTimeResultQuery = function useTimeResultQuery(api, resultCheck, ha
   var _useStoreRef = useStoreRef(),
     numRef = _useStoreRef.numRef,
     modeRef = _useStoreRef.modeRef,
-    deviceRef = _useStoreRef.deviceRef,
-    orderIdRef = _useStoreRef.orderIdRef;
+    deviceRef = _useStoreRef.deviceRef;
   var fail = useFail(0);
   var failRef = useRef(fail);
   var isPay = modeRef.current === ModeEnum.Pay || modeRef.current === ModeEnum.FullPay;
@@ -38,8 +37,6 @@ 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 () {
@@ -64,8 +61,7 @@ export var useTimeResultQuery = function useTimeResultQuery(api, resultCheck, ha
             // 设置单次请求超时定时器
             requestTimeoutIdRef.current = setTimeout(function () {
               var _controllerRef$curren;
-              console.log('单次请求超时，将尝试重试');
-              _log("RequestTimeout");
+              payLog.log('Linkly轮询：单次请求超时');
               (_controllerRef$curren = controllerRef.current) === null || _controllerRef$curren === void 0 || _controllerRef$curren.abort();
               isRequestCanceledRef.current = true;
             }, RequestTimeout);
@@ -92,14 +88,7 @@ export var useTimeResultQuery = function useTimeResultQuery(api, resultCheck, ha
               var data = (result === null || result === void 0 ? void 0 : result.data) || {};
               // 交易成功，终止查询
               if (data.status == 1) {
-                console.log('交易成功，终止查询');
-                sendWarningLog({
-                  title: "Linkly-".concat(isPay ? 'Pay' : 'Refund', "-\u4EA4\u6613\u6210\u529F"),
-                  content: [{
-                    key: 'response',
-                    value: JSON.stringify(result)
-                  }]
-                });
+                payLog.log('Linkly轮询：交易成功');
                 reset();
                 handleLinklySuccess(result);
                 return;
@@ -107,8 +96,9 @@ 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) {
-                console.log('交易状态为0需要继续查询');
-                _log("Querying", result);
+                payLog.log('Linkly轮询：继续查询', {
+                  data: data
+                });
                 isQueryFinishedRef.current = false;
                 queryIntervalTimerRef.current = setTimeout(function () {
                   _resultQuery();
@@ -119,13 +109,8 @@ export var useTimeResultQuery = function useTimeResultQuery(api, resultCheck, ha
               // 交易状态为-1，则交易失败，不可前往支付标记页面
               if (data.status < 0) {
                 var _failRef$current;
-                console.log('交易失败，终止查询');
-                sendWarningLog({
-                  title: "Linkly-".concat(isPay ? 'Pay' : 'Refund', "-\u4EA4\u6613\u5931\u8D25"),
-                  content: [{
-                    key: 'response',
-                    value: JSON.stringify(result)
-                  }]
+                payLog.log('Linkly轮询：交易失败', {
+                  data: data
                 });
                 reset();
                 // 交易失败，code码转换为支付失败code码
@@ -136,13 +121,8 @@ export var useTimeResultQuery = function useTimeResultQuery(api, resultCheck, ha
 
               // 需要签名
               if (data.signature_flag == 1) {
-                console.log('交易需要签名，终止查询');
-                sendWarningLog({
-                  title: "Linkly-".concat(isPay ? 'Pay' : 'Refund', "-\u4EA4\u6613\u9700\u8981\u7B7E\u540D"),
-                  content: [{
-                    key: 'response',
-                    value: JSON.stringify(result)
-                  }]
+                payLog.log('Linkly轮询：需要签名', {
+                  data: data
                 });
                 reset();
                 gotoSignature();
@@ -158,8 +138,7 @@ export var useTimeResultQuery = function useTimeResultQuery(api, resultCheck, ha
               }
               isQueryFinishedRef.current = true;
               if ((error === null || error === void 0 ? void 0 : error.name) === "AbortError" || isRequestCanceledRef.current) {
-                _log("AbortError");
-                console.log('Error: 请求被取消，将继续查询');
+                payLog.log('Linkly轮询：请求被取消，继续查询');
                 isQueryFinishedRef.current = false;
                 queryIntervalTimerRef.current = setTimeout(function () {
                   _resultQuery();
@@ -169,15 +148,16 @@ export var useTimeResultQuery = function useTimeResultQuery(api, resultCheck, ha
 
               // 网关类报错，继续查询
               if (!(error !== null && error !== void 0 && error.code) || "".concat(error.code) === PayStatus.Timeout) {
-                _log("NetworkError");
-                console.log('Error: 网关类报错，将继续查询');
+                payLog.log('Linkly轮询：网关报错，继续查询');
                 isQueryFinishedRef.current = false;
                 queryIntervalTimerRef.current = setTimeout(function () {
                   _resultQuery();
                 }, QUERY_INTERVAL);
                 return;
               }
-              _log("Error", error);
+              payLog.log('Linkly轮询：查询失败', {
+                error: error
+              });
               reset();
               (_failRef$current2 = failRef.current) === null || _failRef$current2 === void 0 || _failRef$current2.call(failRef, error, true);
             }).finally(function () {
@@ -236,8 +216,7 @@ export var useTimeResultQuery = function useTimeResultQuery(api, resultCheck, ha
    * 重置查询状态
    */
   var reset = function reset() {
-    console.log('linkly查询状态重制<<<<<<<----');
-    _log("Reset");
+    payLog.log('Linkly轮询：重置查询状态');
     if (globalTimeoutIdRef.current) {
       clearTimeout(globalTimeoutIdRef.current);
       globalTimeoutIdRef.current = null;
@@ -257,43 +236,6 @@ 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() {
     // 重置状态
@@ -302,8 +244,7 @@ export var useTimeResultQuery = function useTimeResultQuery(api, resultCheck, ha
     // 设置全局超时定时器
     globalTimeoutIdRef.current = setTimeout(function () {
       var _failRef$current3;
-      console.log('全局超时，终止所有重试');
-      _log("GlobalTimeout");
+      payLog.log('Linkly轮询：全局超时');
       setTimeout(reset, 0);
       // 交易超时，需要手动标记交易状态
       (_failRef$current3 = failRef.current) === null || _failRef$current3 === void 0 || _failRef$current3.call(failRef, {
@@ -312,9 +253,7 @@ export var useTimeResultQuery = function useTimeResultQuery(api, resultCheck, ha
     }, GlobalTimeout);
     startTimeRef.current = Date.now();
     isQueryFinishedRef.current = false;
-    queryIdRef.current = getUniqueId();
-    console.log('开始查询linkly结果---->>>>>>>');
-    _log("Start");
+    payLog.log('Linkly轮询：开始查询');
     return _resultQuery();
   };
   return {

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

@@ -1,3 +1,3 @@
-import React from 'react';
-declare const Linkly: ({ api, onChange }: any) => React.JSX.Element;
+/// <reference types="react" />
+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, sendWarningLog } from '@pisell/utils';
+import { locales } from '@pisell/utils';
 import { useContextData, useDispatch, updateCustom, updateState, updateNextStep } from "../store";
 import { useFail, useStoreRef } from "../hooks";
 import useEngineContext from "../../../hooks/useEngineContext";
@@ -19,6 +19,7 @@ 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;
@@ -52,6 +53,7 @@ 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) {
@@ -139,14 +141,8 @@ var Linkly = function Linkly(_ref) {
                 if (activeStatus !== 'unActive') {
                   payOrRefund(resultQuery, handleLinklySuccess);
                 } else {
-                  sendWarningLog({
-                    title: 'Linkly-支付-当前页面非活跃状态，无法进行支付',
-                    content: [{
-                      key: 'response',
-                      value: JSON.stringify({
-                        activeStatus: activeStatus
-                      })
-                    }]
+                  payLog.log('Linkly：页面非活跃状态，阻断支付', {
+                    activeStatus: activeStatus
                   });
                 }
                 _context.next = 11;
@@ -154,12 +150,8 @@ var Linkly = function Linkly(_ref) {
               case 7:
                 _context.prev = 7;
                 _context.t0 = _context["catch"](0);
-                sendWarningLog({
-                  title: 'Linkly-支付-获取当前页面活跃状态失败',
-                  content: [{
-                    key: 'error',
-                    value: JSON.stringify(_context.t0)
-                  }]
+                payLog.log('Linkly：获取页面活跃状态失败', {
+                  error: _context.t0
                 });
                 // 如果获取活跃状态失败，则进行支付，防止流程卡死
                 payOrRefund(resultQuery, handleLinklySuccess);
@@ -193,22 +185,17 @@ 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);
   };

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

@@ -1,4 +1,4 @@
-import React from 'react';
+/// <reference types="react" />
 import { PayProps } from './const';
 import './index.less';
 /**
@@ -17,5 +17,5 @@ declare const Pay: ({ api, onChange: onChangeStatus, className, terminal, net, i
     tyroVersion?: string | undefined;
     formatAmount(amount: number | string, precision: number, symbol: string): string;
     client: string;
-}) => React.JSX.Element;
+}) => JSX.Element;
 export default Pay;

package/es/components/eftposPay/pay.js

@@ -13,6 +13,7 @@ import { StatusEnum, PayRouteEnum, ClientEnum } from "./const";
 import { Payo, Windcave, Tyro, Linkly } from "./manufacturer";
 import { useContextData, useDispatch, updateStatus, backUpProduction, updateComponent, backUpFree, updateState } from "./store";
 import "./index.less";
+import payLog from "./utils/payLog";
 
 // 定制组件 用于当前页面无法扩展场景
 var Mapping = {
@@ -45,13 +46,15 @@ var Pay = function Pay(_ref) {
     client = _ref.client;
   var data = useContextData();
   var dataRef = useRef(data);
-  // console.log("pay = ",'pay')
   var dispatch = useDispatch();
   var ref = useRef(false);
   var statusRef = useRef(data.status);
   var comonentRef = useRef(data.component);
   var backupRef = useRef(data.backup);
-  var clearRef = useRef(0);
+  var clearRef = useRef(null);
+  useEffect(function () {
+    payLog.log('支付组件初始化');
+  }, []);
   useEffect(function () {
     comonentRef.current = data.component;
   }, [data.component]);
@@ -92,10 +95,11 @@ var Pay = function Pay(_ref) {
       net: net
     }));
     if (!ref.current) {
-      // 初始化
       ref.current = true;
-      // 断网&崩溃   恢复处理
       if (backupRef.current && net) {
+        payLog.log('网络恢复：从备份恢复', {
+          hasBackup: true
+        });
         var _data = Object.assign({}, (_objectDestructuringEmpty(backupRef.current), backupRef.current));
         dispatch(backUpFree({
           key: Date.now()
@@ -115,8 +119,10 @@ var Pay = function Pay(_ref) {
       return;
     }
     if (net) {
+      payLog.log('网络恢复', {
+        hasBackup: !!backupRef.current
+      });
       var _data2 = Object.assign({}, (_objectDestructuringEmpty(backupRef.current), backupRef.current));
-      // 网络恢复 释放备份
       dispatch(backUpFree({
         key: Date.now()
       }));
@@ -132,10 +138,10 @@ var Pay = function Pay(_ref) {
       }
       return;
     }
-    // 网络终端 - 备份数据
+    payLog.log('网络断开，备份数据');
     dispatch(updateState({
       form: 'Network'
-    })); // 最新的展示的组件为 Network
+    }));
     dispatch(backUpProduction({}));
     dispatch(updateState({
       net: net,
@@ -147,6 +153,7 @@ var Pay = function Pay(_ref) {
     return function () {
       if (clearRef.current) {
         clearTimeout(clearRef.current);
+        clearRef.current = null;
       }
     };
   }, []);