@pisell/private-materials 3.4.91 → 3.4.92

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

@@ -34,17 +34,17 @@ __export(useTimeQuery_exports, {
 module.exports = __toCommonJS(useTimeQuery_exports);
 var import_react = require("react");
 var import_utils = require("@pisell/utils");
-var import_dayjs = __toESM(require("dayjs"));
 var import_store = require("../../store");
 var import_hooks = require("../../hooks");
 var import_const = require("../../const");
 var import_const2 = require("../const");
+var import_payLog = __toESM(require("../../utils/payLog"));
 var GlobalTimeout = 1e3 * 60 * 2;
 var RequestTimeout = 1e3 * 5;
 var QUERY_INTERVAL = 1e3 * 2;
 var useTimeResultQuery = (api, resultCheck, handleLinklySuccess) => {
   const dispatch = (0, import_store.useDispatch)();
-  const { numRef, modeRef, deviceRef, orderIdRef } = (0, import_hooks.useStoreRef)();
+  const { numRef, modeRef, deviceRef } = (0, import_hooks.useStoreRef)();
   const fail = (0, import_hooks.useFail)(0);
   const failRef = (0, import_react.useRef)(fail);
   const isPay = modeRef.current === import_const.ModeEnum.Pay || modeRef.current === import_const.ModeEnum.FullPay;
@@ -56,7 +56,6 @@ var useTimeResultQuery = (api, resultCheck, handleLinklySuccess) => {
   const isRequestCanceledRef = (0, import_react.useRef)(false);
   const startTimeRef = (0, import_react.useRef)(null);
   const isQueryFinishedRef = (0, import_react.useRef)(true);
-  const queryIdRef = (0, import_react.useRef)(null);
   const queryIntervalTimerRef = (0, import_react.useRef)(null);
   const _resultQuery = async () => {
     var _a, _b;
@@ -73,8 +72,7 @@ var useTimeResultQuery = (api, resultCheck, handleLinklySuccess) => {
     isRequestCanceledRef.current = false;
     requestTimeoutIdRef.current = setTimeout(() => {
       var _a2;
-      console.log("单次请求超时，将尝试重试");
-      _log("RequestTimeout" /* RequestTimeout */);
+      import_payLog.default.log("Linkly轮询：单次请求超时");
       (_a2 = controllerRef.current) == null ? void 0 : _a2.abort();
       isRequestCanceledRef.current = true;
     }, RequestTimeout);
@@ -96,18 +94,13 @@ var useTimeResultQuery = (api, resultCheck, handleLinklySuccess) => {
       isQueryFinishedRef.current = true;
       const data = (result == null ? void 0 : result.data) || {};
       if (data.status == 1) {
-        console.log("交易成功，终止查询");
-        (0, import_utils.sendWarningLog)({
-          title: `Linkly-${isPay ? "Pay" : "Refund"}-交易成功`,
-          content: [{ key: "response", value: JSON.stringify(result) }]
-        });
+        import_payLog.default.log("Linkly轮询：交易成功");
         reset();
         handleLinklySuccess(result);
         return;
       }
       if ((data == null ? void 0 : data.status) == 0 && (data == null ? void 0 : data.signature_flag) != 1) {
-        console.log("交易状态为0需要继续查询");
-        _log("Querying" /* Querying */, result);
+        import_payLog.default.log("Linkly轮询：继续查询", { data });
         isQueryFinishedRef.current = false;
         queryIntervalTimerRef.current = setTimeout(() => {
           _resultQuery();
@@ -115,22 +108,14 @@ var useTimeResultQuery = (api, resultCheck, handleLinklySuccess) => {
         return;
       }
       if (data.status < 0) {
-        console.log("交易失败，终止查询");
-        (0, import_utils.sendWarningLog)({
-          title: `Linkly-${isPay ? "Pay" : "Refund"}-交易失败`,
-          content: [{ key: "response", value: JSON.stringify(result) }]
-        });
+        import_payLog.default.log("Linkly轮询：交易失败", { data });
         reset();
         result.code = import_const.PayStatus.Unknown;
         (_a2 = failRef.current) == null ? void 0 : _a2.call(failRef, result, false);
         return;
       }
       if (data.signature_flag == 1) {
-        console.log("交易需要签名，终止查询");
-        (0, import_utils.sendWarningLog)({
-          title: `Linkly-${isPay ? "Pay" : "Refund"}-交易需要签名`,
-          content: [{ key: "response", value: JSON.stringify(result) }]
-        });
+        import_payLog.default.log("Linkly轮询：需要签名", { data });
         reset();
         gotoSignature();
         return;
@@ -144,8 +129,7 @@ var useTimeResultQuery = (api, resultCheck, handleLinklySuccess) => {
       }
       isQueryFinishedRef.current = true;
       if ((error == null ? void 0 : error.name) === "AbortError" /* AbortError */ || isRequestCanceledRef.current) {
-        _log("AbortError" /* AbortError */);
-        console.log("Error: 请求被取消，将继续查询");
+        import_payLog.default.log("Linkly轮询：请求被取消，继续查询");
         isQueryFinishedRef.current = false;
         queryIntervalTimerRef.current = setTimeout(() => {
           _resultQuery();
@@ -153,15 +137,14 @@ var useTimeResultQuery = (api, resultCheck, handleLinklySuccess) => {
         return;
       }
       if (!(error == null ? void 0 : error.code) || `${error.code}` === import_const.PayStatus.Timeout) {
-        _log("NetworkError" /* NetworkError */);
-        console.log("Error: 网关类报错，将继续查询");
+        import_payLog.default.log("Linkly轮询：网关报错，继续查询");
         isQueryFinishedRef.current = false;
         queryIntervalTimerRef.current = setTimeout(() => {
           _resultQuery();
         }, QUERY_INTERVAL);
         return;
       }
-      _log("Error" /* Error */, error);
+      import_payLog.default.log("Linkly轮询：查询失败", { error });
       reset();
       (_a2 = failRef.current) == null ? void 0 : _a2.call(failRef, error, true);
     }).finally(() => {
@@ -195,8 +178,7 @@ var useTimeResultQuery = (api, resultCheck, handleLinklySuccess) => {
     return false;
   };
   const reset = () => {
-    console.log("linkly查询状态重制<<<<<<<----");
-    _log("Reset" /* Reset */);
+    import_payLog.default.log("Linkly轮询：重置查询状态");
     if (globalTimeoutIdRef.current) {
       clearTimeout(globalTimeoutIdRef.current);
       globalTimeoutIdRef.current = null;
@@ -216,52 +198,18 @@ var useTimeResultQuery = (api, resultCheck, handleLinklySuccess) => {
     startTimeRef.current = null;
     isRequestCanceledRef.current = false;
     isQueryFinishedRef.current = true;
-    queryIdRef.current = null;
-  };
-  const _log = (type, res) => {
-    var _a, _b;
-    const params = {
-      // 设备id
-      pinpad_id: (_b = (_a = deviceRef == null ? void 0 : deviceRef.current) == null ? void 0 : _a.metadata) == null ? void 0 : _b.linkly_pinpad_id,
-      // 交易流水号
-      session_id: numRef.current
-    };
-    const content = [
-      {
-        key: "description",
-        value: JSON.stringify({
-          queryId: queryIdRef.current,
-          orderId: orderIdRef.current,
-          type,
-          date: (0, import_dayjs.default)().format("YYYY-MM-DD HH:mm:ss")
-        })
-      },
-      { key: "params", value: JSON.stringify(params) }
-    ];
-    if (type === "Error" /* Error */) {
-      content.push({ key: "error", value: JSON.stringify(res) });
-    } else {
-      content.push({ key: "response", value: JSON.stringify(res) });
-    }
-    (0, import_utils.sendWarningLog)({
-      title: `Linkly-${isPay ? "Pay" : "Refund"}-交易结果轮询`,
-      content
-    });
   };
   const run = () => {
     reset();
     globalTimeoutIdRef.current = setTimeout(() => {
       var _a;
-      console.log("全局超时，终止所有重试");
-      _log("GlobalTimeout" /* GlobalTimeout */);
+      import_payLog.default.log("Linkly轮询：全局超时");
       setTimeout(reset, 0);
       (_a = failRef.current) == null ? void 0 : _a.call(failRef, { code: import_const.PayStatus.Timeout }, false);
     }, GlobalTimeout);
     startTimeRef.current = Date.now();
     isQueryFinishedRef.current = false;
-    queryIdRef.current = (0, import_utils.getUniqueId)();
-    console.log("开始查询linkly结果---->>>>>>>");
-    _log("Start" /* Start */);
+    import_payLog.default.log("Linkly轮询：开始查询");
     return _resultQuery();
   };
   return { run, stop: reset };

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

@@ -44,6 +44,7 @@ var import_const = require("../const");
 var import_hooks2 = require("./hooks");
 var import_const2 = require("./const");
 var import_helper = require("../helper");
+var import_payLog = __toESM(require("../utils/payLog"));
 var Linkly = ({ api, onChange }) => {
   const context = (0, import_useEngineContext.default)();
   const utils = context.appHelper.utils || {};
@@ -69,6 +70,7 @@ var Linkly = ({ api, onChange }) => {
   const clearRef = (0, import_react.useRef)();
   const handleCheck = () => !(unloadRef.current || !netRef.current);
   const handleLinklySuccess = (res) => {
+    import_payLog.default.log("Linkly：最终支付成功");
     const resData = (res == null ? void 0 : res.data) || {};
     let receipt = Array.isArray(resData == null ? void 0 : resData.receipt) ? resData.receipt : [resData.receipt];
     receipt = receipt.filter((item) => typeof item === "string").filter(Boolean);
@@ -148,18 +150,10 @@ var Linkly = ({ api, onChange }) => {
           if (activeStatus !== "unActive") {
             payOrRefund(resultQuery, handleLinklySuccess);
           } else {
-            (0, import_utils.sendWarningLog)({
-              title: "Linkly-支付-当前页面非活跃状态，无法进行支付",
-              content: [
-                { key: "response", value: JSON.stringify({ activeStatus }) }
-              ]
-            });
+            import_payLog.default.log("Linkly：页面非活跃状态，阻断支付", { activeStatus });
           }
         } catch (error) {
-          (0, import_utils.sendWarningLog)({
-            title: "Linkly-支付-获取当前页面活跃状态失败",
-            content: [{ key: "error", value: JSON.stringify(error) }]
-          });
+          import_payLog.default.log("Linkly：获取页面活跃状态失败", { error });
           payOrRefund(resultQuery, handleLinklySuccess);
         }
       };
@@ -179,14 +173,17 @@ var Linkly = ({ api, onChange }) => {
     };
   }, []);
   const onCancel = () => {
+    import_payLog.default.log("Linkly：点击取消支付");
     stopResultQuery();
     linklyCancel(resultQuery);
   };
   const onDecline = () => {
+    import_payLog.default.log("Linkly：签名-点击拒绝");
     stopResultQuery();
     linklySignature(2, resultQuery);
   };
   const onAccept = () => {
+    import_payLog.default.log("Linkly：签名-点击接受");
     stopResultQuery();
     linklySignature(3, resultQuery);
   };

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

@@ -46,6 +46,7 @@ var import_const = require("./const");
 var import_manufacturer = require("./manufacturer");
 var import_store = require("./store");
 var import_index = require("./index.less");
+var import_payLog = __toESM(require("./utils/payLog"));
 var Mapping = {
   Fail: import_fail.default,
   Network: import_network.default,
@@ -73,7 +74,10 @@ var Pay = ({
   const statusRef = (0, import_react.useRef)(data.status);
   const comonentRef = (0, import_react.useRef)(data.component);
   const backupRef = (0, import_react.useRef)(data.backup);
-  const clearRef = (0, import_react.useRef)(0);
+  const clearRef = (0, import_react.useRef)(null);
+  (0, import_react.useEffect)(() => {
+    import_payLog.default.log("支付组件初始化");
+  }, []);
   (0, import_react.useEffect)(() => {
     comonentRef.current = data.component;
   }, [data.component]);
@@ -107,6 +111,7 @@ var Pay = ({
     if (!ref.current) {
       ref.current = true;
       if (backupRef.current && net) {
+        import_payLog.default.log("网络恢复：从备份恢复", { hasBackup: true });
         const { ...data2 } = backupRef.current;
         dispatch((0, import_store.backUpFree)({ key: Date.now() }));
         dispatch((0, import_store.updateState)({ net }));
@@ -121,6 +126,7 @@ var Pay = ({
       return;
     }
     if (net) {
+      import_payLog.default.log("网络恢复", { hasBackup: !!backupRef.current });
       const { ...data2 } = backupRef.current;
       dispatch((0, import_store.backUpFree)({ key: Date.now() }));
       dispatch((0, import_store.updateState)({ net }));
@@ -133,6 +139,7 @@ var Pay = ({
       }
       return;
     }
+    import_payLog.default.log("网络断开，备份数据");
     dispatch((0, import_store.updateState)({ form: "Network" }));
     dispatch((0, import_store.backUpProduction)({}));
     dispatch((0, import_store.updateState)({ net, status: "warn" }));
@@ -142,6 +149,7 @@ var Pay = ({
     return () => {
       if (clearRef.current) {
         clearTimeout(clearRef.current);
+        clearRef.current = null;
       }
     };
   }, []);

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

@@ -43,6 +43,7 @@ var import_hooks = require("../hooks");
 var import_store = require("../store");
 var import_hooks2 = require("./hooks");
 var import_payment = require("./payment");
+var import_payLog = __toESM(require("../utils/payLog"));
 var POS = ({
   api,
   onChange
@@ -65,7 +66,7 @@ var POS = ({
   const fail = (0, import_hooks.useFail)(0);
   const failRef = (0, import_react.useRef)(fail);
   const controllerRef = (0, import_react.useRef)();
-  const clearRef = (0, import_react.useRef)();
+  const clearRef = (0, import_react.useRef)(null);
   const initRef = (0, import_react.useRef)(false);
   const unloadRef = (0, import_react.useRef)(false);
   const [check] = (0, import_hooks2.useValidate)(1e3 * 60);
@@ -199,7 +200,9 @@ var POS = ({
         )
       )
     };
+    import_payLog.default.setContext({ transactionNumber: numRef.current });
     if (isPay) {
+      import_payLog.default.log("Payo：发起支付", { isPay, number: numRef.current });
       paymentRun({
         paymentType: import_payment.ActionType.Pay,
         paymentNum: numRef.current,
@@ -208,41 +211,42 @@ var POS = ({
         params: apiParams,
         callbacks: {
           onSuccess: (res) => {
+            import_payLog.default.log("Payo：支付成功", { code: res == null ? void 0 : res.code });
             success(res);
           },
           onError: (err) => {
-            console.log("err = >>>>>", err);
+            import_payLog.default.log("Payo：支付失败", { code: err == null ? void 0 : err.code });
             failRef.current(err, true);
           }
         }
       });
       return;
     } else {
+      import_payLog.default.log("Payo：发起退款", { isPay, number: numRef.current });
       const resultPromise = api.refund(apiParams, { signal: controllerRef.current.signal });
       resultPromise.then((res) => {
         console.log("netRef.current111 = ", netRef.current);
         if (unloadRef.current || !netRef.current) {
+          import_payLog.default.log("Payo：退款拦截", { isUnload: unloadRef.current, isNet: netRef.current });
           return;
         }
         if (res && `${res.code}` === "200") {
+          import_payLog.default.log("Payo：退款成功", { res: JSON.stringify(res) });
           success(res);
           return;
         }
         return Promise.reject(res);
       }).catch((err) => {
-        console.log(
-          "netRef.current222 = ",
-          netRef.current,
-          unloadRef.current,
-          err
-        );
         if (unloadRef.current || !netRef.current) {
+          import_payLog.default.log("Payo：退款失败拦截", { isUnload: unloadRef.current, isNet: netRef.current });
           return;
         }
         if (!(err == null ? void 0 : err.code) || `${err.code}` === import_const.PayStatus.Timeout) {
+          import_payLog.default.log("Payo：退款超时，转查询");
           checkApi();
           return;
         }
+        import_payLog.default.log("Payo：退款失败", { code: err == null ? void 0 : err.code, message: err == null ? void 0 : err.message });
         failRef.current(err, true);
       });
     }
@@ -268,12 +272,14 @@ var Action = ({ onChange }) => {
   (0, import_react.useEffect)(() => {
     const timer = setTimeout(() => {
       setIsShowCancel(true);
+      import_payLog.default.log("Payo：30秒后显示取消按钮");
     }, 30 * 1e3);
     return () => {
       clearTimeout(timer);
     };
   }, []);
   const onManually = () => {
+    import_payLog.default.log("Payo：点击手动标记");
     dispatch(
       (0, import_store.updateState)({
         manual: {
@@ -285,6 +291,7 @@ var Action = ({ onChange }) => {
     dispatch((0, import_store.updateComponent)("Manual", true));
   };
   const onCancel = () => {
+    import_payLog.default.log("Payo：点击取消");
     onChange("fail", { number, uniquePaymentNumber: number, device, order_id });
   };
   return /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__eft-pay-step-item-btns" }, client !== import_const.ClientEnum.Merchant && isShowCancel && /* @__PURE__ */ import_react.default.createElement(

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

@@ -1,6 +1,8 @@
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -14,6 +16,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/components/eftposPay/payo/hooks.tsx
@@ -25,7 +35,7 @@ module.exports = __toCommonJS(hooks_exports);
 var import_react = require("react");
 var import_const = require("../const");
 var import_helper = require("../helper");
-var import_utils = require("@pisell/utils");
+var import_payLog = __toESM(require("../utils/payLog"));
 var useValidate = (timeout) => {
   const controllerRef = (0, import_react.useRef)();
   const ref = (0, import_react.useRef)(true);
@@ -79,15 +89,7 @@ var useValidate = (timeout) => {
     TimeoutRef.current && clearTimeout(TimeoutRef.current);
     TimeoutRef.current = setTimeout(() => {
       isTimeoutCloseRef.current = true;
-      (0, import_utils.sendWarningLog)({
-        title: "支付状态查询超时",
-        content: [
-          {
-            key: "params",
-            value: JSON.stringify(params)
-          }
-        ]
-      });
+      import_payLog.default.log("Payo：支付状态查询超时");
       close();
     }, timeout);
     return checkApi(...params);

package/lib/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;