@pisell/private-materials 6.2.50 → 6.2.52

package/lib/components/pay/toC/PaymentMethods/CashManual/index.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/pay/toC/PaymentMethods/CashManual/index.tsx
@@ -26,23 +36,71 @@ var import_react = require("react");
 var import_serve = require("./serve");
 var import_model = require("../../model");
 var import_payGroup = require("../../payGroup");
+var import_usePaymentLogger = __toESM(require("../../../../../hooks/usePaymentLogger"));
 var import_index = require("./index.less");
 var CashManual = (props, ref) => {
+  var _a;
   const { state } = (0, import_react.useContext)(import_model.Context);
+  const paymentLogger = (0, import_usePaymentLogger.default)({
+    orderId: ((_a = state.payGroup) == null ? void 0 : _a.order_id) || "unknown",
+    step: "2"
+  });
   const init = async ({ payGroup }) => {
-    var _a, _b;
-    let current = ((_a = state.payGroup) == null ? void 0 : _a.otherPayment) || {};
+    var _a2, _b;
+    paymentLogger.addLog({
+      key: "CashManual初始化开始",
+      value: ""
+    });
+    let current = ((_a2 = state.payGroup) == null ? void 0 : _a2.otherPayment) || {};
     const orderId = (payGroup == null ? void 0 : payGroup.order_id) || ((_b = state.payGroup) == null ? void 0 : _b.order_id);
     const values = (0, import_payGroup.getPayGroupParamsFromStorage)(orderId);
+    if (!values) {
+      paymentLogger.addLog({
+        key: "CashManual获取支付参数失败",
+        value: {
+          title: `订单${orderId} 未找到存储的支付参数`,
+          data: {
+            payGroup
+          }
+        }
+      });
+      paymentLogger.sendLogs("CashManual获取支付参数失败");
+      return;
+    }
+    paymentLogger.addLog({
+      key: "CashManual获取支付参数成功",
+      value: ""
+    });
     try {
+      paymentLogger.addLog({
+        key: "CashManual开始支付API调用",
+        value: ""
+      });
       await (0, import_serve.customPaymentApi)(orderId, {
         params: current.params,
         ...values
       });
+      paymentLogger.addLog({
+        key: "CashManual支付API调用成功",
+        value: ""
+      });
+      paymentLogger.sendLogs("CashManual支付成功");
       state.payCallback({
         key: "success"
       });
     } catch (err) {
+      paymentLogger.addLog({
+        key: "CashManual支付错误",
+        value: {
+          title: `订单${orderId} CashManual支付失败: ${(err == null ? void 0 : err.message) || "未知错误"}`,
+          data: {
+            payGroup,
+            current,
+            values
+          }
+        }
+      });
+      paymentLogger.sendLogs("CashManual支付失败", err);
     }
   };
   (0, import_react.useImperativeHandle)(

package/lib/components/pay/toC/PaymentMethods/CustomPayment/index.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/pay/toC/PaymentMethods/CustomPayment/index.tsx
@@ -26,23 +36,71 @@ var import_react = require("react");
 var import_serve = require("./serve");
 var import_model = require("../../model");
 var import_payGroup = require("../../payGroup");
+var import_usePaymentLogger = __toESM(require("../../../../../hooks/usePaymentLogger"));
 var import_index = require("./index.less");
 var CustomPayment = (props, ref) => {
+  var _a;
   const { state } = (0, import_react.useContext)(import_model.Context);
+  const paymentLogger = (0, import_usePaymentLogger.default)({
+    orderId: ((_a = state.payGroup) == null ? void 0 : _a.order_id) || "unknown",
+    step: "2"
+  });
   const init = async ({ payGroup }) => {
-    var _a, _b;
-    let current = ((_a = state.payGroup) == null ? void 0 : _a.otherPayment) || {};
+    var _a2, _b;
+    paymentLogger.addLog({
+      key: "CustomPayment初始化开始",
+      value: ""
+    });
+    let current = ((_a2 = state.payGroup) == null ? void 0 : _a2.otherPayment) || {};
     const orderId = (payGroup == null ? void 0 : payGroup.order_id) || ((_b = state.payGroup) == null ? void 0 : _b.order_id);
     const values = (0, import_payGroup.getPayGroupParamsFromStorage)(orderId);
+    if (!values) {
+      paymentLogger.addLog({
+        key: "CustomPayment获取支付参数失败",
+        value: {
+          title: `订单${orderId} 未找到存储的支付参数`,
+          data: {
+            payGroup
+          }
+        }
+      });
+      paymentLogger.sendLogs("CustomPayment获取支付参数失败");
+      return;
+    }
+    paymentLogger.addLog({
+      key: "CustomPayment获取支付参数成功",
+      value: ""
+    });
     try {
+      paymentLogger.addLog({
+        key: "CustomPayment开始支付API调用",
+        value: ""
+      });
       await (0, import_serve.customPaymentApi)(orderId, {
         params: current.params,
         ...values
       });
+      paymentLogger.addLog({
+        key: "CustomPayment支付API调用成功",
+        value: ""
+      });
+      paymentLogger.sendLogs("CustomPayment支付成功");
       state.payCallback({
         key: "success"
       });
     } catch (err) {
+      paymentLogger.addLog({
+        key: "CustomPayment支付错误",
+        value: {
+          title: `订单${orderId} CustomPayment支付失败: ${(err == null ? void 0 : err.message) || "未知错误"}`,
+          data: {
+            payGroup,
+            current,
+            values
+          }
+        }
+      });
+      paymentLogger.sendLogs("CustomPayment支付失败", err);
     }
   };
   (0, import_react.useImperativeHandle)(

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

@@ -39,30 +39,89 @@ var import_ThreedsLoading = __toESM(require("../MWCreditCard/TDSPay/ThreedsLoadi
 var import_serve = require("./serve");
 var import_model = require("../../model");
 var import_payGroup = require("../../payGroup");
+var import_usePaymentLogger = __toESM(require("../../../../../hooks/usePaymentLogger"));
 var import_index = require("./index.less");
 var GlobePayAliPayH5 = (props, ref) => {
+  var _a;
   const { state } = (0, import_react.useContext)(import_model.Context);
   const { onChange } = props;
   const [open, setOpen] = (0, import_react.useState)(false);
   const [showSuccessBackButton, setShowSuccessBackButton] = (0, import_react.useState)(false);
+  const paymentLogger = (0, import_usePaymentLogger.default)({
+    orderId: ((_a = state.payGroup) == null ? void 0 : _a.order_id) || "unknown",
+    step: "2"
+  });
   const init = async ({ payGroup }) => {
+    paymentLogger.addLog({
+      key: "GlobePayAliPayH5初始化开始",
+      value: ""
+    });
     setOpen(true);
     const values = (0, import_payGroup.getPayGroupParamsFromStorage)(payGroup.order_id);
     if (!values) {
+      paymentLogger.addLog({
+        key: "GlobePayAliPayH5获取支付参数失败",
+        value: {
+          title: `订单${payGroup == null ? void 0 : payGroup.order_id} 未找到存储的支付参数`,
+          data: {
+            payGroup
+          }
+        }
+      });
+      paymentLogger.sendLogs("GlobePayAliPayH5获取支付参数失败");
       setOpen(false);
       return;
     }
+    paymentLogger.addLog({
+      key: "GlobePayAliPayH5获取支付参数成功",
+      value: ""
+    });
     try {
+      paymentLogger.addLog({
+        key: "GlobePayAliPayH5开始获取支付链接",
+        value: ""
+      });
       const data = await (0, import_serve.getAliPayUrl)(payGroup.order_id, values);
       const url = data.url || (data == null ? void 0 : data.pay_url);
       if (url) {
+        paymentLogger.addLog({
+          key: "GlobePayAliPayH5获取支付链接成功",
+          value: ""
+        });
         (0, import_payGroup.setPayNumber)(payGroup == null ? void 0 : payGroup.order_id, data == null ? void 0 : data.pay_number);
+        paymentLogger.addLog({
+          key: "GlobePayAliPayH5准备跳转支付宝",
+          value: ""
+        });
         setShowSuccessBackButton(true);
+        paymentLogger.sendLogs("GlobePayAliPayH5跳转成功");
         window.location.href = url;
       } else {
+        paymentLogger.addLog({
+          key: "GlobePayAliPayH5未获取到支付链接",
+          value: {
+            title: `订单${payGroup == null ? void 0 : payGroup.order_id} 未获取到有效的支付链接`,
+            data: {
+              payGroup,
+              response: data
+            }
+          }
+        });
+        paymentLogger.sendLogs("GlobePayAliPayH5未获取到支付链接");
         setOpen(false);
       }
     } catch (err) {
+      paymentLogger.addLog({
+        key: "GlobePayAliPayH5处理错误",
+        value: {
+          title: `订单${payGroup == null ? void 0 : payGroup.order_id} GlobePayAliPayH5处理失败: ${(err == null ? void 0 : err.message) || "未知错误"}`,
+          data: {
+            payGroup,
+            values
+          }
+        }
+      });
+      paymentLogger.sendLogs("GlobePayAliPayH5处理失败", err);
       setOpen(false);
     }
   };
@@ -73,8 +132,13 @@ var GlobePayAliPayH5 = (props, ref) => {
     })
   );
   const handleSuccessBack = () => {
-    var _a;
-    (_a = state.payCallback) == null ? void 0 : _a.call(state, {
+    var _a2;
+    paymentLogger.addLog({
+      key: "GlobePayAliPayH5用户确认支付成功",
+      value: ""
+    });
+    paymentLogger.sendLogs("GlobePayAliPayH5支付成功");
+    (_a2 = state.payCallback) == null ? void 0 : _a2.call(state, {
       key: "success"
     });
   };

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

@@ -37,28 +37,89 @@ var import_materials = require("@pisell/materials");
 var import_utils = require("@pisell/utils");
 var import_ThreedsLoading = __toESM(require("../MWCreditCard/TDSPay/ThreedsLoading"));
 var import_serve = require("./serve");
+var import_model = require("../../model");
 var import_payGroup = require("../../payGroup");
+var import_usePaymentLogger = __toESM(require("../../../../../hooks/usePaymentLogger"));
 var import_index = require("./index.less");
 var GlobePayPaypalH5 = (props, ref) => {
+  var _a;
+  const { state } = (0, import_react.useContext)(import_model.Context);
   const { onChange } = props;
   const [open, setOpen] = (0, import_react.useState)(false);
+  const paymentLogger = (0, import_usePaymentLogger.default)({
+    orderId: ((_a = state.payGroup) == null ? void 0 : _a.order_id) || "unknown",
+    step: "2"
+  });
   const init = async ({ payGroup }) => {
+    paymentLogger.addLog({
+      key: "GlobePayPaypalH5初始化开始",
+      value: ""
+    });
     setOpen(true);
     const values = (0, import_payGroup.getPayGroupParamsFromStorage)(payGroup.order_id);
     if (!values) {
+      paymentLogger.addLog({
+        key: "GlobePayPaypalH5获取支付参数失败",
+        value: {
+          title: `订单${payGroup == null ? void 0 : payGroup.order_id} 未找到存储的支付参数`,
+          data: {
+            payGroup
+          }
+        }
+      });
+      paymentLogger.sendLogs("GlobePayPaypalH5获取支付参数失败");
       setOpen(false);
       return;
     }
+    paymentLogger.addLog({
+      key: "GlobePayPaypalH5获取支付参数成功",
+      value: ""
+    });
     try {
+      paymentLogger.addLog({
+        key: "GlobePayPaypalH5开始获取支付链接",
+        value: ""
+      });
       const data = await (0, import_serve.getAliPayUrl)(payGroup.order_id, values);
       const url = data.url || (data == null ? void 0 : data.pay_url);
       if (url) {
+        paymentLogger.addLog({
+          key: "GlobePayPaypalH5获取支付链接成功",
+          value: ""
+        });
         (0, import_payGroup.setPayNumber)(payGroup == null ? void 0 : payGroup.order_id, data == null ? void 0 : data.pay_number);
+        paymentLogger.addLog({
+          key: "GlobePayPaypalH5准备跳转Paypal",
+          value: ""
+        });
+        paymentLogger.sendLogs("GlobePayPaypalH5跳转成功");
         window.location.href = url;
       } else {
+        paymentLogger.addLog({
+          key: "GlobePayPaypalH5未获取到支付链接",
+          value: {
+            title: `订单${payGroup == null ? void 0 : payGroup.order_id} 未获取到有效的支付链接`,
+            data: {
+              payGroup,
+              response: data
+            }
+          }
+        });
+        paymentLogger.sendLogs("GlobePayPaypalH5未获取到支付链接");
         setOpen(false);
       }
     } catch (err) {
+      paymentLogger.addLog({
+        key: "GlobePayPaypalH5处理错误",
+        value: {
+          title: `订单${payGroup == null ? void 0 : payGroup.order_id} GlobePayPaypalH5处理失败: ${(err == null ? void 0 : err.message) || "未知错误"}`,
+          data: {
+            payGroup,
+            values
+          }
+        }
+      });
+      paymentLogger.sendLogs("GlobePayPaypalH5处理失败", err);
       setOpen(false);
     }
   };

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

@@ -35,19 +35,48 @@ module.exports = __toCommonJS(GlobePayQrcode_exports);
 var import_react = require("react");
 var import_model = require("../../model");
 var import_useEngineContext = __toESM(require("../../../../../hooks/useEngineContext"));
+var import_usePaymentLogger = __toESM(require("../../../../../hooks/usePaymentLogger"));
 var import_index = require("./index.less");
 var GlobePayQrcode = (props, ref) => {
+  var _a;
   const { state } = (0, import_react.useContext)(import_model.Context);
   const context = (0, import_useEngineContext.default)();
+  const paymentLogger = (0, import_usePaymentLogger.default)({
+    orderId: ((_a = state.payGroup) == null ? void 0 : _a.order_id) || "unknown",
+    step: "2"
+  });
   const init = async ({ payGroup }) => {
+    paymentLogger.addLog({
+      key: "GlobePayQrcode初始化开始",
+      value: ""
+    });
     try {
       let _item = payGroup == null ? void 0 : payGroup.otherPayment;
+      paymentLogger.addLog({
+        key: "GlobePayQrcode获取支付配置",
+        value: ""
+      });
+      paymentLogger.addLog({
+        key: "GlobePayQrcode准备回调",
+        value: ""
+      });
+      paymentLogger.sendLogs("GlobePayQrcode处理成功");
       state.payCallback({
         key: _item.service,
         data: payGroup
       });
       return;
     } catch (err) {
+      paymentLogger.addLog({
+        key: "GlobePayQrcode处理错误",
+        value: {
+          title: `订单${payGroup == null ? void 0 : payGroup.order_id} GlobePayQrcode处理失败: ${(err == null ? void 0 : err.message) || "未知错误"}`,
+          data: {
+            payGroup
+          }
+        }
+      });
+      paymentLogger.sendLogs("GlobePayQrcode处理失败", err);
     }
   };
   (0, import_react.useImperativeHandle)(

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

@@ -37,28 +37,89 @@ var import_materials = require("@pisell/materials");
 var import_utils = require("@pisell/utils");
 var import_ThreedsLoading = __toESM(require("../MWCreditCard/TDSPay/ThreedsLoading"));
 var import_serve = require("./serve");
+var import_model = require("../../model");
 var import_payGroup = require("../../payGroup");
+var import_usePaymentLogger = __toESM(require("../../../../../hooks/usePaymentLogger"));
 var import_index = require("./index.less");
 var GlobePayWxH5 = (props, ref) => {
+  var _a;
+  const { state } = (0, import_react.useContext)(import_model.Context);
   const { onChange } = props;
   const [open, setOpen] = (0, import_react.useState)(false);
+  const paymentLogger = (0, import_usePaymentLogger.default)({
+    orderId: ((_a = state.payGroup) == null ? void 0 : _a.order_id) || "unknown",
+    step: "2"
+  });
   const init = async ({ payGroup }) => {
+    paymentLogger.addLog({
+      key: "GlobePayWxH5初始化开始",
+      value: ""
+    });
     setOpen(true);
     const values = (0, import_payGroup.getPayGroupParamsFromStorage)(payGroup.order_id);
     if (!values) {
+      paymentLogger.addLog({
+        key: "GlobePayWxH5获取支付参数失败",
+        value: {
+          title: `订单${payGroup == null ? void 0 : payGroup.order_id} 未找到存储的支付参数`,
+          data: {
+            payGroup
+          }
+        }
+      });
+      paymentLogger.sendLogs("GlobePayWxH5获取支付参数失败");
       setOpen(false);
       return;
     }
+    paymentLogger.addLog({
+      key: "GlobePayWxH5获取支付参数成功",
+      value: ""
+    });
     try {
+      paymentLogger.addLog({
+        key: "GlobePayWxH5开始获取支付链接",
+        value: ""
+      });
       const data = await (0, import_serve.getAliPayUrl)(payGroup.order_id, values);
       const url = data.url || (data == null ? void 0 : data.pay_url);
       if (url) {
+        paymentLogger.addLog({
+          key: "GlobePayWxH5获取支付链接成功",
+          value: ""
+        });
         (0, import_payGroup.setPayNumber)(payGroup == null ? void 0 : payGroup.order_id, data == null ? void 0 : data.pay_number);
+        paymentLogger.addLog({
+          key: "GlobePayWxH5准备跳转微信",
+          value: ""
+        });
+        paymentLogger.sendLogs("GlobePayWxH5跳转成功");
         window.location.href = url;
       } else {
+        paymentLogger.addLog({
+          key: "GlobePayWxH5未获取到支付链接",
+          value: {
+            title: `订单${payGroup == null ? void 0 : payGroup.order_id} 未获取到有效的支付链接`,
+            data: {
+              payGroup,
+              response: data
+            }
+          }
+        });
+        paymentLogger.sendLogs("GlobePayWxH5未获取到支付链接");
         setOpen(false);
       }
     } catch (err) {
+      paymentLogger.addLog({
+        key: "GlobePayWxH5处理错误",
+        value: {
+          title: `订单${payGroup == null ? void 0 : payGroup.order_id} GlobePayWxH5处理失败: ${(err == null ? void 0 : err.message) || "未知错误"}`,
+          data: {
+            payGroup,
+            values
+          }
+        }
+      });
+      paymentLogger.sendLogs("GlobePayWxH5处理失败", err);
       setOpen(false);
     }
   };

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

@@ -39,27 +39,66 @@ var import_ThreedsLoading = __toESM(require("../MWCreditCard/TDSPay/ThreedsLoadi
 var import_model = require("../../model");
 var import_payGroup = require("../../payGroup");
 var import_useEngineContext = __toESM(require("../../../../../hooks/useEngineContext"));
+var import_usePaymentLogger = __toESM(require("../../../../../hooks/usePaymentLogger"));
 var import_utils2 = require("../../utils");
+var import_hooks = require("../hooks");
+var import_PaymentReturnContent = __toESM(require("../components/PaymentReturnContent"));
 var GooglePay = (props, ref) => {
-  var _a, _b;
+  var _a, _b, _c, _d, _e;
   const { state } = (0, import_react.useContext)(import_model.Context);
   const [open, setOpen] = (0, import_react.useState)(false);
   const context = (0, import_useEngineContext.default)();
   const { config } = ((_a = context.appHelper) == null ? void 0 : _a.constants) || {};
   const { interaction } = (_b = context.appHelper) == null ? void 0 : _b.utils;
+  const paymentLogger = (0, import_usePaymentLogger.default)({
+    orderId: ((_c = state.payGroup) == null ? void 0 : _c.order_id) || "unknown",
+    step: "2"
+  });
+  const { isReturned, handleRedirect, resetState } = (0, import_hooks.usePaymentRedirect)({
+    orderId: (_d = state.payGroup) == null ? void 0 : _d.order_id,
+    paymentType: "googlePay"
+  });
   const init = async ({ payGroup }) => {
-    var _a2, _b2, _c, _d, _e, _f, _g, _h, _i, _j, _k;
+    var _a2, _b2, _c2, _d2, _e2, _f, _g, _h, _i, _j, _k;
+    paymentLogger.addLog({
+      key: "GooglePay初始化开始",
+      value: ""
+    });
+    setOpen(true);
     const utils = context.appHelper.utils || {};
     const dvaStore = (_b2 = (_a2 = utils == null ? void 0 : utils.getStore) == null ? void 0 : _a2.call(utils)) == null ? void 0 : _b2.getState();
     const values = (0, import_payGroup.getPayGroupParamsFromStorage)(payGroup.order_id);
-    if (((_d = (_c = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _c.isAppEnv) == null ? void 0 : _d.call(_c)) && ((_f = (_e = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _e.isAndroid_ios) == null ? void 0 : _f.call(_e)) === "android") {
-      return (0, import_utils2.clientPayment)({ order_id: payGroup.order_id, type: "google_pay", values, interaction });
-    }
-    setOpen(true);
     if (!values) {
+      paymentLogger.addLog({
+        key: "GooglePay获取支付参数失败",
+        value: {
+          title: `订单${payGroup == null ? void 0 : payGroup.order_id} 未找到存储的支付参数`,
+          data: {
+            payGroup
+          }
+        }
+      });
+      paymentLogger.sendLogs("GooglePay获取支付参数失败");
       setOpen(false);
       return;
     }
+    paymentLogger.addLog({
+      key: "GooglePay获取支付参数成功",
+      value: ""
+    });
+    if (((_d2 = (_c2 = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _c2.isAppEnv) == null ? void 0 : _d2.call(_c2)) && ((_f = (_e2 = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _e2.isAndroid_ios) == null ? void 0 : _f.call(_e2)) === "android") {
+      paymentLogger.addLog({
+        key: "GooglePay使用Android客户端支付",
+        value: ""
+      });
+      paymentLogger.sendLogs("GooglePay客户端支付");
+      return (0, import_utils2.clientPayment)({
+        order_id: payGroup.order_id,
+        type: "google_pay",
+        values,
+        interaction
+      });
+    }
     try {
       const locale = ((_g = dvaStore.core) == null ? void 0 : _g.translateLocale) || "en";
       const shopId = (_j = (_i = (_h = dvaStore.core) == null ? void 0 : _h.core) == null ? void 0 : _i.shop) == null ? void 0 : _j.id;
@@ -68,11 +107,27 @@ var GooglePay = (props, ref) => {
       linkElement.href = currentURL;
       const shop_domain = linkElement.hostname;
       const _href = `${config.pay}${(0, import_utils2.formatFranchiseeRoute)(
-        `/google-pay?order_id=${(_k = state.payGroup) == null ? void 0 : _k.order_id}&shop_id=${shopId}&locale=${locale}&shop_domain=${shop_domain}&total_amount=${values.amount}&payment_group_id=${values.payment_group_id}`,
+        `/google-pay?order_id=${(_k = state.payGroup) == null ? void 0 : _k.order_id}&shop_id=${shopId}&locale=${locale}&shop_domain=${shop_domain}&total_amount=${values.amount}&payment_group_id=${values.payment_group_id}&front_order_uuid=${state.front_order_uuid}&is_replace_router=1`,
         state.history
       )}`;
-      window.location.href = _href;
+      paymentLogger.addLog({
+        key: "GooglePay准备跳转",
+        value: ""
+      });
+      paymentLogger.sendLogs("GooglePay跳转成功");
+      await handleRedirect(_href);
     } catch (err) {
+      paymentLogger.addLog({
+        key: "GooglePay处理错误",
+        value: {
+          title: `订单${payGroup == null ? void 0 : payGroup.order_id} GooglePay处理失败: ${(err == null ? void 0 : err.message) || "未知错误"}`,
+          data: {
+            payGroup,
+            values
+          }
+        }
+      });
+      paymentLogger.sendLogs("GooglePay处理失败", err);
       setOpen(false);
     }
   };
@@ -82,6 +137,10 @@ var GooglePay = (props, ref) => {
       init
     })
   );
+  const handleReturn = () => {
+    setOpen(false);
+    resetState();
+  };
   return /* @__PURE__ */ import_react.default.createElement(
     import_materials.PisellModal,
     {
@@ -92,11 +151,20 @@ var GooglePay = (props, ref) => {
       closable: false,
       bodyStyle: { padding: 0 }
     },
-    /* @__PURE__ */ import_react.default.createElement("div", { className: "" }, /* @__PURE__ */ import_react.default.createElement(
+    /* @__PURE__ */ import_react.default.createElement("div", { className: "" }, !isReturned && /* @__PURE__ */ import_react.default.createElement(
       import_ThreedsLoading.default,
       {
         title: import_utils.locales.getText("tocPay.text.connectingGooglePay")
       }
+    ), isReturned && // 跳转后返回时展示新组件内容
+    /* @__PURE__ */ import_react.default.createElement(
+      import_PaymentReturnContent.default,
+      {
+        handleReturn,
+        state,
+        orderId: (_e = state.payGroup) == null ? void 0 : _e.order_id,
+        unique_payment_number: state.front_order_uuid
+      }
     ))
   );
 };