@pisell/private-materials 3.4.91 → 3.4.92

package/lib/components/eftposPay/component/manual/index.js

@@ -40,10 +40,14 @@ var import_usePrefix = __toESM(require("../../../../hooks/usePrefix"));
 var import_const = require("../../const");
 var import_store = require("../../store");
 var import_helper = require("../../helper");
+var import_payLog = __toESM(require("../../utils/payLog"));
 var import_index = require("./index.less");
 var manual_default = ({ onChange, className = "", formatAmount }) => {
   const dispatch = (0, import_store.useDispatch)();
   const { symbol, manual, order_id, mode, device, number, pay, amount } = (0, import_store.useContextData)();
+  (0, import_react.useEffect)(() => {
+    import_payLog.default.log("手动标记页展示");
+  }, []);
   const start = (0, import_react.useMemo)(() => {
     if (typeof (manual == null ? void 0 : manual.money) === "number" || typeof (manual == null ? void 0 : manual.money) === "string") {
       return Number(manual == null ? void 0 : manual.money);
@@ -59,9 +63,11 @@ var manual_default = ({ onChange, className = "", formatAmount }) => {
   const [isUpdateAmount, updateAmountStatus] = (0, import_react.useState)(manual == null ? void 0 : manual.status);
   const onSuccess = () => {
     if (disabled) {
+      import_payLog.default.log("手动标记：点击成功被拦截");
       return;
     }
     if (mode === import_const.ModeEnum.Refund) {
+      import_payLog.default.log("手动标记(退款)：点击标记为成功");
       setDisabled(true);
       onChange("success", {
         amount,
@@ -73,6 +79,7 @@ var manual_default = ({ onChange, className = "", formatAmount }) => {
       });
       return;
     }
+    import_payLog.default.log("手动标记：点击标记为成功");
     updateAmountStatus(true);
     dispatch((0, import_store.updateState)({ manual: { ...manual, status: true } }));
   };
@@ -80,6 +87,7 @@ var manual_default = ({ onChange, className = "", formatAmount }) => {
     if (disabled) {
       return;
     }
+    import_payLog.default.log("手动标记：点击标记为失败");
     setDisabled(true);
     onChange("fail", { number, uniquePaymentNumber: number, device, order_id });
   };
@@ -87,6 +95,7 @@ var manual_default = ({ onChange, className = "", formatAmount }) => {
     if (disabled) {
       return;
     }
+    import_payLog.default.log("手动标记-确认金额：点击确认", { money });
     setDisabled(true);
     if (mode === import_const.ModeEnum.Refund || mode === import_const.ModeEnum.Query) {
       return;
@@ -124,6 +133,7 @@ var manual_default = ({ onChange, className = "", formatAmount }) => {
     return;
   };
   const onCancel = () => {
+    import_payLog.default.log("手动标记-确认金额：点击取消");
     updateAmountStatus(false);
     setMoney(pay == null ? void 0 : pay.total);
     dispatch(

package/lib/components/eftposPay/component/signature/index.d.ts

@@ -1,9 +1,8 @@
-import React from 'react';
 import { ActionProps } from '../../const';
 /**
  * @title: 取消签名确认页
  * @Author: hongbing.wang
  * @Date: 2024-08-20 11:49
  */
-declare const _default: ({ api, className }: ActionProps) => React.JSX.Element;
+declare const _default: ({ api, className }: ActionProps) => JSX.Element;
 export default _default;

package/lib/components/eftposPay/component/signature/index.js

@@ -37,14 +37,17 @@ var import_antd = require("antd");
 var import_react = __toESM(require("react"));
 var import_store = require("../../store");
 var import_header = __toESM(require("../header"));
+var import_payLog = __toESM(require("../../utils/payLog"));
 var signature_default = ({ api, className = "" }) => {
   const dispatch = (0, import_store.useDispatch)();
   const { number, mode } = (0, import_store.useContextData)();
   const [disabled, setDisabled] = (0, import_react.useState)(false);
   const onBack = () => {
+    import_payLog.default.log("取消签名确认页：点击返回");
     dispatch((0, import_store.updateComponent)(""));
   };
   const onConfirm = () => {
+    import_payLog.default.log("取消签名确认页：点击确认");
     setDisabled(true);
     api.update({
       type: "NO",

package/lib/components/eftposPay/component/step/index.d.ts

@@ -1,4 +1,4 @@
-import React from 'react';
+/// <reference types="react" />
 import { StatusType } from '../../const';
 declare const _default: (props: {
     status: StatusType;
@@ -8,5 +8,5 @@ declare const _default: (props: {
     loading?: string;
     success?: string;
     fail?: string;
-}) => React.JSX.Element;
+}) => JSX.Element;
 export default _default;

package/lib/components/eftposPay/component/step/step.d.ts

@@ -1,9 +1,9 @@
-import React from 'react';
+/// <reference types="react" />
 declare const _default: (props: {
     status: string;
     pedding?: string;
     resolve?: string;
     reject?: string;
     className?: string;
-}) => React.JSX.Element;
+}) => JSX.Element;
 export default _default;

package/lib/components/eftposPay/device.d.ts

@@ -1,4 +1,3 @@
-import React from 'react';
 import { PayProps, PosProps } from './const';
 import './device.less';
 /**
@@ -20,5 +19,5 @@ declare const _default: ({ api, onChange, onClose, className, device_number, isM
     net: boolean;
     client: string;
     formatAmount(amount: number | string, precision: number, symbol: string): string;
-}) => React.JSX.Element;
+}) => JSX.Element;
 export default _default;

package/lib/components/eftposPay/device.js

@@ -44,7 +44,7 @@ var import_store = require("./store");
 var import_manufacturer = require("./manufacturer");
 var import_device = require("./device.less");
 var import_useEngineContext = __toESM(require("../../hooks/useEngineContext"));
-var import_utils2 = require("@pisell/utils");
+var import_payLog = __toESM(require("./utils/payLog"));
 var device_default = ({
   api,
   onChange,
@@ -66,6 +66,7 @@ var device_default = ({
   const dispatch = (0, import_store.useDispatch)();
   const timerRef = (0, import_react.useRef)();
   const onClick = (event) => {
+    var _a;
     if (!net) {
       import_antd.message.open({
         key: "net-warning",
@@ -75,6 +76,7 @@ var device_default = ({
       return;
     }
     const [index] = [Number(event.currentTarget.dataset.index)];
+    import_payLog.default.log("手动选择设备", { deviceId: (_a = list[index]) == null ? void 0 : _a.id, index });
     setDevice(list[index]);
   };
   const triggerCloseButton = (bool) => {
@@ -107,6 +109,7 @@ var device_default = ({
     }
   };
   (0, import_ahooks.useMount)(() => {
+    import_payLog.default.log("设备选择页展示");
     setLoading(true);
     closeFirstWithDelayShow();
     api.getDeviceList({ type: eftpos, status: "paired" }).then(
@@ -114,6 +117,7 @@ var device_default = ({
         clearTimer();
         setLoading(false);
         if (res && Array.isArray(res.list) && res.list.length > 0) {
+          import_payLog.default.log("设备列表加载成功", { count: res.list.length, hasDeviceNumber: !!device_number });
           if (device_number) {
             const hostDeviceList = res.list.filter(
               (item) => {
@@ -127,6 +131,7 @@ var device_default = ({
               setDataStaus(true);
               setList(setDeviceList(hostDeviceList));
               if (hostDeviceList.length === 1) {
+                import_payLog.default.log("自动选择设备（device_number匹配）", { device: hostDeviceList[0] });
                 setDevice(hostDeviceList[0]);
               }
               return;
@@ -135,17 +140,20 @@ var device_default = ({
           setDataStaus(true);
           setList(setDeviceList(res.list));
           if (res.list.length === 1) {
+            import_payLog.default.log("自动选择设备（单设备）", { device: res.list[0] });
             setDevice(res.list[0]);
           } else {
             triggerCloseButton(true);
           }
           return;
         }
+        import_payLog.default.log("设备列表为空");
         triggerCloseButton(true);
         setDataStaus(false);
       },
       () => {
         clearTimer();
+        import_payLog.default.log("设备列表加载失败");
         triggerCloseButton(true);
         setDataStaus(false);
         setLoading(false);
@@ -175,6 +183,7 @@ var device_default = ({
     return true;
   };
   const setDevice = async (device2) => {
+    import_payLog.default.setContext({ deviceId: device2 == null ? void 0 : device2.id });
     dispatch((0, import_store.updateDevice)({ device: device2 }));
     if (typeof api.selectDevice === "function") {
       api.selectDevice(device2);
@@ -184,15 +193,7 @@ var device_default = ({
         triggerCloseButton(false);
         const isActive = await checkIsActiveWithDelay(100);
         if (!isActive) {
-          (0, import_utils2.sendWarningLog)({
-            title: "支付-当前页面非活跃状态，无法进行支付",
-            content: [
-              {
-                key: "activeStatus",
-                value: JSON.stringify({ order_id, isActive })
-              }
-            ]
-          });
+          import_payLog.default.log("页面非活跃状态，阻断支付", { order_id, isActive });
           return;
         }
         if (device2.pay) {

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

@@ -19,7 +19,7 @@ export declare const useStoreRef: <T extends {
     readonly netRef: React.MutableRefObject<boolean | undefined>;
     readonly symbolRef: React.MutableRefObject<string>;
     readonly amountRef: React.MutableRefObject<string | number>;
-    readonly eftposRef: React.MutableRefObject<"stripe" | "payo" | "tyro" | "windcave" | "linkly">;
+    readonly eftposRef: React.MutableRefObject<"stripe" | "tyro" | "windcave" | "payo" | "linkly">;
     readonly clientRef: React.MutableRefObject<ClientEnum>;
     readonly dataRef: React.MutableRefObject<import("./store").State>;
 };

package/lib/components/eftposPay/index.d.ts

@@ -1,5 +1,4 @@
-import React from 'react';
 import { PosProps } from './const';
 import './index.less';
-declare const _default: (props: PosProps) => React.JSX.Element | null;
+declare const _default: (props: PosProps) => JSX.Element | null;
 export default _default;

package/lib/components/eftposPay/index.js

@@ -43,19 +43,30 @@ var import_manufacturer = require("./manufacturer");
 var import_store = require("./store");
 var import_index = require("./index.less");
 var import_locales2 = require("../../utils/locales");
+var import_payLog = __toESM(require("./utils/payLog"));
 import_utils.locales.init(import_locales.default, (0, import_locales2.getLocale)());
 var eftposPay_default = (props) => {
-  var _a, _b, _c, _d, _e, _f;
+  var _a, _b, _c, _d, _e, _f, _g, _h;
   const [check, setCheckStatus] = (0, import_react.useState)(
     props.type === import_const.EftposEnum.Tyro ? import_const.OrderEumn.Null : props.source === import_const.RestoreEumn.Restore ? import_const.OrderEumn.Restore : import_const.OrderEumn.Normal
   );
   const context = (0, import_useEngineContext.default)();
+  (0, import_payLog.usePayLog)({
+    paymentType: props.type,
+    mode: props.mode || import_const.ModeEnum.Pay,
+    orderId: (_a = props.params) == null ? void 0 : _a.order_id,
+    extra: {
+      initialParams: (props == null ? void 0 : props.params) || null,
+      initialSource: (props == null ? void 0 : props.source) || "",
+      initialDevice: (props == null ? void 0 : props.device) || null
+    }
+  });
   const [cardSurcharge, setCardSurcharge] = (0, import_react.useState)(0);
   const [receipt, setReceipt] = (0, import_react.useState)([]);
   const [updateTime, setTime] = (0, import_react.useState)("");
   console.log("context = ", context);
   const [historyData, setHistory] = (0, import_react.useState)();
-  const { formatAmount, storage, store } = ((_a = context.appHelper) == null ? void 0 : _a.utils) || {
+  const { formatAmount, storage, store } = ((_b = context.appHelper) == null ? void 0 : _b.utils) || {
     store: {},
     formatAmount: (number, precision, symbol2) => `${symbol2}${number}`,
     storage: () => ({
@@ -63,18 +74,24 @@ var eftposPay_default = (props) => {
     })
   };
   const channel = (0, import_react.useMemo)(() => {
-    var _a2;
-    const channel2 = ((_a2 = storage == null ? void 0 : storage.get) == null ? void 0 : _a2.call(storage, "channel")) || "";
-    if (channel2 === "terminal") {
+    var _a2, _b2;
+    if (((_a2 = props == null ? void 0 : props.params) == null ? void 0 : _a2.platform) === "kiosk") {
+      return "kiosk";
+    }
+    const rawChannel = ((_b2 = storage == null ? void 0 : storage.get) == null ? void 0 : _b2.call(storage, "channel")) || "";
+    if (rawChannel === "terminal") {
       return "terminal";
     }
-    if (channel2 === "android_kiosk") {
+    if (rawChannel === "android_kiosk") {
       return "kiosk";
     }
     return "";
-  }, []);
+  }, [(_c = props == null ? void 0 : props.params) == null ? void 0 : _c.platform, storage]);
+  (0, import_react.useEffect)(() => {
+    import_payLog.default.setContext({ channel: channel || "web" });
+  }, [channel]);
   const isMobile = (0, import_react.useMemo)(() => Boolean(channel), [channel]);
-  const symbol = ((_d = (_c = (_b = store == null ? void 0 : store.getState) == null ? void 0 : _b.call(store)) == null ? void 0 : _c.global) == null ? void 0 : _d.symbol) || "$";
+  const symbol = ((_f = (_e = (_d = store == null ? void 0 : store.getState) == null ? void 0 : _d.call(store)) == null ? void 0 : _e.global) == null ? void 0 : _f.symbol) || "$";
   const mode = (0, import_react.useMemo)(() => {
     if (props.source === import_const.RestoreEumn.Restore) {
       if (props.params) {
@@ -109,6 +126,7 @@ var eftposPay_default = (props) => {
   }, [state]);
   const onChangeStatus = (0, import_react.useCallback)(
     (status, params, other) => {
+      import_payLog.default.log("支付状态回调", { status, params, other });
       props.onChangeStatus(status, params, other);
     },
     []
@@ -143,9 +161,8 @@ var eftposPay_default = (props) => {
   }, [mode, state]);
   (0, import_react.useEffect)(() => {
     document.body.id = "body";
-    console.log("初始化 ........112218017777");
   }, []);
-  console.log("props?.params?.device_number = ", (_e = props == null ? void 0 : props.params) == null ? void 0 : _e.device_number);
+  console.log("props?.params?.device_number = ", (_g = props == null ? void 0 : props.params) == null ? void 0 : _g.device_number);
   const api = (0, import_react.useMemo)(() => {
     if (typeof props.getApi === "function") {
       return props.getApi();
@@ -156,12 +173,14 @@ var eftposPay_default = (props) => {
     if (props.source === import_const.RestoreEumn.Restore || props.type === import_const.EftposEnum.Tyro) {
       return;
     }
+    import_payLog.default.log("交易检查：开始检查交易");
     api.getTransaction({
       order_id: stateRef.current.order_id,
       card_reader_type: stateRef.current.eftpos,
       receive_status: "unprocessed"
     }).then((res) => {
       if (!Array.isArray(res.data) || res.data.length === 0) {
+        import_payLog.default.log("交易检查：无未处理交易");
         setCheckStatus(import_const.OrderEumn.Null);
         return;
       }
@@ -176,6 +195,7 @@ var eftposPay_default = (props) => {
       const latest = list.pop();
       const numberList = list.map((item) => item.number);
       if (latest.status === import_const.OrderEumn.Failed) {
+        import_payLog.default.log("交易检查：最新交易已失败", { number: latest.number });
         setCheckStatus(latest.status);
         onChangeStatus("mark_tx_processed", [
           ...numberList,
@@ -199,8 +219,13 @@ var eftposPay_default = (props) => {
           decodeURIComponent(atob(decodeURIComponent(pay_param_base64)))
         );
         setHistory(data);
+        import_payLog.default.log("交易检查：发现待处理交易", {
+          status: latest.status,
+          number: latest.number
+        });
         setCheckStatus(latest.status);
       } catch (e) {
+        import_payLog.default.log("交易检查：解析交易数据失败", { error: e });
         setCheckStatus(import_const.OrderEumn.Failed);
         return;
       }
@@ -236,7 +261,7 @@ var eftposPay_default = (props) => {
       source: props.source,
       tyroUrl: props.tyroUrl,
       tyroVersion: props.tyroVersion,
-      device_number: (_f = props == null ? void 0 : props.params) == null ? void 0 : _f.device_number,
+      device_number: (_h = props == null ? void 0 : props.params) == null ? void 0 : _h.device_number,
       isMobile,
       formatAmount
     }

package/lib/components/eftposPay/linkly/hooks/normal.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/linkly/hooks/normal.ts
@@ -32,6 +42,7 @@ var import_hooks = require("../../hooks");
 var import_const = require("../../const");
 var import_store = require("../../store");
 var import_const2 = require("../const");
+var import_payLog = __toESM(require("../../utils/payLog"));
 var useLinklyPayOrRefund = (handleCheck) => {
   const dispatch = (0, import_store.useDispatch)();
   const { numRef, modeRef, orderIdRef, deviceRef, payRef, amountRef } = (0, import_hooks.useStoreRef)();
@@ -58,10 +69,7 @@ var useLinklyPayOrRefund = (handleCheck) => {
     if (!handleCheck()) {
       return;
     }
-    (0, import_utils.sendWarningLog)({
-      title: `Linkly-${isPay ? "Pay" : "Refund"}-接口成功`,
-      content: [{ key: "response", value: JSON.stringify(res) }]
-    });
+    import_payLog.default.log(`Linkly：${isPay ? "支付" : "退款"}接口成功`, { res });
     const status = (_a = res == null ? void 0 : res.data) == null ? void 0 : _a.status;
     if (status == 0) {
       numRef.current = (_b = res == null ? void 0 : res.data) == null ? void 0 : _b.session_id;
@@ -89,9 +97,8 @@ var useLinklyPayOrRefund = (handleCheck) => {
     if (!handleCheck()) {
       return;
     }
-    (0, import_utils.sendWarningLog)({
-      title: `Linkly-${isPay ? "Pay" : "Refund"}-接口失败`,
-      content: [{ key: "error", value: JSON.stringify(error) }]
+    import_payLog.default.log(`Linkly：${isPay ? "支付" : "退款"}接口失败`, {
+      error: JSON.stringify(error || {})
     });
     (_a = failRef.current) == null ? void 0 : _a.call(failRef, error, false);
   };
@@ -107,10 +114,8 @@ var useLinklyPayOrRefund = (handleCheck) => {
       // 交易金额, 包含选择的订单金额+手续费，订单金额+手续费=交易金额
       amount: isPay ? (_c = payRef.current) == null ? void 0 : _c.total : amountRef.current
     };
-    (0, import_utils.sendWarningLog)({
-      title: `Linkly-${isPay ? "Pay" : "Refund"}`,
-      content: [{ key: "params", value: JSON.stringify(param) }]
-    });
+    import_payLog.default.setContext({ transactionNumber: String(orderIdRef.current) });
+    import_payLog.default.log(`Linkly：发起${isPay ? "支付" : "退款"}`, { param });
     _pay.run(param);
   };
   return {
@@ -129,17 +134,7 @@ var useLinklyCancel = (handleCheck) => {
     if (!handleCheck()) {
       return;
     }
-    if (type === "success") {
-      (0, import_utils.sendWarningLog)({
-        title: `Linkly-${isPay ? "Pay" : "Refund"}-取消成功`,
-        content: [{ key: "response", value: JSON.stringify(res) }]
-      });
-    } else {
-      (0, import_utils.sendWarningLog)({
-        title: `Linkly-${isPay ? "Pay" : "Refund"}-取消失败`,
-        content: [{ key: "error", value: JSON.stringify(res) }]
-      });
-    }
+    import_payLog.default.log(`Linkly：取消${type === "success" ? "成功" : "失败"}`, { res });
     (_a = resultQueryRef.current) == null ? void 0 : _a.call(resultQueryRef);
   };
   const _cancel = (0, import_ahooks.useRequest)(
@@ -155,15 +150,10 @@ var useLinklyCancel = (handleCheck) => {
     resultQueryRef.current = resultQuery;
     dispatch((0, import_store.updateCustom)({ buttonDisabled: true }));
     const param = {
-      // 设备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
     };
-    (0, import_utils.sendWarningLog)({
-      title: `Linkly-${isPay ? "Pay" : "Refund"}-取消`,
-      content: [{ key: "params", value: JSON.stringify(param) }]
-    });
+    import_payLog.default.log("Linkly：发起取消", { param });
     _cancel.run(param);
     dispatch((0, import_store.updateCustom)({ actionStatus: import_const2.LinklyActionStatus.CancelWaiting }));
   };
@@ -183,17 +173,9 @@ var useLinklySignature = (handleCheck) => {
     if (!handleCheck()) {
       return;
     }
-    if (type === "success") {
-      (0, import_utils.sendWarningLog)({
-        title: `Linkly-${isPay ? "Pay" : "Refund"}-签名成功`,
-        content: [{ key: "response", value: JSON.stringify(res) }]
-      });
-    } else {
-      (0, import_utils.sendWarningLog)({
-        title: `Linkly-${isPay ? "Pay" : "Refund"}-签名失败`,
-        content: [{ key: "error", value: JSON.stringify(res) }]
-      });
-    }
+    import_payLog.default.log(`Linkly：签名接口${type === "success" ? "成功" : "失败"}`, {
+      res
+    });
     (_a = resultQueryRef.current) == null ? void 0 : _a.call(resultQueryRef);
   };
   const _signature = (0, import_ahooks.useRequest)(
@@ -223,10 +205,7 @@ var useLinklySignature = (handleCheck) => {
     dispatch(
       (0, import_store.updateCustom)({ actionStatus: import_const2.LinklyActionStatus.SignatureWaiting })
     );
-    (0, import_utils.sendWarningLog)({
-      title: `Linkly-${isPay ? "Pay" : "Refund"}-签名`,
-      content: [{ key: "params", value: JSON.stringify(param) }]
-    });
+    import_payLog.default.log("Linkly：发起签名", { param });
     _signature.run(param);
   };
   return {