@pisell/private-materials 6.3.126 → 6.3.127

package/lib/components/eftposPay/payo/payment.js

@@ -35,7 +35,7 @@ __export(payment_exports, {
 module.exports = __toCommonJS(payment_exports);
 var import_react = require("react");
 var import_const = require("../const");
-var import_log = __toESM(require("../utils/log"));
+var import_payLog = __toESM(require("../utils/payLog"));
 var QUERY_START_DELAY = 1e3 * 10;
 var GLOBAL_TIMEOUT = 1e3 * 60 * 2;
 var REQUEST_TIMEOUT = 1e3 * 10;
@@ -107,36 +107,32 @@ var usePayment = (options) => {
     if (!isFinishedRef.current) {
       clean();
       isFinishedRef.current = true;
-      import_log.default.clearLogs();
     }
   };
   const handleFinalSuccess = (res, type) => {
     var _a, _b;
     if (isFinishedRef.current || !shouldContinue()) {
-      console.log(`⚠️ 已完成或不应继续处理，忽略${type}操作成功结果`);
+      import_payLog.default.log(`handleFinalSuccess: 已完成或不应继续处理，忽略${type}操作成功结果`);
       return;
     }
+    import_payLog.default.log("接口最终结果：支付成功", { type, res });
     (_b = (_a = callbacksRef.current) == null ? void 0 : _a.onSuccess) == null ? void 0 : _b.call(_a, res);
-    import_log.default.addLog({ title: "最终结果：支付成功", content: { type, res } });
     finish();
   };
   const handleFinalError = (error, type) => {
     var _a, _b;
     if (isFinishedRef.current || !shouldContinue()) {
-      console.log(`⚠️ 已完成或不应继续处理，忽略${type}操作错误`);
+      import_payLog.default.log(`handleFinalError: 已完成或不应继续处理，忽略${type}操作错误`);
       return;
     }
+    import_payLog.default.log("接口最终结果：支付失败", { type, error });
     (_b = (_a = callbacksRef.current) == null ? void 0 : _a.onError) == null ? void 0 : _b.call(_a, error);
-    import_log.default.addLog({
-      title: "最终结果：支付失败",
-      content: { type, error }
-    });
     finish();
   };
   const createTimeoutPromise = (timeoutMs) => {
     return new Promise((_, reject) => {
       requestTimeoutTimerRef.current = setTimeout(() => {
-        console.log(`⏱️ 单次查询超时（${timeoutMs / 1e3}秒），强制终止`);
+        import_payLog.default.log(`⏱️ 单次查询超时（${timeoutMs / 1e3}秒），强制终止`);
         isRequestTimeoutRef.current = true;
         if (queryControllerRef.current) {
           queryControllerRef.current.abort();
@@ -147,9 +143,7 @@ var usePayment = (options) => {
   };
   const performQuery = async (paymentNum) => {
     if (isFinishedRef.current || !shouldContinue()) {
-      import_log.default.addLog({
-        title: "支付轮询前置校验：支付已完成或不应继续处理，取消查询"
-      });
+      import_payLog.default.log("支付轮询前置校验：已完成或不应继续，取消查询");
       return;
     }
     if (queryControllerRef.current) {
@@ -166,7 +160,7 @@ var usePayment = (options) => {
     queryControllerRef.current = new AbortController();
     const { signal } = queryControllerRef.current;
     try {
-      import_log.default.addLog({ title: "支付轮询：开始单次查询" });
+      import_payLog.default.log("支付轮询：开始单次查询");
       const res = await Promise.race([
         checkApi({ number: paymentNum }, { signal }),
         createTimeoutPromise(REQUEST_TIMEOUT)
@@ -176,29 +170,23 @@ var usePayment = (options) => {
         requestTimeoutTimerRef.current = null;
       }
       if (queryId < currentQueryIdRef.current) {
-        import_log.default.addLog({ title: "支付轮询结果：过期的查询响应，忽略" });
+        import_payLog.default.log("支付轮询结果：过期的查询响应，忽略");
         return;
       }
       if (isFinishedRef.current || !shouldContinue()) {
-        import_log.default.addLog({ title: "支付轮询结果：支付已完成或不应继续处理" });
+        import_payLog.default.log("支付轮询结果：已完成或不应继续处理");
         return;
       }
       if (res && `${res.code}` === "200") {
-        import_log.default.addLog({ title: "支付轮询结果：支付成功" });
+        import_payLog.default.log("支付轮询结果：支付成功");
         handleFinalSuccess(res, "query" /* Query */);
         return;
       }
       if (isRequestFailed(res == null ? void 0 : res.code)) {
-        import_log.default.addLog({
-          title: "支付轮询结果：有明确错误code，停止轮询",
-          content: res
-        });
+        import_payLog.default.log("支付轮询结果：有明确错误code，停止轮询", { code: res == null ? void 0 : res.code });
         handleFinalError(res, "query" /* Query */);
       } else {
-        import_log.default.addLog({
-          title: "支付轮询结果：查询返回失败但没有明确code或超时code，继续轮询",
-          content: res
-        });
+        import_payLog.default.log("支付轮询结果：无明确code，继续轮询", { code: res == null ? void 0 : res.code });
         scheduleNextQuery(paymentNum);
       }
     } catch (error) {
@@ -207,32 +195,22 @@ var usePayment = (options) => {
         requestTimeoutTimerRef.current = null;
       }
       if (queryId < currentQueryIdRef.current) {
-        import_log.default.addLog({
-          title: "支付轮询结果：error-过期的查询异常，忽略"
-        });
+        import_payLog.default.log("支付轮询结果：error-过期的查询异常，忽略");
         return;
       }
       if (isFinishedRef.current || !shouldContinue()) {
         return;
       }
       if (isRequestTimeoutRef.current || (error == null ? void 0 : error.name) === "AbortError" || (error == null ? void 0 : error.message) === "REQUEST_TIMEOUT") {
-        import_log.default.addLog({
-          title: "支付轮询结果：error-请求被取消或超时，继续轮询"
-        });
+        import_payLog.default.log("支付轮询结果：error-请求被取消或超时，继续轮询");
         scheduleNextQuery(paymentNum);
         return;
       }
       if (isRequestFailed(error == null ? void 0 : error.code)) {
-        import_log.default.addLog({
-          title: "支付轮询结果：error-有明确错误code，停止轮询",
-          content: error
-        });
+        import_payLog.default.log("支付轮询结果：error-有明确错误code，停止轮询", { code: error == null ? void 0 : error.code });
         handleFinalError(error, "query" /* Query */);
       } else {
-        import_log.default.addLog({
-          title: "支付轮询结果：error-无明确code或者code不是超时，继续轮询",
-          content: error
-        });
+        import_payLog.default.log("支付轮询结果：error-无明确code，继续轮询", { code: error == null ? void 0 : error.code });
         scheduleNextQuery(paymentNum);
       }
     }
@@ -245,7 +223,7 @@ var usePayment = (options) => {
       clearTimeout(queryIntervalTimerRef.current);
     }
     queryIntervalTimerRef.current = setTimeout(() => {
-      import_log.default.addLog({ title: "支付轮询：安排下一次查询" });
+      import_payLog.default.log("支付轮询：安排下一次查询");
       performQuery(paymentNum);
     }, QUERY_INTERVAL);
   };
@@ -259,7 +237,7 @@ var usePayment = (options) => {
         return;
       }
       console.log("⏱️ 轮询全局超时（2分钟），终止所有请求");
-      import_log.default.addLog({ title: "轮询全局超时（2分钟），终止所有请求" });
+      import_payLog.default.log("轮询全局超时（2分钟），终止所有请求");
       handleFinalError(
         { code: import_const.PayStatus.Timeout, message: "交易超时" },
         "query" /* Query */
@@ -277,23 +255,17 @@ var usePayment = (options) => {
     const runId = Date.now();
     currentRunIdRef.current = runId;
     const { pay_param_base64, ...otherParams } = params || {};
-    import_log.default.init(paymentNum, {
-      orderId: options2 == null ? void 0 : options2.orderId,
-      deviceId: options2 == null ? void 0 : options2.deviceId,
-      paymentType: `PAYO_${paymentType}`,
-      params: otherParams
-    });
     isFinishedRef.current = true;
     clean({ clearCallbacks: false });
     callbacksRef.current = callbacks;
     queryStartTimerRef.current = setTimeout(() => {
-      import_log.default.addLog({ title: "支付后10秒开始轮询" });
+      import_payLog.default.log("支付后10秒开始轮询");
       startQuery(paymentNum);
     }, QUERY_START_DELAY);
     payControllerRef.current = new AbortController();
     const { signal } = payControllerRef.current;
     try {
-      import_log.default.addLog({ title: "发起支付请求" });
+      import_payLog.default.log("发起支付请求");
       const resultPromise = paymentType === "pay" /* Pay */ ? payApi : refundApi;
       if (!resultPromise) {
         throw new Error(
@@ -302,49 +274,43 @@ var usePayment = (options) => {
       }
       const res = await (resultPromise == null ? void 0 : resultPromise(params, { signal }));
       if (runId < currentRunIdRef.current) {
-        import_log.default.addLog({ title: "支付响应过期，忽略" });
+        import_payLog.default.log("支付响应过期，忽略");
         return;
       }
       if (isFinishedRef.current || !shouldContinue()) {
-        import_log.default.addLog({ title: "支付返回时已完成或不应继续处理" });
+        import_payLog.default.log("支付返回时已完成或不应继续处理");
         return;
       }
       if (res && `${res.code}` === "200") {
-        import_log.default.addLog({ title: "支付接口成功" });
+        import_payLog.default.log("支付接口成功");
         handleFinalSuccess(res, paymentType);
         return;
       }
       if (isRequestFailed(res == null ? void 0 : res.code)) {
-        import_log.default.addLog({ title: "支付接口返回失败", content: { res } });
+        import_payLog.default.log("支付接口返回失败", { code: res == null ? void 0 : res.code });
         handleFinalError(res, "pay" /* Pay */);
       } else {
-        import_log.default.addLog({
-          title: "支付超时或无明确错误，等待轮询结果",
-          content: { res }
-        });
+        import_payLog.default.log("支付超时或无明确错误，等待轮询结果", { code: res == null ? void 0 : res.code });
       }
     } catch (error) {
       if (runId < currentRunIdRef.current) {
-        import_log.default.addLog({ title: "支付响应过期，忽略" });
+        import_payLog.default.log("支付异常响应过期，忽略");
         return;
       }
       if (isFinishedRef.current || !shouldContinue()) {
-        import_log.default.addLog({ title: "支付异常时已完成或不应继续处理" });
+        import_payLog.default.log("支付异常时已完成或不应继续处理");
         return;
       }
       if (isRequestFailed(error == null ? void 0 : error.code)) {
-        import_log.default.addLog({ title: "支付接口异常", content: { error } });
+        import_payLog.default.log("支付接口异常", { code: error == null ? void 0 : error.code });
         handleFinalError(error, paymentType);
       } else {
-        import_log.default.addLog({
-          title: "支付超时或无明确错误，等待轮询结果",
-          content: { error }
-        });
+        import_payLog.default.log("支付异常超时或无明确错误，等待轮询结果", { code: error == null ? void 0 : error.code });
       }
     }
   };
   const stop = () => {
-    import_log.default.addLog({ title: "手动停止支付流程" });
+    import_payLog.default.log("手动停止支付流程");
     clean();
     isFinishedRef.current = true;
   };

package/lib/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/lib/components/eftposPay/tip.js

@@ -40,6 +40,7 @@ var import_const = require("./const");
 var import_dayjs = __toESM(require("dayjs"));
 var import_store = require("./store");
 var import_hooks = require("./hooks");
+var import_payLog = __toESM(require("./utils/payLog"));
 var import_tip = require("./tip.less");
 function formatDateUtils(date, format) {
   if (!date) {
@@ -83,7 +84,11 @@ var tip_default = ({
     amountRef,
     eftposRef
   } = (0, import_hooks.useStoreRef)();
+  (0, import_react.useEffect)(() => {
+    import_payLog.default.log("成功确认页展示");
+  }, []);
   const onConfirm = () => {
+    import_payLog.default.log("确认支付成功");
     onChangeStatus("success", { ...ref.current || {} });
   };
   (0, import_react.useEffect)(() => {

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

@@ -57,7 +57,7 @@ var const_default = (params) => {
     status: import_const.StatusEnum.Loading,
     steps: [],
     render: true,
-    client: client !== "undefined" ? client : import_const.ClientEnum.Merchant,
+    client: client !== "undefined" && client !== void 0 ? client : import_const.ClientEnum.Merchant,
     custom: other || {},
     ...typeof net !== "undefined" ? { net } : {},
     ...typeof number !== "undefined" ? { number } : {},

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

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

package/lib/components/eftposPay/tyro/index.js

@@ -42,6 +42,7 @@ var import_decimal = require("decimal.js");
 var import_helper = require("../helper");
 var import_step = __toESM(require("../component/step/step"));
 var import_hooks2 = require("../hooks");
+var import_payLog = __toESM(require("../utils/payLog"));
 var Minute = 1e3 * 60;
 var tyro_default = ({
   api,
@@ -98,6 +99,7 @@ var tyro_default = ({
     console.log(integrationKey, tid, mid);
     iClient.terminalInfo(
       ({ status: status2, message, terminalInfo }) => {
+        import_payLog.default.log("Tyro：终端信息回调", { status: status2, terminalInfo, message });
         if (status2 === "success" && (terminalInfo == null ? void 0 : terminalInfo.available)) {
           cb();
         }
@@ -110,7 +112,7 @@ var tyro_default = ({
     );
   };
   const refundOrder = () => {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     const iClient = iClientRef.current;
     if (!iClient) {
       return;
@@ -167,6 +169,8 @@ var tyro_default = ({
         })
       );
     });
+    import_payLog.default.setContext({ transactionNumber: numRef.current });
+    import_payLog.default.log("Tyro：发起退款", { number: numRef == null ? void 0 : numRef.current, amount: (_d = requestParams.current) == null ? void 0 : _d.amount });
     iClient.initiateRefund(requestParams.current, {
       receiptCallback: receiptCallbackImpl,
       transactionCompleteCallback: transactionCompleteCallbackImpl,
@@ -238,6 +242,8 @@ var tyro_default = ({
         })
       );
     });
+    import_payLog.default.setContext({ transactionNumber: numRef.current });
+    import_payLog.default.log("Tyro：发起支付", { number: numRef.current, amount: requestParams.current.amount });
     iClient.initiatePurchase(requestParams.current, {
       receiptCallback: receiptCallbackImpl,
       transactionCompleteCallback: transactionCompleteCallbackImpl,
@@ -255,6 +261,7 @@ var tyro_default = ({
     }
     setStatus(Date.now());
     merchantReceiptRef.current = {};
+    import_payLog.default.log("Tyro：恢复上次交易");
     iClient.continueLastTransaction({
       receiptCallback: receiptCallbackImpl,
       transactionCompleteCallback: transactionCompleteCallbackImpl,
@@ -263,8 +270,7 @@ var tyro_default = ({
     });
   };
   const receiptCallbackImpl = ({ signatureRequired, merchantReceipt }) => {
-    console.log("商家小票 客户端是否打印小票 = ", signatureRequired);
-    console.log("商家小票 小票内容 = \n", merchantReceipt);
+    import_payLog.default.log("Tyro：小票回调", { signatureRequired, hasReceipt: !!merchantReceipt });
     const receipt = [merchantReceipt].filter((item) => typeof item === "string").filter(Boolean);
     merchantReceiptRef.current = { signatureRequired, merchantReceipt };
     if (signatureRequired) {
@@ -277,6 +283,7 @@ var tyro_default = ({
   };
   const statusMessageCallbackImpl = (message) => {
     var _a;
+    import_payLog.default.log("Tyro：状态消息", { message });
     const translateMsg = import_utils.locales.getText("page.eftpos-pay.text.tyro")(message);
     const msg = Array.isArray(translateMsg) ? translateMsg.reduce(
       (accumulator, currentValue) => accumulator + " " + currentValue,
@@ -307,7 +314,7 @@ var tyro_default = ({
     );
   };
   const questionCallbackImpl = (question, answerCallback) => {
-    console.log("Question is " + JSON.stringify(question));
+    import_payLog.default.log("Tyro：交互问题回调", { question });
     setStatus(-1);
     setManually(false);
     const msg = import_utils.locales.getText("page.eftpos-pay.text.tyro")(question.text);
@@ -363,15 +370,7 @@ var tyro_default = ({
     var _a, _b;
     setStatus(-1);
     setManually(false);
-    console.log(
-      "Response = " + JSON.stringify(response),
-      ", Request =  ",
-      JSON.stringify(requestParams.current)
-    );
-    console.log(
-      " 客户小票 response.customerReceipt = \n",
-      response.customerReceipt
-    );
+    import_payLog.default.log("Tyro：交易完成回调", { response });
     const receipt = [
       // merchantReceiptRef.current?.merchantReceipt,
       response == null ? void 0 : response.customerReceipt
@@ -476,20 +475,22 @@ var tyro_default = ({
     if (load && TyroRef.current) {
       const IClient = TyroRef.current.IClient;
       if (IClient) {
-        console.log("apiKey = ", apiKey, "posProductData = ", posProductData);
         const iclient = new IClient(apiKey, posProductData);
-        console.log(iclient.posProductData);
         iClientRef.current = iclient;
+        import_payLog.default.log("Tyro：SDK 初始化完成");
         if (isCancelRef.current) {
           return;
         }
         if (!numRef.current) {
           if (modeRef.current === import_const.ModeEnum.Pay || modeRef.current === import_const.ModeEnum.FullPay) {
+            import_payLog.default.log("Tyro：支付交易，查询终端信息");
             getTerminalInfo(payOrder);
           } else if (modeRef.current === import_const.ModeEnum.Refund) {
+            import_payLog.default.log("Tyro：退款交易，查询终端信息");
             getTerminalInfo(refundOrder);
           }
         } else {
+          import_payLog.default.log("Tyro：恢复上次交易，查询终端信息");
           getTerminalInfo(continueLastOrder);
         }
       }
@@ -508,8 +509,8 @@ var tyro_default = ({
       };
     }
     if (status === 0) {
-      console.log("开始倒计时...");
       clear = setTimeout(() => {
+        import_payLog.default.log("Tyro：连接超时");
         dispatch(
           (0, import_store.updateState)({
             status: "fail"
@@ -542,7 +543,7 @@ var tyro_default = ({
       if (!iClient) {
         return;
       }
-      console.log("倒计时到了");
+      import_payLog.default.log("Tyro：交易超时，显示手动标记");
       setManually(true);
     }, Minute);
     return () => {
@@ -552,6 +553,7 @@ var tyro_default = ({
     };
   }, [status]);
   const onManually = () => {
+    import_payLog.default.log("Tyro：点击手动标记");
     dispatch(
       (0, import_store.updateState)({
         manual: {
@@ -568,12 +570,14 @@ var tyro_default = ({
       return;
     }
     if (status > 0) {
+      import_payLog.default.log("Tyro：取消当前交易");
       iClient.cancelCurrentTransaction();
       return;
     }
     if (isCancelRef.current) {
       return;
     }
+    import_payLog.default.log("Tyro：取消（交易未开始）");
     isCancelRef.current = true;
     dispatch(
       (0, import_store.updateState)({

package/lib/components/eftposPay/utils/payLog.d.ts

@@ -0,0 +1,81 @@
+export interface PayLogContext {
+    /** 渠道 */
+    channel?: string;
+    /** 订单ID */
+    orderId?: string | number;
+    /** 设备ID */
+    deviceId?: string | number;
+    /** 支付类型：PAYO / WINDCAVE / LINKLY / TYRO */
+    paymentType?: string;
+    /** 交易记录号 */
+    transactionNumber?: string;
+    /** 模式：pay / refund / query */
+    mode?: string;
+    /** 其他扩展信息 */
+    extra?: Record<string, any>;
+}
+declare class PayLog {
+    private static instance;
+    private sessionKey;
+    private context;
+    private logs;
+    private startTime;
+    private flushed;
+    private constructor();
+    static getInstance(): PayLog;
+    /**
+     * 初始化一次交易会话
+     * - 生成唯一 sessionKey
+     * - 恢复上报 localStorage 中残留的旧日志
+     * - 接受部分 context（后续可通过 setContext 补充）
+     */
+    init(context?: Partial<PayLogContext>): void;
+    /**
+     * 补充/更新上下文信息
+     * 新值覆盖旧值，extra 做浅合并
+     */
+    setContext(partial: Partial<PayLogContext>): void;
+    /**
+     * 记录一条日志
+     */
+    log(title: string, data?: any): void;
+    /**
+     * 上报日志到飞书并清理 localStorage
+     */
+    flush(customTitle?: string): void;
+    /**
+     * flush + 重置内部状态
+     */
+    destroy(): void;
+    /**
+     * 构建 sendWarningLog 所需的 content 数组
+     */
+    private buildContent;
+    /**
+     * 持久化当前会话到 localStorage
+     */
+    private persistToStorage;
+    /**
+     * 从 localStorage 移除指定 session
+     */
+    private removeFromStorage;
+    /**
+     * 获取 localStorage 中所有 session
+     */
+    private getAllSessions;
+    /**
+     * 恢复上报 localStorage 中残留的旧日志（崩溃/异常退出场景）
+     */
+    private recoverOrphanedLogs;
+}
+declare const payLog: PayLog;
+export default payLog;
+/**
+ * 在根组件中使用，管理 PayLog 生命周期
+ * - mount 时 init（+ 恢复上报残留日志）
+ * - unmount 时 flush
+ */
+export declare function usePayLog(context?: Partial<PayLogContext>): {
+    log: (title: string, data?: any) => void;
+    setContext: (partial: Partial<PayLogContext>) => void;
+};