@pisell/private-materials 3.4.88 → 3.4.90

package/lib/components/pay/toC/PaymentMethods/MWCreditCard/components/TDSErrorModal/index.js

@@ -0,0 +1,107 @@
+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/MWCreditCard/components/TDSErrorModal/index.tsx
+var TDSErrorModal_exports = {};
+__export(TDSErrorModal_exports, {
+  default: () => TDSErrorModal_default
+});
+module.exports = __toCommonJS(TDSErrorModal_exports);
+var import_react = __toESM(require("react"));
+var import_antd = require("antd");
+var import_materials = require("@pisell/materials");
+var import_utils = require("@pisell/utils");
+var import_index = require("./index.less");
+var TEXT_KEY_MAP = {
+  /** 预检查：卡不支持 3DS 验证 */
+  "tds-not-supported": {
+    title: "tocPay.text.tdsErrorTitle",
+    desc: "tocPay.text.tdsErrorDesc"
+  },
+  /** 支付中：银行安全验证失败（700500） */
+  "bank-verify-failed": {
+    title: "tocPay.text.bankVerifyFailedTitle",
+    desc: "tocPay.text.bankVerifyFailedDesc"
+  }
+};
+var TDSErrorModal = ({
+  open,
+  type = "tds-not-supported",
+  shopPhone,
+  shopEmail,
+  onUseAnotherCard,
+  onUseAnotherPayment,
+  onPayLater
+}) => {
+  const showContact = !!(shopPhone || shopEmail);
+  const textKeys = (0, import_react.useMemo)(() => TEXT_KEY_MAP[type], [type]);
+  return /* @__PURE__ */ import_react.default.createElement(
+    import_materials.PisellModal,
+    {
+      open,
+      closable: false,
+      footer: null,
+      header: false,
+      mobileModalHeight: "auto",
+      headerDivider: false,
+      footerDivider: false,
+      bodyStyle: { padding: 24 },
+      transitionName: "pisell-move-down"
+    },
+    /* @__PURE__ */ import_react.default.createElement("div", { className: "tds-error-modal" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "tds-error-modal-title" }, import_utils.locales.getText(textKeys.title)), /* @__PURE__ */ import_react.default.createElement("div", { className: "tds-error-modal-desc" }, import_utils.locales.getText(textKeys.desc)), /* @__PURE__ */ import_react.default.createElement("div", { className: "tds-error-modal-actions" }, /* @__PURE__ */ import_react.default.createElement(
+      import_antd.Button,
+      {
+        type: "primary",
+        block: true,
+        className: "tds-error-modal-btn-primary",
+        onClick: onUseAnotherCard
+      },
+      import_utils.locales.getText("tocPay.text.useAnotherCard")
+    ), /* @__PURE__ */ import_react.default.createElement(
+      import_antd.Button,
+      {
+        block: true,
+        className: "tds-error-modal-btn-secondary",
+        onClick: onUseAnotherPayment
+      },
+      import_utils.locales.getText("tocPay.text.useAnotherPayment")
+    ), /* @__PURE__ */ import_react.default.createElement(
+      import_antd.Button,
+      {
+        block: true,
+        className: "tds-error-modal-btn-secondary",
+        onClick: onPayLater
+      },
+      import_utils.locales.getText("tocPay.text.payLater")
+    )), showContact && /* @__PURE__ */ import_react.default.createElement("div", { className: "tds-error-modal-contact" }, import_utils.locales.getText("tocPay.text.paymentTroubleContact")(
+      shopPhone || "",
+      shopEmail || ""
+    )))
+  );
+};
+var TDSErrorModal_default = TDSErrorModal;

package/lib/components/pay/toC/PaymentMethods/MWCreditCard/components/TDSErrorModal/index.less

@@ -0,0 +1,52 @@
+.tds-error-modal {
+  display: flex;
+  flex-direction: column;
+  gap: 0;
+}
+
+.tds-error-modal-title {
+  color: var(--Gray-900, #101828);
+  font-size: 20px;
+  font-weight: 600;
+  line-height: 28px;
+  margin-bottom: 8px;
+}
+
+.tds-error-modal-desc {
+  color: var(--Gray-600, #475467);
+  font-size: 14px;
+  font-weight: 400;
+  line-height: 20px;
+  margin-bottom: 24px;
+  white-space: pre-line;
+}
+
+.tds-error-modal-actions {
+  display: flex;
+  flex-direction: column;
+  gap: 12px;
+  margin-bottom: 16px;
+}
+
+.tds-error-modal-btn-primary {
+  font-size: 16px;
+  font-weight: 500;
+  border-radius: 8px;
+}
+
+.tds-error-modal-btn-secondary {
+  font-size: 16px;
+  font-weight: 500;
+  border-radius: 8px;
+}
+
+.tds-error-modal-contact {
+  color: var(--Gray-500, #667085);
+  font-size: 12px;
+  font-weight: 400;
+  line-height: 18px;
+  text-align: center;
+  padding-top: 8px;
+  border-top: 1px solid var(--Gray-200, #eaecf0);
+  word-break: break-word;
+}

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

@@ -1,7 +1,15 @@
 import React from 'react';
 import './index.less';
+interface MWCreditCardProps {
+    /** 店铺名称，用于授权说明文案 */
+    shopName?: string;
+    /** 商家联系电话（用于 3DS 错误弹窗联系方式） */
+    shopPhone?: string;
+    /** 商家联系邮箱（用于 3DS 错误弹窗联系方式） */
+    shopEmail?: string;
+}
 export interface MWCreditCardRef {
     init: (res: any) => void;
 }
-declare const _default: React.ForwardRefExoticComponent<Omit<any, "ref"> & React.RefAttributes<unknown>>;
+declare const _default: React.ForwardRefExoticComponent<MWCreditCardProps & React.RefAttributes<unknown>>;
 export default _default;

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

@@ -35,27 +35,148 @@ module.exports = __toCommonJS(MWCreditCard_exports);
 var import_react = __toESM(require("react"));
 var import_List = __toESM(require("./List"));
 var import_Add = __toESM(require("./Add"));
+var import_serve = require("./List/serve");
 var import_TDSPay = __toESM(require("./TDSPay"));
 var import_model = require("../../model");
+var import_tds2 = require("./tds2");
+var import_payGroup = require("../../payGroup");
+var import_utils = require("@pisell/utils");
+var import_materials = require("@pisell/materials");
+var import_TDSErrorModal = __toESM(require("./components/TDSErrorModal"));
 var import_index = require("./index.less");
+var import_useEngineContext = __toESM(require("../../../../../hooks/useEngineContext"));
 var MWCreditCard = (props, ref) => {
   const MWCreditCardListRef2 = (0, import_react.useRef)();
   const AddMWCreditCardRef2 = (0, import_react.useRef)();
   const TDSPayRef2 = (0, import_react.useRef)();
+  const context = (0, import_useEngineContext.default)();
+  const utils = context.appHelper.utils || {};
   const [order, setOrder] = (0, import_react.useState)(null);
+  const [tdsErrorVisible, setTdsErrorVisible] = (0, import_react.useState)(false);
+  const [bankVerifyFailVisible, setBankVerifyFailVisible] = (0, import_react.useState)(false);
+  const [loading, setLoading] = (0, import_react.useState)(false);
   const { state } = (0, import_react.useContext)(import_model.Context);
   const init = async (res) => {
     var _a;
     setOrder(res.order);
     (_a = MWCreditCardListRef2.current) == null ? void 0 : _a.init(order);
   };
+  const closeAll = () => {
+    var _a, _b;
+    (_a = MWCreditCardListRef2.current) == null ? void 0 : _a.close();
+    (_b = AddMWCreditCardRef2.current) == null ? void 0 : _b.close();
+  };
   const fastPay = async (card) => {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
+    try {
+      setLoading(true);
+      (_b = (_a = utils == null ? void 0 : utils.Toast) == null ? void 0 : _a.loading) == null ? void 0 : _b.call(_a, import_utils.locales.getText("tocPay.text.checkingCard"), 0, void 0, true);
+      const params = (0, import_payGroup.getPayGroupParamsFromStorage)(
+        (_c = state.payGroup) == null ? void 0 : _c.order_id,
+        { card_id: card.id }
+      );
+      if (!params) {
+        (_d = state.payCallback) == null ? void 0 : _d.call(state, {
+          key: "fail",
+          data: {
+            res: card,
+            fn: "MWCreditCard.fastPay.noParams",
+            message: import_utils.locales.getText("tocPay.text.getParamsFail")
+          }
+        });
+        return;
+      }
+      const { data } = await (0, import_serve.fastPayNew)({
+        order_id: (_e = state.payGroup) == null ? void 0 : _e.order_id,
+        params
+      });
+      (0, import_payGroup.setPayNumber)((_f = state.payGroup) == null ? void 0 : _f.order_id, data == null ? void 0 : data.pay_number);
+      if ((data == null ? void 0 : data.type) === "token") {
+        (_g = TDSPayRef2.current) == null ? void 0 : _g.init(card, order, data);
+        return;
+      }
+      if ((data == null ? void 0 : data.type) === "3ds") {
+        (_h = TDSPayRef2.current) == null ? void 0 : _h.init(card, order, data);
+        return;
+      }
+    } catch (e) {
+      if ((e == null ? void 0 : e.code) === 700500) {
+        setTdsErrorVisible(true);
+      } else {
+        (0, import_materials.PisellToast)({ content: (e == null ? void 0 : e.message) || "", duration: 2 });
+      }
+    } finally {
+      setLoading(false);
+      (_j = (_i = utils == null ? void 0 : utils.Toast) == null ? void 0 : _i.hide) == null ? void 0 : _j.call(_i);
+    }
+  };
+  const onCreate = async (res) => {
+    var _a, _b, _c, _d, _e, _f, _g, _h;
+    try {
+      setLoading(true);
+      (_b = (_a = utils == null ? void 0 : utils.Toast) == null ? void 0 : _a.loading) == null ? void 0 : _b.call(_a, import_utils.locales.getText("tocPay.text.checkingCard"), 0, void 0, true);
+      let _cardInfo = {
+        card_name: res.card_name,
+        card_number: res.card_number,
+        card_expiry_month: res.date.format("MM"),
+        card_expiry_year: res.date.format("YY"),
+        card_ccv: res.card_ccv,
+        is_save: res.is_save ? 1 : 0
+      };
+      _cardInfo = (0, import_payGroup.getPayGroupParamsFromStorage)(
+        (_c = state.payGroup) == null ? void 0 : _c.order_id,
+        _cardInfo
+      );
+      if (!_cardInfo) {
+        (_d = state.payCallback) == null ? void 0 : _d.call(state, {
+          key: "fail",
+          data: {
+            _cardInfo,
+            message: import_utils.locales.getText("tocPay.text.getParamsFail"),
+            fn: "MWCreditCard.onCreate.noCardInfo"
+          }
+        });
+        return;
+      }
+      const preCheckData = await (0, import_tds2.preCheckEnrollment)(
+        (_e = state.payGroup) == null ? void 0 : _e.order_id,
+        _cardInfo
+      );
+      (_f = TDSPayRef2.current) == null ? void 0 : _f.init(res, order, preCheckData);
+    } catch (e) {
+      if ((e == null ? void 0 : e.code) === 700500) {
+        setTdsErrorVisible(true);
+      } else {
+        (0, import_materials.PisellToast)({ content: (e == null ? void 0 : e.message) || "", duration: 2 });
+      }
+    } finally {
+      setLoading(false);
+      (_h = (_g = utils == null ? void 0 : utils.Toast) == null ? void 0 : _g.hide) == null ? void 0 : _h.call(_g);
+    }
+  };
+  const handleTDSPayChange = (res) => {
     var _a;
-    (_a = TDSPayRef2.current) == null ? void 0 : _a.init(card, order);
+    if ((res == null ? void 0 : res.key) === "bankVerifyFailed") {
+      setBankVerifyFailVisible(true);
+      return;
+    }
+    (_a = state.payCallback) == null ? void 0 : _a.call(state, res);
   };
-  const onCreate = (res) => {
+  const handleUseAnotherCard = () => {
+    setTdsErrorVisible(false);
+    setBankVerifyFailVisible(false);
+  };
+  const handleUseAnotherPayment = () => {
+    setTdsErrorVisible(false);
+    setBankVerifyFailVisible(false);
+    closeAll();
+  };
+  const handlePayLater = () => {
     var _a;
-    (_a = TDSPayRef2.current) == null ? void 0 : _a.init(res, order);
+    setTdsErrorVisible(false);
+    setBankVerifyFailVisible(false);
+    closeAll();
+    (_a = state.payCallback) == null ? void 0 : _a.call(state, { key: "cancel" });
   };
   (0, import_react.useImperativeHandle)(
     ref,
@@ -73,8 +194,31 @@ var MWCreditCard = (props, ref) => {
         var _a;
         (_a = AddMWCreditCardRef2.current) == null ? void 0 : _a.init();
       },
-      onChange: fastPay
+      onChange: fastPay,
+      btnLoading: loading
+    }
+  ), /* @__PURE__ */ import_react.default.createElement(import_Add.default, { ref: AddMWCreditCardRef2, onCreate, shopName: props.shopName, btnLoading: loading }), /* @__PURE__ */ import_react.default.createElement(import_TDSPay.default, { ref: TDSPayRef2, onChange: handleTDSPayChange, closeAll }), /* @__PURE__ */ import_react.default.createElement(
+    import_TDSErrorModal.default,
+    {
+      open: tdsErrorVisible,
+      type: "tds-not-supported",
+      shopPhone: props.shopPhone,
+      shopEmail: props.shopEmail,
+      onUseAnotherCard: handleUseAnotherCard,
+      onUseAnotherPayment: handleUseAnotherPayment,
+      onPayLater: handlePayLater
+    }
+  ), /* @__PURE__ */ import_react.default.createElement(
+    import_TDSErrorModal.default,
+    {
+      open: bankVerifyFailVisible,
+      type: "bank-verify-failed",
+      shopPhone: props.shopPhone,
+      shopEmail: props.shopEmail,
+      onUseAnotherCard: handleUseAnotherCard,
+      onUseAnotherPayment: handleUseAnotherPayment,
+      onPayLater: handlePayLater
     }
-  ), /* @__PURE__ */ import_react.default.createElement(import_Add.default, { ref: AddMWCreditCardRef2, onCreate }), /* @__PURE__ */ import_react.default.createElement(import_TDSPay.default, { ref: TDSPayRef2, onChange: state.payCallback }));
+  ));
 };
 var MWCreditCard_default = (0, import_react.forwardRef)(MWCreditCard);

package/lib/components/pay/toC/PaymentMethods/MWCreditCard/tds2.d.ts

@@ -1,3 +1,13 @@
+/**
+ * 取消当前支付流程中残留的 message 监听器和定时器，
+ * 并 reject 挂起的 Promise 使 startPayment 的 await 结束。
+ * reject 值为 0，startPayment catch 中 `if (err === 0) return` 会静默处理。
+ */
+export declare const cancelCurrentPayment: () => void;
+interface PaymentOptions {
+    callback?: (res: any) => void;
+    isCancelled?: () => boolean;
+}
 /**
  * @title: 点击支付
  * @description:
@@ -6,7 +16,16 @@
  * @Author: Wzw
  * @Date: 2022-10-22 10:05
  */
-export declare const startPayment: ({ orderId, cardInfo, payData }: any, callback?: any) => Promise<boolean | undefined>;
+export declare const startPayment: ({ orderId, cardInfo, payData }: any, options?: PaymentOptions) => Promise<boolean | undefined>;
+/**
+ * @title: 前置检查 - 提交卡信息到后端（预检查版本）
+ * @description: 与 checkEnrollment 调用相同 API，但不包含 Toast/callback/closeIframe 等副作用。
+ *              失败时直接 throw error，由调用方（MWCreditCard）捕获并展示 3DS 错误弹窗。
+ * @param {string} orderId 订单ID
+ * @param {any} cardInfo 卡信息
+ * @return {Promise<any>} 返回后端数据（含 pay_info），失败则 throw
+ */
+export declare const preCheckEnrollment: (orderId: string, cardInfo: any) => Promise<any>;
 /*******
  * @title: 步骤2
  * @description: 提交卡信息到后端
@@ -14,7 +33,7 @@ export declare const startPayment: ({ orderId, cardInfo, payData }: any, callbac
  * @Author: Wzw
  * @Date: 2022-10-18 10:26
  */
-export declare const checkEnrollment: (orderId: string, cardInfo: any, callback: any) => Promise<any>;
+export declare const checkEnrollment: (orderId: string, cardInfo: any, options?: PaymentOptions) => Promise<any>;
 /**
  * @title: 步骤3
  * @description: 创建iframe, 监听
@@ -32,7 +51,7 @@ export declare const createThreeDSMethodIframe: (threeDSMethodData: any, callbac
  * @Author: Wzw
  * @Date: 2022-10-18 10:43
  */
-export declare const checkTDSAuth: (step2: any, step3: any, callback?: any) => Promise<any>;
+export declare const checkTDSAuth: (step2: any, step3: any, options?: PaymentOptions) => Promise<any>;
 /**
  * @title: 步骤5
  * @description:  监听
@@ -59,3 +78,4 @@ export declare const checkPARes: (step2: any, step4: any, step5: any) => Promise
  * @Date: 2022-10-18 14:28
  */
 export declare const paymentEnd: (props: any, callback: any) => void;
+export {};

package/lib/components/pay/toC/PaymentMethods/MWCreditCard/tds2.js

@@ -29,12 +29,14 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/components/pay/toC/PaymentMethods/MWCreditCard/tds2.tsx
 var tds2_exports = {};
 __export(tds2_exports, {
+  cancelCurrentPayment: () => cancelCurrentPayment,
   checkEnrollment: () => checkEnrollment,
   checkPARes: () => checkPARes,
   checkTDSAuth: () => checkTDSAuth,
   createChallengeIframe: () => createChallengeIframe,
   createThreeDSMethodIframe: () => createThreeDSMethodIframe,
   paymentEnd: () => paymentEnd,
+  preCheckEnrollment: () => preCheckEnrollment,
   startPayment: () => startPayment
 });
 module.exports = __toCommonJS(tds2_exports);
@@ -43,6 +45,7 @@ var import_dayjs = __toESM(require("dayjs"));
 var import_utils2 = require("@pisell/utils");
 var import_materials = require("@pisell/materials");
 var import_payGroup = require("../../payGroup");
+var import_utils3 = require("../../utils");
 var { REACT_APP_API_ENV } = process.env;
 var paymentInfo = {
   transactionInfo: {
@@ -61,6 +64,11 @@ var paymentInfo = {
 };
 var paymentData = {};
 var postmessageUrl = "merchantwarrior";
+var activeCleanup = null;
+var cancelCurrentPayment = () => {
+  activeCleanup == null ? void 0 : activeCleanup();
+  activeCleanup = null;
+};
 var log = (data) => {
   let _template = {
     module,
@@ -84,7 +92,8 @@ var setHistoryLog = (log2) => {
 var getCurrentTime = () => {
   return (0, import_dayjs.default)().format("YYYY-MM-DD HH:mm:ss");
 };
-var startPayment = async ({ orderId, cardInfo, payData }, callback) => {
+var startPayment = async ({ orderId, cardInfo, payData }, options) => {
+  const { callback, isCancelled } = options || {};
   let paymentInfo2 = {
     amount: 0,
     order_id: 0
@@ -101,7 +110,11 @@ var startPayment = async ({ orderId, cardInfo, payData }, callback) => {
       payDataOrderId: payData == null ? void 0 : payData.order_id,
       payDataPayNumber: payData == null ? void 0 : payData.pay_number
     });
-    const step2 = payData ? payData : await checkEnrollment(orderId, cardInfo, callback);
+    const step2 = payData ? payData : await checkEnrollment(orderId, cardInfo, { callback, isCancelled });
+    if (isCancelled == null ? void 0 : isCancelled()) {
+      closeIframe();
+      return;
+    }
     setHistoryLog({
       msg: "步骤2完成: 提交卡信息到后端",
       time: getCurrentTime(),
@@ -119,6 +132,10 @@ var startPayment = async ({ orderId, cardInfo, payData }, callback) => {
       time: getCurrentTime()
     });
     let step3 = await createThreeDSMethodIframe(step2, callback);
+    if (isCancelled == null ? void 0 : isCancelled()) {
+      closeIframe();
+      return;
+    }
     paymentData.step3 = step3;
     setHistoryLog({
       msg: "步骤3完成: iframe监听结束",
@@ -134,7 +151,11 @@ var startPayment = async ({ orderId, cardInfo, payData }, callback) => {
       order_id: step2 == null ? void 0 : step2.order_id,
       pay_number: step2 == null ? void 0 : step2.pay_number
     });
-    const step4 = await checkTDSAuth(step2, step3, callback);
+    const step4 = await checkTDSAuth(step2, step3, { callback, isCancelled });
+    if (isCancelled == null ? void 0 : isCancelled()) {
+      closeIframe();
+      return;
+    }
     setHistoryLog({
       msg: "步骤4完成: checkTDSAuth 返回",
       time: getCurrentTime(),
@@ -150,6 +171,10 @@ var startPayment = async ({ orderId, cardInfo, payData }, callback) => {
         time: getCurrentTime()
       });
       const step5 = await createChallengeIframe(step4, callback);
+      if (isCancelled == null ? void 0 : isCancelled()) {
+        closeIframe();
+        return;
+      }
       paymentData.step5 = step5;
       setHistoryLog({
         msg: "步骤5完成: challenge iframe结束",
@@ -160,12 +185,20 @@ var startPayment = async ({ orderId, cardInfo, payData }, callback) => {
         time: getCurrentTime()
       });
       await checkPARes(step2, step4, step5);
+      if (isCancelled == null ? void 0 : isCancelled()) {
+        closeIframe();
+        return;
+      }
       setHistoryLog({
         msg: "步骤6完成: check_pares接口返回",
         time: getCurrentTime()
       });
     }
-    callback({ key: "hideModal" });
+    if (isCancelled == null ? void 0 : isCancelled()) {
+      closeIframe();
+      return;
+    }
+    callback == null ? void 0 : callback({ key: "hideModal" });
     setHistoryLog({
       msg: "支付成功",
       time: getCurrentTime()
@@ -183,11 +216,17 @@ var startPayment = async ({ orderId, cardInfo, payData }, callback) => {
     setHistoryLog({
       msg: "支付异常",
       time: getCurrentTime(),
-      error: err
+      error: err,
+      errorCode: err == null ? void 0 : err.code
     });
-    callback({ key: "hideModal" });
     closeIframe();
+    if (isCancelled == null ? void 0 : isCancelled()) return;
+    callback == null ? void 0 : callback({ key: "hideModal" });
     if (err === 0) return;
+    if ((err == null ? void 0 : err.code) === 700500) {
+      callback == null ? void 0 : callback({ key: "bankVerifyFailed" });
+      return false;
+    }
     paymentData.error = err;
     paymentEnd(
       {
@@ -199,11 +238,34 @@ var startPayment = async ({ orderId, cardInfo, payData }, callback) => {
     return false;
   }
 };
-var checkEnrollment = async (orderId, cardInfo, callback) => {
+var preCheckEnrollment = async (orderId, cardInfo) => {
+  try {
+    const { data } = await import_utils.request.getRequest().post("/h5/pay/order/mw-3ds-pay/v2/" + orderId, {
+      ...cardInfo
+    });
+    (0, import_payGroup.setPayNumber)(orderId, data == null ? void 0 : data.pay_number);
+    if (!(data == null ? void 0 : data.pay_info)) {
+      throw new Error("Card does not support 3DS verification");
+    }
+    return data;
+  } catch (err) {
+    log({
+      msg: err,
+      data: {
+        orderId,
+        cardInfo
+      }
+    });
+    throw err;
+  }
+};
+var checkEnrollment = async (orderId, cardInfo, options) => {
+  const { callback, isCancelled } = options || {};
   try {
     let { data } = await import_utils.request.getRequest().post("/h5/pay/order/mw-3ds-pay/v2/" + orderId, {
       ...cardInfo
     });
+    if (isCancelled == null ? void 0 : isCancelled()) return 0;
     (0, import_payGroup.setPayNumber)(orderId, data == null ? void 0 : data.pay_number);
     if (!(data == null ? void 0 : data.pay_info)) {
       return null;
@@ -217,7 +279,8 @@ var checkEnrollment = async (orderId, cardInfo, callback) => {
         cardInfo
       }
     });
-    callback({ key: "hideModal" });
+    if (isCancelled == null ? void 0 : isCancelled()) return 0;
+    callback == null ? void 0 : callback({ key: "hideModal" });
     closeIframe();
     (0, import_materials.PisellToast)({
       content: (err == null ? void 0 : err.message) || "",
@@ -291,9 +354,15 @@ var createThreeDSMethodIframe = async (threeDSMethodData, callback) => {
       });
     }, ((_a2 = threeDSMethodData == null ? void 0 : threeDSMethodData.pay_info) == null ? void 0 : _a2.tdsMethodTimeoutMS) || 1e4);
     window.addEventListener("message", handleMessage, false);
+    activeCleanup = () => {
+      window.removeEventListener("message", handleMessage);
+      if (timer) clearTimeout(timer);
+      rej(0);
+    };
   });
 };
-var checkTDSAuth = async (step2, step3, callback) => {
+var checkTDSAuth = async (step2, step3, options) => {
+  const { callback, isCancelled } = options || {};
   try {
     const { pay_number, order_id, pay_info, amount, notifyURL } = step2;
     const { threeDSServerTransID, threeDSCompInd } = step3;
@@ -302,15 +371,18 @@ var checkTDSAuth = async (step2, step3, callback) => {
     if (REACT_APP_API_ENV === "pre" && pay_info.check_tds_auth.card_name === "aa bb") {
       isPre = true;
     }
+    const request_unique_idempotency_token = (0, import_utils3.getUniqueIdempotencyToken)();
     setHistoryLog({
       msg: "步骤4开始: 调用tds_auth_pay接口",
       time: getCurrentTime(),
       order_id,
-      pay_number
+      pay_number,
+      request_unique_idempotency_token
     });
     let { data } = await import_utils.request.getRequest().post("/h5/pay/order/mw-3ds-pay/v2/tds_auth_pay", {
       order_id,
       pay_number,
+      request_unique_idempotency_token,
       mw_data: {
         accessToken: pay_info.check_tds_auth.access_token,
         method: "checkTDSAuth",
@@ -357,20 +429,23 @@ var checkTDSAuth = async (step2, step3, callback) => {
   } catch (err) {
     setHistoryLog({
       msg: "步骤4异常",
-      time: getCurrentTime()
+      time: getCurrentTime(),
+      errorCode: err == null ? void 0 : err.code
     });
     log({
       msg: err,
       data: paymentData
     });
+    if (isCancelled == null ? void 0 : isCancelled()) return 0;
+    if ((err == null ? void 0 : err.code) === 700500) {
+      throw err;
+    }
     (0, import_materials.PisellToast)({
       content: (err == null ? void 0 : err.message) || "",
-      duration: 1e3 * 200,
-      onClose() {
-        callback({ key: "hideModal" });
-        closeIframe();
-      }
+      duration: 1e3 * 2
     });
+    callback == null ? void 0 : callback({ key: "hideModal" });
+    closeIframe();
     return 0;
   }
 };
@@ -406,6 +481,7 @@ var createChallengeIframe = (challengeData, callback) => {
           if (timer) {
             clearTimeout(timer);
           }
+          window.removeEventListener("message", handleMessage);
           res(event.data.cres);
           closeIframe();
         }
@@ -424,6 +500,11 @@ var createChallengeIframe = (challengeData, callback) => {
       handleMessage,
       false
     );
+    activeCleanup = () => {
+      window.removeEventListener("message", handleMessage);
+      if (timer) clearTimeout(timer);
+      rej(0);
+    };
   });
 };
 var checkPARes = async (step2, step4, step5) => {
@@ -464,11 +545,13 @@ var closeIframe = () => {
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  cancelCurrentPayment,
   checkEnrollment,
   checkPARes,
   checkTDSAuth,
   createChallengeIframe,
   createThreeDSMethodIframe,
   paymentEnd,
+  preCheckEnrollment,
   startPayment
 });