@pisell/private-materials 6.3.126 → 6.3.127

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/payment.js

@@ -7,7 +7,7 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try
 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 { PayStatus } from "../const";
-import paymentLog from "../utils/log";
+import payLog from "../utils/payLog";
 
 /**
  * 实现支付和查询一体化的接口
@@ -131,9 +131,8 @@ export var usePayment = function usePayment(options) {
    */
   var finish = function finish() {
     if (!isFinishedRef.current) {
-      clean(); // 先完全清理，包括回调
-      isFinishedRef.current = true; // 然后标记为已完成（防止重复调用）
-      paymentLog.clearLogs();
+      clean();
+      isFinishedRef.current = true;
     }
   };
 
@@ -143,17 +142,14 @@ export var usePayment = function usePayment(options) {
   var handleFinalSuccess = function handleFinalSuccess(res, type) {
     var _callbacksRef$current, _callbacksRef$current2;
     if (isFinishedRef.current || !shouldContinue()) {
-      console.log("\u26A0\uFE0F \u5DF2\u5B8C\u6210\u6216\u4E0D\u5E94\u7EE7\u7EED\u5904\u7406\uFF0C\u5FFD\u7565".concat(type, "\u64CD\u4F5C\u6210\u529F\u7ED3\u679C"));
+      payLog.log("handleFinalSuccess: \u5DF2\u5B8C\u6210\u6216\u4E0D\u5E94\u7EE7\u7EED\u5904\u7406\uFF0C\u5FFD\u7565".concat(type, "\u64CD\u4F5C\u6210\u529F\u7ED3\u679C"));
       return;
     }
-    (_callbacksRef$current = callbacksRef.current) === null || _callbacksRef$current === void 0 || (_callbacksRef$current2 = _callbacksRef$current.onSuccess) === null || _callbacksRef$current2 === void 0 || _callbacksRef$current2.call(_callbacksRef$current, res);
-    paymentLog.addLog({
-      title: '最终结果：支付成功',
-      content: {
-        type: type,
-        res: res
-      }
+    payLog.log('接口最终结果：支付成功', {
+      type: type,
+      res: res
     });
+    (_callbacksRef$current = callbacksRef.current) === null || _callbacksRef$current === void 0 || (_callbacksRef$current2 = _callbacksRef$current.onSuccess) === null || _callbacksRef$current2 === void 0 || _callbacksRef$current2.call(_callbacksRef$current, res);
     finish();
   };
 
@@ -165,17 +161,14 @@ export var usePayment = function usePayment(options) {
   var handleFinalError = function handleFinalError(error, type) {
     var _callbacksRef$current3, _callbacksRef$current4;
     if (isFinishedRef.current || !shouldContinue()) {
-      console.log("\u26A0\uFE0F \u5DF2\u5B8C\u6210\u6216\u4E0D\u5E94\u7EE7\u7EED\u5904\u7406\uFF0C\u5FFD\u7565".concat(type, "\u64CD\u4F5C\u9519\u8BEF"));
+      payLog.log("handleFinalError: \u5DF2\u5B8C\u6210\u6216\u4E0D\u5E94\u7EE7\u7EED\u5904\u7406\uFF0C\u5FFD\u7565".concat(type, "\u64CD\u4F5C\u9519\u8BEF"));
       return;
     }
-    (_callbacksRef$current3 = callbacksRef.current) === null || _callbacksRef$current3 === void 0 || (_callbacksRef$current4 = _callbacksRef$current3.onError) === null || _callbacksRef$current4 === void 0 || _callbacksRef$current4.call(_callbacksRef$current3, error);
-    paymentLog.addLog({
-      title: '最终结果：支付失败',
-      content: {
-        type: type,
-        error: error
-      }
+    payLog.log('接口最终结果：支付失败', {
+      type: type,
+      error: error
     });
+    (_callbacksRef$current3 = callbacksRef.current) === null || _callbacksRef$current3 === void 0 || (_callbacksRef$current4 = _callbacksRef$current3.onError) === null || _callbacksRef$current4 === void 0 || _callbacksRef$current4.call(_callbacksRef$current3, error);
     finish();
   };
 
@@ -185,7 +178,7 @@ export var usePayment = function usePayment(options) {
   var createTimeoutPromise = function createTimeoutPromise(timeoutMs) {
     return new Promise(function (_, reject) {
       requestTimeoutTimerRef.current = setTimeout(function () {
-        console.log("\u23F1\uFE0F \u5355\u6B21\u67E5\u8BE2\u8D85\u65F6\uFF08".concat(timeoutMs / 1000, "\u79D2\uFF09\uFF0C\u5F3A\u5236\u7EC8\u6B62"));
+        payLog.log("\u23F1\uFE0F \u5355\u6B21\u67E5\u8BE2\u8D85\u65F6\uFF08".concat(timeoutMs / 1000, "\u79D2\uFF09\uFF0C\u5F3A\u5236\u7EC8\u6B62"));
         isRequestTimeoutRef.current = true;
         // 取消请求
         if (queryControllerRef.current) {
@@ -209,9 +202,7 @@ export var usePayment = function usePayment(options) {
               _context.next = 3;
               break;
             }
-            paymentLog.addLog({
-              title: '支付轮询前置校验：支付已完成或不应继续处理，取消查询'
-            });
+            payLog.log('支付轮询前置校验：已完成或不应继续，取消查询');
             return _context.abrupt("return");
           case 3:
             // 清理之前的查询控制器和超时定时器
@@ -235,9 +226,7 @@ export var usePayment = function usePayment(options) {
             queryControllerRef.current = new AbortController();
             signal = queryControllerRef.current.signal;
             _context.prev = 10;
-            paymentLog.addLog({
-              title: '支付轮询：开始单次查询'
-            });
+            payLog.log('支付轮询：开始单次查询');
             // 使用 Promise.race 确保超时控制可靠
             _context.next = 14;
             return Promise.race([checkApi({
@@ -258,42 +247,34 @@ export var usePayment = function usePayment(options) {
               _context.next = 19;
               break;
             }
-            paymentLog.addLog({
-              title: '支付轮询结果：过期的查询响应，忽略'
-            });
+            payLog.log('支付轮询结果：过期的查询响应，忽略');
             return _context.abrupt("return");
           case 19:
             if (!(isFinishedRef.current || !shouldContinue())) {
               _context.next = 22;
               break;
             }
-            paymentLog.addLog({
-              title: '支付轮询结果：支付已完成或不应继续处理'
-            });
+            payLog.log('支付轮询结果：已完成或不应继续处理');
             return _context.abrupt("return");
           case 22:
             if (!(_res && "".concat(_res.code) === '200')) {
               _context.next = 26;
               break;
             }
-            paymentLog.addLog({
-              title: '支付轮询结果：支付成功'
-            });
+            payLog.log('支付轮询结果：支付成功');
             handleFinalSuccess(_res, ActionType.Query);
             return _context.abrupt("return");
           case 26:
             // 查询返回失败但没有明确code或超时code，继续轮询
             if (isRequestFailed(_res === null || _res === void 0 ? void 0 : _res.code)) {
               // 有明确错误code，停止轮询
-              paymentLog.addLog({
-                title: '支付轮询结果：有明确错误code，停止轮询',
-                content: _res
+              payLog.log('支付轮询结果：有明确错误code，停止轮询', {
+                code: _res === null || _res === void 0 ? void 0 : _res.code
               });
               handleFinalError(_res, ActionType.Query);
             } else {
-              paymentLog.addLog({
-                title: '支付轮询结果：查询返回失败但没有明确code或超时code，继续轮询',
-                content: _res
+              payLog.log('支付轮询结果：无明确code，继续轮询', {
+                code: _res === null || _res === void 0 ? void 0 : _res.code
               });
               scheduleNextQuery(paymentNum);
             }
@@ -307,15 +288,11 @@ export var usePayment = function usePayment(options) {
               clearTimeout(requestTimeoutTimerRef.current);
               requestTimeoutTimerRef.current = null;
             }
-
-            // 检查是否是过期的响应（新查询的 ID 一定大于旧查询）
             if (!(queryId < currentQueryIdRef.current)) {
               _context.next = 35;
               break;
             }
-            paymentLog.addLog({
-              title: '支付轮询结果：error-过期的查询异常，忽略'
-            });
+            payLog.log('支付轮询结果：error-过期的查询异常，忽略');
             return _context.abrupt("return");
           case 35:
             if (!(isFinishedRef.current || !shouldContinue())) {
@@ -328,24 +305,20 @@ export var usePayment = function usePayment(options) {
               _context.next = 41;
               break;
             }
-            paymentLog.addLog({
-              title: '支付轮询结果：error-请求被取消或超时，继续轮询'
-            });
+            payLog.log('支付轮询结果：error-请求被取消或超时，继续轮询');
             // 注意：这里不增加 queryId，因为 scheduleNextQuery → performQuery 会生成新的 ID
             scheduleNextQuery(paymentNum);
             return _context.abrupt("return");
           case 41:
             // 无明确code或者code是超时或支付超时，继续轮询
             if (isRequestFailed(_context.t0 === null || _context.t0 === void 0 ? void 0 : _context.t0.code)) {
-              paymentLog.addLog({
-                title: '支付轮询结果：error-有明确错误code，停止轮询',
-                content: _context.t0
+              payLog.log('支付轮询结果：error-有明确错误code，停止轮询', {
+                code: _context.t0 === null || _context.t0 === void 0 ? void 0 : _context.t0.code
               });
               handleFinalError(_context.t0, ActionType.Query);
             } else {
-              paymentLog.addLog({
-                title: '支付轮询结果：error-无明确code或者code不是超时，继续轮询',
-                content: _context.t0
+              payLog.log('支付轮询结果：error-无明确code，继续轮询', {
+                code: _context.t0 === null || _context.t0 === void 0 ? void 0 : _context.t0.code
               });
               scheduleNextQuery(paymentNum);
             }
@@ -371,9 +344,7 @@ export var usePayment = function usePayment(options) {
       clearTimeout(queryIntervalTimerRef.current);
     }
     queryIntervalTimerRef.current = setTimeout(function () {
-      paymentLog.addLog({
-        title: '支付轮询：安排下一次查询'
-      });
+      payLog.log('支付轮询：安排下一次查询');
       performQuery(paymentNum);
     }, QUERY_INTERVAL);
   };
@@ -393,9 +364,7 @@ export var usePayment = function usePayment(options) {
         return;
       }
       console.log('⏱️ 轮询全局超时（2分钟），终止所有请求');
-      paymentLog.addLog({
-        title: '轮询全局超时（2分钟），终止所有请求'
-      });
+      payLog.log('轮询全局超时（2分钟），终止所有请求');
       handleFinalError({
         code: PayStatus.Timeout,
         message: '交易超时'
@@ -416,15 +385,7 @@ export var usePayment = function usePayment(options) {
             _options$paymentType = options.paymentType, paymentType = _options$paymentType === void 0 ? ActionType.Pay : _options$paymentType, params = options.params, paymentNum = options.paymentNum, callbacks = options.callbacks; // 生成本次执行的唯一ID（使用时间戳）
             runId = Date.now();
             currentRunIdRef.current = runId;
-            _ref4 = params || {}, pay_param_base64 = _ref4.pay_param_base64, otherParams = _objectWithoutProperties(_ref4, _excluded);
-            paymentLog.init(paymentNum, {
-              orderId: options === null || options === void 0 ? void 0 : options.orderId,
-              deviceId: options === null || options === void 0 ? void 0 : options.deviceId,
-              paymentType: "PAYO_".concat(paymentType),
-              params: otherParams
-            });
-
-            // 先标记为已完成，阻止旧的请求响应被处理
+            _ref4 = params || {}, pay_param_base64 = _ref4.pay_param_base64, otherParams = _objectWithoutProperties(_ref4, _excluded); // 先标记为已完成，阻止旧的请求响应被处理
             isFinishedRef.current = true;
 
             // 清理资源但保留回调引用（会把 isFinishedRef 重置为 false）
@@ -437,124 +398,98 @@ export var usePayment = function usePayment(options) {
 
             // 10秒后开始轮询（全局超时将在开始轮询时启动）
             queryStartTimerRef.current = setTimeout(function () {
-              paymentLog.addLog({
-                title: '支付后10秒开始轮询'
-              });
+              payLog.log('支付后10秒开始轮询');
               startQuery(paymentNum);
             }, QUERY_START_DELAY);
 
             // 创建支付请求控制器
             payControllerRef.current = new AbortController();
             signal = payControllerRef.current.signal;
-            _context2.prev = 11;
-            paymentLog.addLog({
-              title: '发起支付请求'
-            });
+            _context2.prev = 10;
+            payLog.log('发起支付请求');
             resultPromise = paymentType === ActionType.Pay ? payApi : refundApi;
             if (resultPromise) {
-              _context2.next = 16;
+              _context2.next = 15;
               break;
             }
             throw new Error("".concat(paymentType === ActionType.Pay ? '支付' : '退款', "\u63A5\u53E3\u4E0D\u5B58\u5728"));
-          case 16:
-            _context2.next = 18;
+          case 15:
+            _context2.next = 17;
             return resultPromise === null || resultPromise === void 0 ? void 0 : resultPromise(params, {
               signal: signal
             });
-          case 18:
+          case 17:
             _res2 = _context2.sent;
             if (!(runId < currentRunIdRef.current)) {
-              _context2.next = 22;
+              _context2.next = 21;
               break;
             }
-            paymentLog.addLog({
-              title: '支付响应过期，忽略'
-            });
+            payLog.log('支付响应过期，忽略');
             return _context2.abrupt("return");
-          case 22:
+          case 21:
             if (!(isFinishedRef.current || !shouldContinue())) {
-              _context2.next = 25;
+              _context2.next = 24;
               break;
             }
-            paymentLog.addLog({
-              title: '支付返回时已完成或不应继续处理'
-            });
+            payLog.log('支付返回时已完成或不应继续处理');
             return _context2.abrupt("return");
-          case 25:
+          case 24:
             if (!(_res2 && "".concat(_res2.code) === '200')) {
-              _context2.next = 29;
+              _context2.next = 28;
               break;
             }
-            paymentLog.addLog({
-              title: '支付接口成功'
-            });
+            payLog.log('支付接口成功');
             handleFinalSuccess(_res2, paymentType);
             return _context2.abrupt("return");
-          case 29:
+          case 28:
             // 支付接口返回失败
             // 如果有明确的错误code且不是超时，则直接失败
             if (isRequestFailed(_res2 === null || _res2 === void 0 ? void 0 : _res2.code)) {
-              paymentLog.addLog({
-                title: '支付接口返回失败',
-                content: {
-                  res: _res2
-                }
+              payLog.log('支付接口返回失败', {
+                code: _res2 === null || _res2 === void 0 ? void 0 : _res2.code
               });
               handleFinalError(_res2, ActionType.Pay);
             } else {
-              paymentLog.addLog({
-                title: '支付超时或无明确错误，等待轮询结果',
-                content: {
-                  res: _res2
-                }
+              payLog.log('支付超时或无明确错误，等待轮询结果', {
+                code: _res2 === null || _res2 === void 0 ? void 0 : _res2.code
               });
             }
-            _context2.next = 41;
+            _context2.next = 40;
             break;
-          case 32:
-            _context2.prev = 32;
-            _context2.t0 = _context2["catch"](11);
+          case 31:
+            _context2.prev = 31;
+            _context2.t0 = _context2["catch"](10);
             if (!(runId < currentRunIdRef.current)) {
-              _context2.next = 37;
+              _context2.next = 36;
               break;
             }
-            paymentLog.addLog({
-              title: '支付响应过期，忽略'
-            });
+            payLog.log('支付异常响应过期，忽略');
             return _context2.abrupt("return");
-          case 37:
+          case 36:
             if (!(isFinishedRef.current || !shouldContinue())) {
-              _context2.next = 40;
+              _context2.next = 39;
               break;
             }
-            paymentLog.addLog({
-              title: '支付异常时已完成或不应继续处理'
-            });
+            payLog.log('支付异常时已完成或不应继续处理');
             return _context2.abrupt("return");
-          case 40:
+          case 39:
             // 支付接口异常
             // 如果有明确的错误code且不是超时，则直接失败
             if (isRequestFailed(_context2.t0 === null || _context2.t0 === void 0 ? void 0 : _context2.t0.code)) {
-              paymentLog.addLog({
-                title: '支付接口异常',
-                content: {
-                  error: _context2.t0
-                }
+              payLog.log('支付接口异常', {
+                code: _context2.t0 === null || _context2.t0 === void 0 ? void 0 : _context2.t0.code
               });
               handleFinalError(_context2.t0, paymentType);
             } else {
-              paymentLog.addLog({
-                title: '支付超时或无明确错误，等待轮询结果',
-                content: {
-                  error: _context2.t0
-                }
+              payLog.log('支付异常超时或无明确错误，等待轮询结果', {
+                code: _context2.t0 === null || _context2.t0 === void 0 ? void 0 : _context2.t0.code
               });
             }
-          case 41:
+          case 40:
           case "end":
             return _context2.stop();
         }
-      }, _callee2, null, [[11, 32]]);
+      }, _callee2, null, [[10, 31]]);
     }));
     return function run(_x2) {
       return _ref3.apply(this, arguments);
@@ -565,9 +500,7 @@ export var usePayment = function usePayment(options) {
    * 手动停止（完全清理，包括回调）
    */
   var stop = function stop() {
-    paymentLog.addLog({
-      title: '手动停止支付流程'
-    });
+    payLog.log('手动停止支付流程');
     clean(); // 完全清理，包括回调
     isFinishedRef.current = true; // 标记为已完成
   };

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

@@ -91,6 +91,8 @@ export declare type State = {
     };
     backup?: Omit<State, 'backup'>;
     client: ClientEnum;
+    /** 支付原始参数 */
+    originalParams?: Record<string, any>;
 };
 export declare type Action = {
     type: EActionTypes;
@@ -174,7 +176,7 @@ export declare const updateCustom: (payload: {
 export declare const updateStatus: (status: 'loading' | 'warn' | 'fail' | 'success' | 'question') => {
     type: EActionTypes;
     payload: {
-        status: "success" | "warn" | "loading" | "fail" | "question";
+        status: "warn" | "success" | "loading" | "fail" | "question";
     };
 };
 /**
@@ -195,7 +197,7 @@ export declare const updateComponent: (component: string, render?: boolean) => {
     } | {
         readonly type: "step";
         readonly render: boolean;
-        readonly component?: undefined;
+        component?: undefined;
     };
 };
 /**
@@ -297,8 +299,8 @@ export declare const backUpFree: (payload: Partial<State>) => {
         amount?: string | number | undefined;
         mode?: "refund" | "pay" | "fullPay" | "query" | undefined;
         order_id?: string | number | undefined;
-        eftpos?: "payo" | "tyro" | "windcave" | "stripe" | "linkly" | "mx51" | undefined;
-        action?: "amount" | "deviceList" | "pay" | undefined;
+        eftpos?: "stripe" | "payo" | "tyro" | "windcave" | "linkly" | undefined;
+        action?: "amount" | "pay" | "deviceList" | undefined;
         key?: number | undefined;
         step?: number | undefined;
         title?: string | undefined;
@@ -308,7 +310,7 @@ export declare const backUpFree: (payload: Partial<State>) => {
         net?: boolean | undefined;
         component?: string | undefined;
         form?: string | undefined;
-        status?: "success" | "warn" | "loading" | "fail" | "pedding" | "resove" | "reject" | "question" | undefined;
+        status?: "warn" | "success" | "loading" | "fail" | "pedding" | "resove" | "reject" | "question" | undefined;
         warn?: string | undefined;
         steps?: {
             /** 用于重置当前步骤 */
@@ -344,6 +346,7 @@ export declare const backUpFree: (payload: Partial<State>) => {
         } | undefined;
         backup?: Omit<State, "backup"> | undefined;
         client?: ClientEnum | undefined;
+        originalParams?: Record<string, any> | undefined;
     };
 };
 export declare function reducers(state: State, action: Action): State;

package/es/components/eftposPay/tip.js

@@ -19,6 +19,7 @@ import { RestoreEumn, EftposEnum } from "./const";
 import dayjs from 'dayjs';
 import { useDispatch, useContextData, updateState, updateCustom, updateNextStep } from "./store";
 import { useStoreRef } from "./hooks";
+import payLog from "./utils/payLog";
 import "./tip.less";
 function formatDateUtils(date, format) {
   if (!date) {
@@ -90,7 +91,11 @@ export default (function (_ref) {
     modeRef = _useStoreRef.modeRef,
     amountRef = _useStoreRef.amountRef,
     eftposRef = _useStoreRef.eftposRef;
+  useEffect(function () {
+    payLog.log('成功确认页展示');
+  }, []);
   var onConfirm = function onConfirm() {
+    payLog.log('确认支付成功');
     onChangeStatus('success', _objectSpread({}, ref.current || {}));
   };
 

package/es/components/eftposPay/tyro/const.js

@@ -45,7 +45,7 @@ export default (function (params) {
     status: StatusEnum.Loading,
     steps: [],
     render: true,
-    client: client !== 'undefined' ? client : ClientEnum.Merchant,
+    client: client !== 'undefined' && client !== undefined ? client : ClientEnum.Merchant,
     custom: other || {}
   }, typeof net !== 'undefined' ? {
     net: net

package/es/components/eftposPay/tyro/hooks.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 /**
  * @title: 获取 Tyro 资源
  * @description: