@pisell/private-materials 6.6.62 → 6.6.63

package/lib/components/eftposPay/mx51/utils.js

@@ -0,0 +1,115 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/components/eftposPay/mx51/utils.ts
+var utils_exports = {};
+__export(utils_exports, {
+  parseMX51Params: () => parseMX51Params
+});
+module.exports = __toCommonJS(utils_exports);
+var import_types = require("./types");
+var parseMX51Params = (params, paymentStatus, data) => {
+  if (!params) {
+    return null;
+  }
+  const result = {
+    transactionId: (params == null ? void 0 : params.id) || "",
+    status: (params == null ? void 0 : params.status) || "",
+    version: (params == null ? void 0 : params.version) || 0,
+    message: (params == null ? void 0 : params.message) || "",
+    merchantReceipt: params == null ? void 0 : params.merchant_receipt,
+    customerReceipt: params == null ? void 0 : params.customer_receipt,
+    resultAmounts: params == null ? void 0 : params.result_amounts,
+    resultFinancialStatus: params == null ? void 0 : params.result_financial_status,
+    layouts: [],
+    details: {},
+    detailsText: "",
+    autoAction: []
+  };
+  if (!(params == null ? void 0 : params.pos_instructions)) {
+    return result;
+  }
+  const posInstructions = (params == null ? void 0 : params.pos_instructions) || {};
+  result.autoAction = (posInstructions == null ? void 0 : posInstructions.auto_actions) || [];
+  if (!(posInstructions == null ? void 0 : posInstructions.action_form)) {
+    return result;
+  }
+  const actionForm = (posInstructions == null ? void 0 : posInstructions.action_form) || {};
+  if (actionForm == null ? void 0 : actionForm.details) {
+    result.details = { ...(actionForm == null ? void 0 : actionForm.details) || {} };
+    const detailsTextArr = [];
+    Object.keys((actionForm == null ? void 0 : actionForm.details) || {}).forEach((key) => {
+      var _a;
+      detailsTextArr.push(`${key}: ${((_a = actionForm == null ? void 0 : actionForm.details) == null ? void 0 : _a[key]) || ""}`);
+    });
+    result.detailsText = (detailsTextArr == null ? void 0 : detailsTextArr.join(", ")) || "";
+  }
+  if ((actionForm == null ? void 0 : actionForm.layout) && Array.isArray(actionForm == null ? void 0 : actionForm.layout)) {
+    const layouts = [];
+    actionForm.layout.forEach((layout) => {
+      const elements = [];
+      if ((layout == null ? void 0 : layout.elements) && Array.isArray(layout == null ? void 0 : layout.elements)) {
+        layout.elements.forEach((element) => {
+          var _a;
+          const elementKey = (element == null ? void 0 : element.key) || "";
+          const elementLabel = (element == null ? void 0 : element.label) || "";
+          const property = ((_a = actionForm == null ? void 0 : actionForm.properties) == null ? void 0 : _a[elementKey]) || {};
+          if (property) {
+            const element2 = {
+              _extra: {
+                merchantReceipt: params == null ? void 0 : params.merchant_receipt,
+                customerReceipt: params == null ? void 0 : params.customer_receipt,
+                paymentStatus,
+                response: data
+              },
+              key: elementKey,
+              name: (property == null ? void 0 : property.name) || "",
+              label: elementLabel,
+              submitUrl: (property == null ? void 0 : property.submit_url) || "",
+              action: property == null ? void 0 : property.action,
+              type: (property == null ? void 0 : property.type) || "button",
+              text: property == null ? void 0 : property.text,
+              // 如果是打印收据按钮，需要关联对应的小票信息
+              receipt: elementKey === import_types.EButtonKeyType.PrintMerchantReceipt ? result == null ? void 0 : result.merchantReceipt : elementKey === import_types.EButtonKeyType.PrintCustomerReceipt ? result == null ? void 0 : result.customerReceipt : null
+            };
+            if ((property == null ? void 0 : property.type) === "image") {
+              element2.image = {
+                name: (property == null ? void 0 : property.name) || "",
+                data: (property == null ? void 0 : property.data) || "",
+                encoding: (property == null ? void 0 : property.encoding) || ""
+              };
+            }
+            elements.push(element2);
+          }
+        });
+      }
+      if (elements.length > 0) {
+        layouts.push({
+          layoutType: layout.type || "unknown",
+          elements
+        });
+      }
+    });
+    result.layouts = layouts;
+  }
+  return result;
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  parseMX51Params
+});

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,17 +149,19 @@ var Pay = ({
     return () => {
       if (clearRef.current) {
         clearTimeout(clearRef.current);
+        clearRef.current = null;
       }
     };
   }, []);
   console.log("data =>>>>>> ", data);
+  const isHideHeader = data.eftpos === "mx51" && data.status === import_const.StatusEnum.Question || data.status === import_const.StatusEnum.Init;
   return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, data.render ? /* @__PURE__ */ import_react.default.createElement(
     "div",
     {
       className: `pisell-lowcode__eft-pay-box ${className}`,
       style: data.type === "step" ? {} : { display: "none" }
     },
-    data.status !== import_const.StatusEnum.Init && /* @__PURE__ */ import_react.default.createElement(
+    isHideHeader ? null : /* @__PURE__ */ import_react.default.createElement(
       import_header.default,
       {
         status: data.status,
@@ -181,7 +190,8 @@ var Pay = ({
       }
     ) : null,
     data.eftpos === "linkly" ? /* @__PURE__ */ import_react.default.createElement(import_manufacturer.Linkly, { key: data.key, api, onChange }) : null,
-    data.eftpos === "huifu" ? /* @__PURE__ */ import_react.default.createElement(import_manufacturer.Huifu, { key: data.key, onChange, isNativeApp: isMobile }) : null
+    data.eftpos === "huifu" ? /* @__PURE__ */ import_react.default.createElement(import_manufacturer.Huifu, { key: data.key, onChange, isNativeApp: isMobile }) : null,
+    data.eftpos === "mx51" ? /* @__PURE__ */ import_react.default.createElement(import_manufacturer.Mx51, { key: data.key, onChange }) : null
   ) : null, data.type === import_const.PayRouteEnum.Unset && Comm ? /* @__PURE__ */ import_react.default.createElement(
     Comm,
     {

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);
@@ -187,6 +188,7 @@ var POS = ({
       card_reader_type: eftposRef.current,
       card_reader_id: (_b = deviceRef.current) == null ? void 0 : _b.id,
       number: numRef.current,
+      original_payment_number: custom == null ? void 0 : custom.original_payment_number,
       pay_param_base64: encodeURIComponent(
         btoa(
           encodeURIComponent(
@@ -198,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,
@@ -207,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);
       });
     }
@@ -267,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: {
@@ -284,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/const.js

@@ -71,7 +71,7 @@ var const_default = (params) => {
     status: import_const.StatusEnum.Loading,
     steps: getStep(mode),
     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/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/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,10 +91,8 @@ export declare type State = {
     };
     backup?: Omit<State, 'backup'>;
     client: ClientEnum;
-    /** 原始参数 - 用于 retry 时完整恢复 */
-    originalParams?: {
-        [key: string]: unknown;
-    };
+    /** 支付原始参数 */
+    originalParams?: Record<string, any>;
 };
 export declare type Action = {
     type: EActionTypes;
@@ -301,7 +299,7 @@ export declare const backUpFree: (payload: Partial<State>) => {
         amount?: string | number | undefined;
         mode?: "pay" | "refund" | "fullPay" | "query" | undefined;
         order_id?: string | number | undefined;
-        eftpos?: "stripe" | "payo" | "tyro" | "windcave" | "linkly" | "huifu" | undefined;
+        eftpos?: "stripe" | "tyro" | "mx51" | "payo" | "windcave" | "linkly" | "huifu" | undefined;
         action?: "pay" | "amount" | "deviceList" | undefined;
         key?: number | undefined;
         step?: number | undefined;
@@ -348,9 +346,7 @@ export declare const backUpFree: (payload: Partial<State>) => {
         } | undefined;
         backup?: Omit<State, "backup"> | undefined;
         client?: ClientEnum | undefined;
-        originalParams?: {
-            [key: string]: unknown;
-        } | 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 } : {},