@pisell/private-materials 6.2.51 → 6.2.52

package/lib/components/pay/toC/PaymentMethods/components/PaymentReturnContent/index.js

@@ -0,0 +1,88 @@
+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)
+    __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 __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/pay/toC/PaymentMethods/components/PaymentReturnContent/index.tsx
+var PaymentReturnContent_exports = {};
+__export(PaymentReturnContent_exports, {
+  default: () => PaymentReturnContent_default
+});
+module.exports = __toCommonJS(PaymentReturnContent_exports);
+var import_react = __toESM(require("react"));
+var import_materials = require("@pisell/materials");
+var import_utils = require("@pisell/utils");
+var import_ahooks = require("ahooks");
+var import_serve = require("../../../serve");
+var import_usePrefix = __toESM(require("../../../../../../hooks/usePrefix"));
+var import_index = require("./index.less");
+var PaymentReturnContent = ({
+  orderId,
+  unique_payment_number,
+  state,
+  handleReturn,
+  pay_number
+}) => {
+  const prefix = (0, import_usePrefix.default)();
+  const getPaymentIsPaid = (0, import_ahooks.useMemoizedFn)(async () => {
+    if (!unique_payment_number && !pay_number) {
+      return true;
+    }
+    const { data } = await (0, import_serve.getPaymentResult)({
+      order_id: orderId,
+      pay_number,
+      unique_payment_number: pay_number ? void 0 : unique_payment_number
+    });
+    return (data == null ? void 0 : data.payment_status) === "paid";
+  });
+  const handleViewOrder = async () => {
+    var _a;
+    const isPaid = await getPaymentIsPaid();
+    if (!isPaid) {
+      (0, import_materials.PisellToast)({
+        content: import_utils.locales.getText("tocPay.text.paymentFailed")
+      });
+      return;
+    }
+    (_a = state.payCallback) == null ? void 0 : _a.call(state, {
+      key: "success"
+    });
+  };
+  const handleGoBack = async () => {
+    var _a;
+    const isPaid = await getPaymentIsPaid();
+    if (!isPaid) {
+      handleReturn == null ? void 0 : handleReturn();
+      return;
+    } else {
+      (_a = state.payCallback) == null ? void 0 : _a.call(state, {
+        key: "success"
+      });
+    }
+  };
+  return /* @__PURE__ */ import_react.default.createElement("div", { className: "payment-return-content" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "payment-return-content-img" }, /* @__PURE__ */ import_react.default.createElement("img", { src: `${prefix}/payment-content.png`, alt: "success" })), /* @__PURE__ */ import_react.default.createElement("div", { className: "payment-return-content-text" }, import_utils.locales.getText("tocPay.text.weAreVerifyingYourPaymentPleaseCheckYourOrderStatusLater")), /* @__PURE__ */ import_react.default.createElement("div", { className: "payment-return-content-buttons" }, /* @__PURE__ */ import_react.default.createElement(import_materials.Button, { block: true, className: "payment-return-content-order-button", onClick: handleViewOrder }, import_utils.locales.getText("tocPay.text.paymentCompletedAndViewOrder")), /* @__PURE__ */ import_react.default.createElement(import_materials.Button, { block: true, onClick: handleGoBack }, import_utils.locales.getText("tocPay.text.returnAndSelectOtherPaymentMethod"))));
+};
+var PaymentReturnContent_default = PaymentReturnContent;

package/lib/components/pay/toC/PaymentMethods/components/PaymentReturnContent/index.less

@@ -0,0 +1,44 @@
+.payment-return-content {
+  padding: 100px 46px 0;
+  max-height: 100vh;
+  display: flex;
+  flex-direction: column;
+  gap: 24px;
+
+  .payment-return-content-img {
+    width: 100%;
+    min-height: 270px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    img {
+      max-width: 100%;
+      height: 100%;
+      max-height: 480px;
+    }
+  }
+  .payment-return-content-text {
+    color: var(--Gray-600, #475467);
+    text-align: center;
+  }
+  .payment-return-content-buttons {
+    display: flex;
+    flex-direction: column;
+    gap: 24px;
+    button {
+      border-radius: 40px;
+      span {
+        width: 100%;
+        text-overflow: ellipsis;
+        overflow: hidden;
+      }
+    }
+    .payment-return-content-order-button {
+      background: #7F56DA;
+      color: var(--Primary-700, #6941C6);
+      border: 1px solid var(--Primary-200, #E9D7FE);
+      background: var(--Primary-50, #F9F5FF);
+    }
+  }
+}
+

package/lib/components/pay/toC/PaymentMethods/hooks/index.d.ts

@@ -0,0 +1,19 @@
+export interface UsePaymentRedirectOptions {
+    orderId?: string;
+    paymentType: string;
+    onAfterReturn?: () => void;
+}
+export interface UsePaymentRedirectReturn {
+    isReturned: boolean;
+    handleRedirect: (url: string) => Promise<void>;
+    resetState: () => void;
+}
+/**
+ * 支付跳转 Hook
+ * 用于处理跳转到外部支付页面的逻辑，包括：
+ * 1. 保存跳转标记到 history state
+ * 2. 跳转到外部支付页面
+ * 3. 监听页面返回事件
+ * 4. 返回后更新状态
+ */
+export declare const usePaymentRedirect: (options: UsePaymentRedirectOptions) => UsePaymentRedirectReturn;

package/lib/components/pay/toC/PaymentMethods/hooks/index.js

@@ -0,0 +1,90 @@
+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/pay/toC/PaymentMethods/hooks/index.tsx
+var hooks_exports = {};
+__export(hooks_exports, {
+  usePaymentRedirect: () => usePaymentRedirect
+});
+module.exports = __toCommonJS(hooks_exports);
+var import_ahooks = require("ahooks");
+var import_react = require("react");
+var usePaymentRedirect = (options) => {
+  const { orderId, paymentType, onAfterReturn } = options;
+  const [isReturned, setIsReturned] = (0, import_react.useState)(false);
+  const handleRedirect = (0, import_ahooks.useMemoizedFn)(
+    async (url) => {
+      try {
+        const currentState = window.history.state || {};
+        window.history.replaceState(
+          {
+            ...currentState,
+            paymentRedirected: true,
+            paymentType,
+            orderId,
+            timestamp: Date.now()
+          },
+          "",
+          window.location.href
+        );
+        window.location.href = url;
+      } catch (error) {
+        throw error;
+      }
+    }
+  );
+  const resetState = (0, import_ahooks.useMemoizedFn)(() => {
+    setIsReturned(false);
+  });
+  (0, import_react.useEffect)(() => {
+    const handlePageShow = (event) => {
+      if (!orderId) return;
+      const historyState = window.history.state;
+      if ((historyState == null ? void 0 : historyState.paymentRedirected) && (historyState == null ? void 0 : historyState.paymentType) === paymentType && (historyState == null ? void 0 : historyState.orderId) === orderId) {
+        console.log(
+          `检测到从 ${paymentType} 返回, event.persisted:`,
+          event.persisted
+        );
+        setIsReturned(true);
+        if (onAfterReturn) {
+          onAfterReturn();
+        }
+        const newState = { ...historyState };
+        delete newState.paymentRedirected;
+        delete newState.paymentType;
+        delete newState.timestamp;
+        delete newState.orderId;
+        window.history.replaceState(newState, "", window.location.href);
+      }
+    };
+    handlePageShow({ persisted: false });
+    window.addEventListener("pageshow", handlePageShow);
+    return () => {
+      window.removeEventListener("pageshow", handlePageShow);
+    };
+  }, [orderId, paymentType]);
+  return {
+    isReturned,
+    handleRedirect,
+    resetState
+  };
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  usePaymentRedirect
+});

package/lib/components/pay/toC/index.js

@@ -45,13 +45,15 @@ var import_PaymentMethods = __toESM(require("./PaymentMethods"));
 var import_serve = require("./serve");
 var import_model = require("./model");
 var import_useEngineContext = __toESM(require("../../../hooks/useEngineContext"));
+var import_usePaymentLogger = __toESM(require("../../../hooks/usePaymentLogger"));
 var import_utils2 = require("../../../utils");
 var import_payGroup = require("./payGroup");
 var import_locales = __toESM(require("./locales"));
 var import_utils3 = require("./utils");
+var import_status = require("./status");
 var import_index = require("./index.less");
 var ToCPay = (props, ref) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u;
   const { state, dispatch } = (0, import_react.useContext)(import_model.Context);
   const paymentListRef = (0, import_react.useRef)();
   const paymentMethodsRef = (0, import_react.useRef)();
@@ -61,13 +63,17 @@ var ToCPay = (props, ref) => {
   const [renderType, setRenderType] = (0, import_react.useState)("modal");
   const walletPassBlockRef = (0, import_react.useRef)(null);
   const context = (0, import_useEngineContext.default)();
+  const paymentLogger = (0, import_usePaymentLogger.default)({
+    orderId: ((_a = state.payGroup) == null ? void 0 : _a.order_id) || "unknown",
+    step: "1"
+  });
   const [showInformation, setShowInformation] = (0, import_react.useState)(false);
   const [showDetectIncognitoConfirm, setShowDetectIncognitoConfirm] = (0, import_react.useState)(false);
   const utils = context.appHelper.utils || {};
-  const dvaStore = (_c = (_b = (_a = context.appHelper.utils) == null ? void 0 : _a.getStore) == null ? void 0 : _b.call(_a)) == null ? void 0 : _c.getState();
-  const customer_id = (_i = (_h = (_g = (_f = (_e = (_d = context.appHelper.utils) == null ? void 0 : _d.getStore()) == null ? void 0 : _e.getState) == null ? void 0 : _f.call(_e)) == null ? void 0 : _g.global) == null ? void 0 : _h.userInfo) == null ? void 0 : _i.id;
-  const shopName = (_l = (_k = (_j = dvaStore.core) == null ? void 0 : _j.core) == null ? void 0 : _k.shop) == null ? void 0 : _l.name;
-  import_utils.locales.init(import_locales.default, ((_m = dvaStore.core) == null ? void 0 : _m.translateLocale) || "en");
+  const dvaStore = (_d = (_c = (_b = context.appHelper.utils) == null ? void 0 : _b.getStore) == null ? void 0 : _c.call(_b)) == null ? void 0 : _d.getState();
+  const customer_id = (_j = (_i = (_h = (_g = (_f = (_e = context.appHelper.utils) == null ? void 0 : _e.getStore()) == null ? void 0 : _f.getState) == null ? void 0 : _g.call(_f)) == null ? void 0 : _h.global) == null ? void 0 : _i.userInfo) == null ? void 0 : _j.id;
+  const shopName = (_m = (_l = (_k = dvaStore.core) == null ? void 0 : _k.core) == null ? void 0 : _l.shop) == null ? void 0 : _m.name;
+  import_utils.locales.init(import_locales.default, ((_n = dvaStore.core) == null ? void 0 : _n.translateLocale) || "en");
   import_utils2.request.setRequest(utils == null ? void 0 : utils.request);
   const _initStore = (initProps) => {
     var _a2;
@@ -78,7 +84,8 @@ var ToCPay = (props, ref) => {
         status: "init",
         // 将支付回调储存在store, 方便其他模块调用
         payCallback: props.callback,
-        history: (_a2 = context.appHelper.utils) == null ? void 0 : _a2.history
+        history: (_a2 = context.appHelper.utils) == null ? void 0 : _a2.history,
+        front_order_uuid: (0, import_utils.getUniqueId)("front_order_uuid_")
         // 支付组
         // payGroup: {
         //   order_id: initProps?.order?.order_id,
@@ -92,7 +99,8 @@ var ToCPay = (props, ref) => {
   };
   const getWalletSetting = async (initProps) => {
     var _a2, _b2;
-    const sale_channel = ((_a2 = initProps == null ? void 0 : initProps.order) == null ? void 0 : _a2.sale_channel) || "online-store";
+    let sale_channel = ((_a2 = initProps == null ? void 0 : initProps.order) == null ? void 0 : _a2.sale_channel) || "online-store";
+    sale_channel = import_status.saleChannelMap[sale_channel] || sale_channel;
     const { wallet, wallet_setting } = await (0, import_serve.getWalletNameAndPopupStatus)({
       setting_type: `${sale_channel}-wallet-setting`
     });
@@ -112,18 +120,47 @@ var ToCPay = (props, ref) => {
     });
   };
   const init = async (initProps) => {
+    var _a2;
     const { renderType: renderType2 } = initProps;
-    setRenderType(renderType2 ?? "modal");
-    setOpen(true);
-    setSubmitLoading(false);
-    setLoading(true);
-    _initStore(initProps);
-    (0, import_payGroup.removePayGroupFromStorage)(initProps.order.order_id);
-    await _getPaymentsAndWalletPass(initProps.order);
-    await getWalletSetting(initProps);
+    paymentLogger.addLog({
+      key: "初始化开始",
+      value: ``
+    });
+    try {
+      setRenderType(renderType2 ?? "modal");
+      setOpen(true);
+      setSubmitLoading(false);
+      setLoading(true);
+      _initStore(initProps);
+      (0, import_payGroup.removePayGroupFromStorage)(initProps.order.order_id);
+      await _getPaymentsAndWalletPass(initProps.order);
+      await getWalletSetting(initProps);
+      paymentLogger.addLog({
+        key: "初始化成功",
+        value: ``
+      });
+    } catch (error) {
+      paymentLogger.addLog({
+        key: "初始化错误",
+        value: {
+          title: `订单${(_a2 = initProps == null ? void 0 : initProps.order) == null ? void 0 : _a2.order_id} 初始化失败: ${(error == null ? void 0 : error.message) || "未知错误"}`,
+          data: {
+            order: initProps == null ? void 0 : initProps.order
+          }
+        }
+      });
+      paymentLogger.sendLogs("支付初始化失败", error);
+      throw error;
+    }
   };
   const _getPaymentsAndWalletPass = async (order) => {
     var _a2, _b2;
+    paymentLogger.addLog({
+      key: "获取支付列表开始",
+      value: {
+        title: `订单${order == null ? void 0 : order.order_id} 开始获取支付列表, 金额: ${order == null ? void 0 : order.amount}`
+      }
+    });
     try {
       const data = await (0, import_serve.getPaymentsAndWalletPass)({
         order_id: order.order_id,
@@ -137,6 +174,18 @@ var ToCPay = (props, ref) => {
         payment_list,
         walletPass
       } = data || {};
+      paymentLogger.addLog({
+        key: "支付数据获取",
+        value: ""
+      });
+      const withCustomerIdList = (wallet_pass_recommend_list || []).map(
+        (item) => {
+          return {
+            ...item,
+            customer_id: customer_id || item.customer_id
+          };
+        }
+      );
       dispatch({
         type: "setPayGroup",
         payload: {
@@ -151,7 +200,7 @@ var ToCPay = (props, ref) => {
             ...(_a2 = state.payGroup) == null ? void 0 : _a2.walletPass,
             ...walletPass,
             amount: wallet_pass_amount,
-            cards: wallet_pass_recommend_list
+            cards: withCustomerIdList
           } : null,
           total_amount: order == null ? void 0 : order.amount,
           wait_amount: remain_amount
@@ -161,8 +210,22 @@ var ToCPay = (props, ref) => {
       setTimeout(() => {
         setLoading(false);
       }, 100);
+      paymentLogger.addLog({
+        key: "获取支付列表成功",
+        value: ""
+      });
     } catch (err) {
       console.log("err", err);
+      paymentLogger.addLog({
+        key: "获取支付列表错误",
+        value: {
+          title: `订单${order == null ? void 0 : order.order_id} 获取失败: ${(err == null ? void 0 : err.message) || "未知错误"}`,
+          data: {
+            order
+          }
+        }
+      });
+      paymentLogger.sendLogs("获取支付列表失败", err);
       payCallback({
         key: "fail",
         data: {
@@ -175,16 +238,47 @@ var ToCPay = (props, ref) => {
   };
   const handlePaymentByType = async (type, payGroup) => {
     var _a2, _b2, _c2;
-    setSubmitLoading(true);
-    await ((_c2 = paymentMethodsRef.current) == null ? void 0 : _c2.onPay({
-      type: type || ((_b2 = (_a2 = state.payGroup) == null ? void 0 : _a2.otherPayment) == null ? void 0 : _b2.service),
-      payGroup: payGroup || state.payGroup
-    }));
-    setSubmitLoading(false);
+    const paymentType = type || ((_b2 = (_a2 = state.payGroup) == null ? void 0 : _a2.otherPayment) == null ? void 0 : _b2.service);
+    const currentPayGroup = payGroup || state.payGroup;
+    paymentLogger.addLog({
+      key: "开始支付处理",
+      value: ""
+    });
+    try {
+      setSubmitLoading(true);
+      await ((_c2 = paymentMethodsRef.current) == null ? void 0 : _c2.onPay({
+        type: paymentType,
+        payGroup: currentPayGroup
+      }));
+      paymentLogger.addLog({
+        key: "支付方法调用成功",
+        value: ""
+      });
+      paymentLogger.sendLogs("支付方法调用成功");
+      setSubmitLoading(false);
+    } catch (error) {
+      paymentLogger.addLog({
+        key: "支付处理错误",
+        value: {
+          title: `订单${currentPayGroup == null ? void 0 : currentPayGroup.order_id} ${paymentType}支付失败: ${(error == null ? void 0 : error.message) || "未知错误"}`,
+          data: {
+            type: paymentType,
+            payGroup: currentPayGroup
+          }
+        }
+      });
+      paymentLogger.sendLogs("支付处理失败", error);
+      setSubmitLoading(false);
+      throw error;
+    }
   };
   const paymentInit = async (newOrderId) => {
     var _a2, _b2;
     const orderId = newOrderId || ((_a2 = state.payGroup) == null ? void 0 : _a2.order_id);
+    paymentLogger.addLog({
+      key: "开始创建交易组",
+      value: ""
+    });
     setSubmitLoading(true);
     try {
       const data = await (0, import_serve.getPaymentInit)({
@@ -200,6 +294,10 @@ var ToCPay = (props, ref) => {
           payment_priority: data.payment_priority
         }
       });
+      paymentLogger.addLog({
+        key: "创建交易组成功",
+        value: ""
+      });
       return {
         ...state.payGroup,
         order_id: orderId,
@@ -208,14 +306,16 @@ var ToCPay = (props, ref) => {
         payment_priority: data.payment_priority
       };
     } catch (err) {
-      (0, import_utils.sendWarningLog)({
-        title: "创建交易组失败 paymentInit catch",
-        content: [
-          { key: "错误信息", value: (err == null ? void 0 : err.message) || "未知错误" },
-          { key: "错误堆栈", value: (err == null ? void 0 : err.stack) || "无堆栈信息" },
-          { key: "错误类型", value: (err == null ? void 0 : err.name) || "未知错误类型" }
-        ]
+      paymentLogger.addLog({
+        key: "创建交易组错误",
+        value: {
+          title: `订单${orderId} 创建交易组失败: ${(err == null ? void 0 : err.message) || "未知错误"}`,
+          data: {
+            order: orderId
+          }
+        }
       });
+      paymentLogger.sendLogs("创建交易组失败", err);
       setSubmitLoading(false);
       payCallback({
         key: "fail",
@@ -225,12 +325,13 @@ var ToCPay = (props, ref) => {
           fn: "paymentInit"
         }
       });
+      throw err;
     }
   };
   const waitAmount = (0, import_react.useMemo)(() => {
     var _a2;
     return ((_a2 = state.payGroup) == null ? void 0 : _a2.wait_amount) || 0;
-  }, [(_n = state.payGroup) == null ? void 0 : _n.wait_amount]);
+  }, [(_o = state.payGroup) == null ? void 0 : _o.wait_amount]);
   const isWalletPassPay = (0, import_react.useMemo)(() => {
     var _a2, _b2, _c2;
     const isWalletPass = (_c2 = (_b2 = (_a2 = state.payGroup) == null ? void 0 : _a2.walletPass) == null ? void 0 : _b2.cards) == null ? void 0 : _c2.length;
@@ -250,28 +351,50 @@ var ToCPay = (props, ref) => {
     return ((payGroup == null ? void 0 : payGroup.wait_amount) || 0) > 0 && (0, import_utils3.getIsWalletPassAndTripartitePayment)(payGroup) && isPrivate;
   };
   const onSubmit = async (newOrderId) => {
-    var _a2;
+    var _a2, _b2, _c2, _d2, _e2, _f2, _g2;
+    paymentLogger.addLog({
+      key: "开始提交支付",
+      value: `订单${newOrderId || ((_a2 = state.payGroup) == null ? void 0 : _a2.order_id)} 开始提交, 待支付: ${(_b2 = state.payGroup) == null ? void 0 : _b2.wait_amount}, 总金额: ${(_c2 = state.payGroup) == null ? void 0 : _c2.total_amount}`
+    });
+    let newPayGroup = state.payGroup;
     try {
-      let newPayGroup = state.payGroup;
       const result = await getIsShowDetectIncognitoConfirm(newPayGroup);
       if (result) {
+        paymentLogger.addLog({
+          key: "无痕模式检测",
+          value: ""
+        });
         setShowDetectIncognitoConfirm(true);
         return;
       }
-      if (!((_a2 = state.payGroup) == null ? void 0 : _a2.payment_group_id)) {
+      if (!((_d2 = state.payGroup) == null ? void 0 : _d2.payment_group_id)) {
+        paymentLogger.addLog({
+          key: "需要创建交易组",
+          value: ""
+        });
         newPayGroup = await paymentInit(newOrderId);
       }
+      paymentLogger.addLog({
+        key: "调用支付方法",
+        value: `订单${newPayGroup == null ? void 0 : newPayGroup.order_id} 交易组${newPayGroup == null ? void 0 : newPayGroup.payment_group_id} 使用${(_f2 = (_e2 = state.payGroup) == null ? void 0 : _e2.otherPayment) == null ? void 0 : _f2.service}支付`
+      });
       handlePaymentByType(void 0, newPayGroup);
+      paymentLogger.addLog({
+        key: "支付提交调用成功",
+        value: ""
+      });
     } catch (err) {
       console.log("err", err);
-      (0, import_utils.sendWarningLog)({
-        title: "提交支付失败 onSubmit catch",
-        content: [
-          { key: "错误信息", value: (err == null ? void 0 : err.message) || "未知错误" },
-          { key: "错误堆栈", value: (err == null ? void 0 : err.stack) || "无堆栈信息" },
-          { key: "错误类型", value: (err == null ? void 0 : err.name) || "未知错误类型" }
-        ]
+      paymentLogger.addLog({
+        key: "提交支付错误",
+        value: {
+          title: `订单${newOrderId || ((_g2 = state.payGroup) == null ? void 0 : _g2.order_id)} 提交失败: ${(err == null ? void 0 : err.message) || "未知错误"}`,
+          data: {
+            newPayGroup
+          }
+        }
       });
+      paymentLogger.sendLogs("提交支付失败", err);
     }
   };
   const paymentTypeChange = (payload) => {
@@ -295,21 +418,45 @@ var ToCPay = (props, ref) => {
     }
   }, [state.payGroup]);
   const payCallback = async (res) => {
-    var _a2;
-    if (res.key === "cancel") {
+    var _a2, _b2, _c2, _d2;
+    const orderId = ((_a2 = res == null ? void 0 : res.data) == null ? void 0 : _a2.order_id) || ((_b2 = state.payGroup) == null ? void 0 : _b2.order_id);
+    if (res.key === "success") {
+      paymentLogger.addLog({
+        key: "支付最终成功",
+        value: `订单${orderId} 支付成功`
+      });
+      paymentLogger.sendLogs("支付成功");
+    } else if (res.key === "fail") {
+      paymentLogger.addLog({
+        key: "支付最终失败",
+        value: {
+          title: `订单${orderId} 支付失败`,
+          data: res == null ? void 0 : res.data
+        }
+      });
+      paymentLogger.sendLogs("支付失败", (_c2 = res == null ? void 0 : res.data) == null ? void 0 : _c2.err);
+    } else if (res.key === "cancel") {
+      paymentLogger.addLog({
+        key: "支付被取消",
+        value: `订单${orderId} 支付被取消`
+      });
       setOpen(false);
     }
-    (_a2 = props.callback) == null ? void 0 : _a2.call(props, res);
+    (_d2 = props.callback) == null ? void 0 : _d2.call(props, res);
   };
   const onCancel = () => {
-    var _a2, _b2;
-    (0, import_payGroup.removePayGroupFromStorage)((_a2 = state.payGroup) == null ? void 0 : _a2.order_id);
+    var _a2, _b2, _c2;
+    paymentLogger.addLog({
+      key: "用户主动取消支付",
+      value: `订单${(_a2 = state.payGroup) == null ? void 0 : _a2.order_id} 用户取消支付`
+    });
+    (0, import_payGroup.removePayGroupFromStorage)((_b2 = state.payGroup) == null ? void 0 : _b2.order_id);
     setShowInformation(false);
     setOpen(false);
     payCallback({
       key: "cancel",
       data: {
-        order_id: (_b2 = state.payGroup) == null ? void 0 : _b2.order_id
+        order_id: (_c2 = state.payGroup) == null ? void 0 : _c2.order_id
       }
     });
   };
@@ -318,7 +465,7 @@ var ToCPay = (props, ref) => {
     (_b2 = paymentListRef.current) == null ? void 0 : _b2.calculateSurcharge(
       ((_a2 = state.payGroup) == null ? void 0 : _a2.wait_amount) || 0
     );
-  }, [(_o = state.payGroup) == null ? void 0 : _o.wait_amount]);
+  }, [(_p = state.payGroup) == null ? void 0 : _p.wait_amount]);
   (0, import_react.useImperativeHandle)(ref, () => {
     return {
       init,
@@ -432,9 +579,9 @@ var ToCPay = (props, ref) => {
         loading,
         mask: true
       },
-      ((_p = state.order) == null ? void 0 : _p.countdown) && /* @__PURE__ */ import_react.default.createElement(import_PayCountdown.default, { time: (_q = state.order) == null ? void 0 : _q.countdown }),
-      /* @__PURE__ */ import_react.default.createElement(import_PayAmount.default, { amount: ((_r = state.payGroup) == null ? void 0 : _r.total_amount) || 0 }),
-      ((_s = state.payGroup) == null ? void 0 : _s.walletPass) && /* @__PURE__ */ import_react.default.createElement(
+      ((_q = state.order) == null ? void 0 : _q.countdown) && /* @__PURE__ */ import_react.default.createElement(import_PayCountdown.default, { time: (_r = state.order) == null ? void 0 : _r.countdown }),
+      /* @__PURE__ */ import_react.default.createElement(import_PayAmount.default, { amount: ((_s = state.payGroup) == null ? void 0 : _s.total_amount) || 0 }),
+      ((_t = state.payGroup) == null ? void 0 : _t.walletPass) && /* @__PURE__ */ import_react.default.createElement(
         import_WalletPassBlock.default,
         {
           customer_id,
@@ -452,7 +599,7 @@ var ToCPay = (props, ref) => {
             handlePaymentByType(detail == null ? void 0 : detail.service);
           },
           paymentTypeChange,
-          hide: ((_t = state.payGroup) == null ? void 0 : _t.wait_amount) == 0,
+          hide: ((_u = state.payGroup) == null ? void 0 : _u.wait_amount) == 0,
           renderTitle: renderPaymentListTitle
         }
       )