@pisell/private-materials 3.4.90 → 3.4.92

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,3 @@
-import React from 'react';
 import { PayProps } from './const';
 import './index.less';
 /**
@@ -17,5 +16,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;
       }
     };
   }, []);

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

@@ -1,4 +1,3 @@
-import React from 'react';
 import { StatusEnum } from '../const';
 export declare const POS: ({ api, onChange, }: {
     api: {
@@ -7,7 +6,7 @@ export declare const POS: ({ api, onChange, }: {
     onChange: (status: `${StatusEnum.Success}` | `${StatusEnum.Fail}`, params?: {
         [keys: string]: unknown;
     } | undefined) => void;
-}) => React.JSX.Element;
+}) => JSX.Element;
 export declare const Action: ({ onChange }: {
     onChange: any;
-}) => React.JSX.Element;
+}) => JSX.Element;

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

@@ -28,6 +28,7 @@ import { useFail, useStoreRef } from "../hooks";
 import { useContextData, useDispatch, updateNextStep, updateComponent, updateState, updateCustom } from "../store";
 import { useValidate } from "./hooks";
 import { usePayment, ActionType } from "./payment";
+import payLog from "../utils/payLog";
 
 // 注意断网与卸载未完成的回调将终止处理
 export var POS = function POS(_ref) {
@@ -54,7 +55,7 @@ export var POS = function POS(_ref) {
   var fail = useFail(0);
   var failRef = useRef(fail);
   var controllerRef = useRef();
-  var clearRef = useRef();
+  var clearRef = useRef(null);
   var initRef = useRef(false);
   var unloadRef = useRef(false);
   var _useValidate = useValidate(1000 * 60),
@@ -197,9 +198,15 @@ export var POS = function POS(_ref) {
     //   ? api.pay(apiParams, { signal: controllerRef.current.signal })
     //   : api.refund(apiParams, { signal: controllerRef.current.signal });
 
-    // 支付场景单独接入新的流程 
+    payLog.setContext({
+      transactionNumber: numRef.current
+    });
     if (isPay) {
       var _deviceRef$current4;
+      payLog.log('Payo：发起支付', {
+        isPay: isPay,
+        number: numRef.current
+      });
       paymentRun({
         paymentType: ActionType.Pay,
         paymentNum: numRef.current,
@@ -208,39 +215,62 @@ export var POS = function POS(_ref) {
         params: apiParams,
         callbacks: {
           onSuccess: function onSuccess(res) {
+            payLog.log('Payo：支付成功', {
+              code: res === null || res === void 0 ? void 0 : res.code
+            });
             success(res);
           },
           onError: function onError(err) {
-            console.log('err = >>>>>', err);
+            payLog.log('Payo：支付失败', {
+              code: err === null || err === void 0 ? void 0 : err.code
+            });
             failRef.current(err, true);
           }
         }
       });
       return;
     } else {
+      payLog.log('Payo：发起退款', {
+        isPay: isPay,
+        number: numRef.current
+      });
       var resultPromise = api.refund(apiParams, {
         signal: controllerRef.current.signal
       });
       resultPromise.then(function (res) {
         console.log('netRef.current111 = ', netRef.current);
         if (unloadRef.current || !netRef.current) {
+          payLog.log('Payo：退款拦截', {
+            isUnload: unloadRef.current,
+            isNet: netRef.current
+          });
           return;
         }
         if (res && "".concat(res.code) === '200') {
+          payLog.log('Payo：退款成功', {
+            res: JSON.stringify(res)
+          });
           success(res);
           return;
         }
         return Promise.reject(res);
       }).catch(function (err) {
-        console.log('netRef.current222 = ', netRef.current, unloadRef.current, err);
         if (unloadRef.current || !netRef.current) {
+          payLog.log('Payo：退款失败拦截', {
+            isUnload: unloadRef.current,
+            isNet: netRef.current
+          });
           return;
         }
-        // 支付接口超时 进行支付状态查询（超时或者其它错误）
         if (!(err !== null && err !== void 0 && err.code) || "".concat(err.code) === PayStatus.Timeout) {
+          payLog.log('Payo：退款超时，转查询');
           checkApi();
           return;
         }
+        payLog.log('Payo：退款失败', {
+          code: err === null || err === void 0 ? void 0 : err.code,
+          message: err === null || err === void 0 ? void 0 : err.message
+        });
         failRef.current(err, true);
       });
     }
@@ -274,6 +304,7 @@ export var Action = function Action(_ref2) {
   useEffect(function () {
     var timer = setTimeout(function () {
       setIsShowCancel(true);
+      payLog.log('Payo：30秒后显示取消按钮');
     }, 30 * 1000);
     return function () {
       clearTimeout(timer);
@@ -286,6 +317,7 @@ export var Action = function Action(_ref2) {
    * @Date: 2024-08-20 12:18
    */
   var onManually = function onManually() {
+    payLog.log('Payo：点击手动标记');
     dispatch(updateState({
       manual: {
         title: locales.getText('page.eftpos-pay.text.request.title')(mode),
@@ -295,6 +327,7 @@ export var Action = function Action(_ref2) {
     dispatch(updateComponent('Manual', true));
   };
   var onCancel = function onCancel() {
+    payLog.log('Payo：点击取消');
     onChange('fail', {
       number: number,
       uniquePaymentNumber: number,

package/es/components/eftposPay/payo/hooks.js

@@ -12,7 +12,7 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
 import { useCallback, useEffect, useRef } from 'react';
 import { PayStatus } from "../const";
 import { sleep } from "../helper";
-import { sendWarningLog } from '@pisell/utils';
+import payLog from "../utils/payLog";
 
 /**
  * @title: 循环查询 接口状态
@@ -112,24 +112,15 @@ export var useValidate = function useValidate(timeout) {
     (_controllerRef$curren = controllerRef.current) === null || _controllerRef$curren === void 0 || _controllerRef$curren.abort();
   }, []);
   var run = function run() {
-    for (var _len = arguments.length, params = new Array(_len), _key = 0; _key < _len; _key++) {
-      params[_key] = arguments[_key];
-    }
     isTimeoutCloseRef.current = false;
     TimeoutRef.current && clearTimeout(TimeoutRef.current);
     // 开启计时
     TimeoutRef.current = setTimeout(function () {
       isTimeoutCloseRef.current = true;
-      sendWarningLog({
-        title: '支付状态查询超时',
-        content: [{
-          key: 'params',
-          value: JSON.stringify(params)
-        }]
-      });
+      payLog.log('Payo：支付状态查询超时');
       close();
     }, timeout);
-    return checkApi.apply(void 0, params);
+    return checkApi.apply(void 0, arguments);
   };
   useEffect(function () {
     return function () {

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

@@ -3,5 +3,5 @@ declare const _default: ({ api, onChange, children, }: {
     api: any;
     onChange: any;
     children: React.ReactNode;
-}) => React.JSX.Element;
+}) => JSX.Element;
 export default _default;