@pisell/private-materials 6.3.115 → 6.3.117

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

@@ -12,6 +12,7 @@ import dayjs from 'dayjs';
 import { sendWarningLog } from '@pisell/utils';
 import { PisellToast } from '@pisell/materials';
 import { setPayNumber } from "../../payGroup";
+import { getUniqueIdempotencyToken } from "../../utils";
 var REACT_APP_API_ENV = process.env.REACT_APP_API_ENV;
 var paymentInfo = {
   transactionInfo: {
@@ -30,6 +31,25 @@ var paymentInfo = {
 };
 var paymentData = {};
 var postmessageUrl = 'merchantwarrior';
+
+/**
+ * 当前活跃的 message 监听器清理函数。
+ * 步骤3（createThreeDSMethodIframe）和步骤5（createChallengeIframe）
+ * 各自注册 window message 监听器时会存入此变量，
+ * 供组件卸载或新流程启动时清理残留监听器 + reject 挂起的 Promise。
+ */
+var activeCleanup = null;
+
+/**
+ * 取消当前支付流程中残留的 message 监听器和定时器，
+ * 并 reject 挂起的 Promise 使 startPayment 的 await 结束。
+ * reject 值为 0，startPayment catch 中 `if (err === 0) return` 会静默处理。
+ */
+export var cancelCurrentPayment = function cancelCurrentPayment() {
+  var _activeCleanup;
+  (_activeCleanup = activeCleanup) === null || _activeCleanup === void 0 || _activeCleanup();
+  activeCleanup = null;
+};
 var log = function log(data) {
   var _template = {
     module: module,
@@ -56,7 +76,6 @@ var setHistoryLog = function setHistoryLog(log) {
 var getCurrentTime = function getCurrentTime() {
   return dayjs().format('YYYY-MM-DD HH:mm:ss');
 };
-
 /**
  * @title: 点击支付
  * @description:
@@ -66,17 +85,18 @@ var getCurrentTime = function getCurrentTime() {
  * @Date: 2022-10-22 10:05
  */
 export var startPayment = /*#__PURE__*/function () {
-  var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref, callback) {
-    var orderId, cardInfo, payData, paymentInfo, step2, step3, step4, step5;
+  var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref, options) {
+    var orderId, cardInfo, payData, _ref3, callback, isCancelled, paymentInfo, step2, step3, step4, step5;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
           orderId = _ref.orderId, cardInfo = _ref.cardInfo, payData = _ref.payData;
+          _ref3 = options || {}, callback = _ref3.callback, isCancelled = _ref3.isCancelled;
           paymentInfo = {
             amount: 0,
             order_id: 0
           };
-          _context.prev = 2;
+          _context.prev = 3;
           paymentData = {
             orderId: orderId,
             logList: []
@@ -91,30 +111,40 @@ export var startPayment = /*#__PURE__*/function () {
 
           // 提交卡信息到后端, 如果有 payData, 则直接使用传入数据
           if (!payData) {
-            _context.next = 9;
+            _context.next = 10;
             break;
           }
           _context.t0 = payData;
-          _context.next = 12;
+          _context.next = 13;
           break;
-        case 9:
-          _context.next = 11;
-          return checkEnrollment(orderId, cardInfo, callback);
-        case 11:
-          _context.t0 = _context.sent;
+        case 10:
+          _context.next = 12;
+          return checkEnrollment(orderId, cardInfo, {
+            callback: callback,
+            isCancelled: isCancelled
+          });
         case 12:
+          _context.t0 = _context.sent;
+        case 13:
           step2 = _context.t0;
+          if (!(isCancelled !== null && isCancelled !== void 0 && isCancelled())) {
+            _context.next = 17;
+            break;
+          }
+          closeIframe();
+          return _context.abrupt("return");
+        case 17:
           setHistoryLog({
             msg: '步骤2完成: 提交卡信息到后端',
             time: getCurrentTime(),
             hasStep2: !!step2
           });
           if (!(step2 === 0)) {
-            _context.next = 16;
+            _context.next = 20;
             break;
           }
           return _context.abrupt("return");
-        case 16:
+        case 20:
           paymentData.step2 = step2;
           paymentInfo.amount = step2.amount;
           paymentInfo.order_id = step2.order_id;
@@ -125,10 +155,17 @@ export var startPayment = /*#__PURE__*/function () {
           });
 
           // 监听postMessage
-          _context.next = 23;
+          _context.next = 27;
           return createThreeDSMethodIframe(step2, callback);
-        case 23:
+        case 27:
           step3 = _context.sent;
+          if (!(isCancelled !== null && isCancelled !== void 0 && isCancelled())) {
+            _context.next = 31;
+            break;
+          }
+          closeIframe();
+          return _context.abrupt("return");
+        case 31:
           paymentData.step3 = step3;
           setHistoryLog({
             msg: '步骤3完成: iframe监听结束',
@@ -136,11 +173,11 @@ export var startPayment = /*#__PURE__*/function () {
             step3Result: step3
           });
           if (!(step3 === 'N')) {
-            _context.next = 28;
+            _context.next = 35;
             break;
           }
           return _context.abrupt("return");
-        case 28:
+        case 35:
           setHistoryLog({
             msg: '步骤4开始: 调用checkTDSAuth',
             time: getCurrentTime(),
@@ -149,36 +186,53 @@ export var startPayment = /*#__PURE__*/function () {
           });
 
           // 提交token至后端
-          _context.next = 31;
-          return checkTDSAuth(step2, step3, callback);
-        case 31:
+          _context.next = 38;
+          return checkTDSAuth(step2, step3, {
+            callback: callback,
+            isCancelled: isCancelled
+          });
+        case 38:
           step4 = _context.sent;
+          if (!(isCancelled !== null && isCancelled !== void 0 && isCancelled())) {
+            _context.next = 42;
+            break;
+          }
+          closeIframe();
+          return _context.abrupt("return");
+        case 42:
           setHistoryLog({
             msg: '步骤4完成: checkTDSAuth 返回',
             time: getCurrentTime(),
             hasStep4: !!step4
           });
           if (!(step4 === 0)) {
-            _context.next = 35;
+            _context.next = 45;
             break;
           }
           return _context.abrupt("return");
-        case 35:
+        case 45:
           paymentData.step4 = step4;
 
           // 返回数据执行步骤5, 没有则略过 5&6
           if (!step4) {
-            _context.next = 47;
+            _context.next = 63;
             break;
           }
           setHistoryLog({
             msg: '步骤5开始: 创建challenge iframe',
             time: getCurrentTime()
           });
-          _context.next = 40;
+          _context.next = 50;
           return createChallengeIframe(step4, callback);
-        case 40:
+        case 50:
           step5 = _context.sent;
+          if (!(isCancelled !== null && isCancelled !== void 0 && isCancelled())) {
+            _context.next = 54;
+            break;
+          }
+          closeIframe();
+          return _context.abrupt("return");
+        case 54:
           paymentData.step5 = step5;
           setHistoryLog({
             msg: '步骤5完成: challenge iframe结束',
@@ -190,15 +244,29 @@ export var startPayment = /*#__PURE__*/function () {
           });
 
           // 步骤6, 换取token
-          _context.next = 46;
+          _context.next = 59;
           return checkPARes(step2, step4, step5);
-        case 46:
+        case 59:
+          if (!(isCancelled !== null && isCancelled !== void 0 && isCancelled())) {
+            _context.next = 62;
+            break;
+          }
+          closeIframe();
+          return _context.abrupt("return");
+        case 62:
           setHistoryLog({
             msg: '步骤6完成: check_pares接口返回',
             time: getCurrentTime()
           });
-        case 47:
-          callback({
+        case 63:
+          if (!(isCancelled !== null && isCancelled !== void 0 && isCancelled())) {
+            _context.next = 66;
+            break;
+          }
+          closeIframe();
+          return _context.abrupt("return");
+        case 66:
+          callback === null || callback === void 0 || callback({
             key: 'hideModal'
           });
           setHistoryLog({
@@ -211,50 +279,67 @@ export var startPayment = /*#__PURE__*/function () {
             status: 'success'
           }, paymentInfo), callback);
           return _context.abrupt("return", true);
-        case 53:
-          _context.prev = 53;
-          _context.t1 = _context["catch"](2);
+        case 72:
+          _context.prev = 72;
+          _context.t1 = _context["catch"](3);
           console.log('error', _context.t1);
           setHistoryLog({
             msg: '支付异常',
             time: getCurrentTime(),
-            error: _context.t1
+            error: _context.t1,
+            errorCode: _context.t1 === null || _context.t1 === void 0 ? void 0 : _context.t1.code
           });
-          callback({
+          closeIframe();
+          if (!(isCancelled !== null && isCancelled !== void 0 && isCancelled())) {
+            _context.next = 79;
+            break;
+          }
+          return _context.abrupt("return");
+        case 79:
+          callback === null || callback === void 0 || callback({
             key: 'hideModal'
           });
-          closeIframe();
           if (!(_context.t1 === 0)) {
-            _context.next = 61;
+            _context.next = 82;
             break;
           }
           return _context.abrupt("return");
-        case 61:
+        case 82:
+          if (!((_context.t1 === null || _context.t1 === void 0 ? void 0 : _context.t1.code) === 700500)) {
+            _context.next = 85;
+            break;
+          }
+          callback === null || callback === void 0 || callback({
+            key: 'bankVerifyFailed'
+          });
+          return _context.abrupt("return", false);
+        case 85:
           paymentData.error = _context.t1;
           paymentEnd(_objectSpread({
             status: 'fail'
           }, paymentInfo), callback);
           return _context.abrupt("return", false);
-        case 64:
+        case 88:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[2, 53]]);
+    }, _callee, null, [[3, 72]]);
   }));
   return function startPayment(_x, _x2) {
     return _ref2.apply(this, arguments);
   };
 }();
 
-/*******
- * @title: 步骤2
- * @description: 提交卡信息到后端
- * @return {*}
- * @Author: Wzw
- * @Date: 2022-10-18 10:26
+/**
+ * @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 var checkEnrollment = /*#__PURE__*/function () {
-  var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(orderId, cardInfo, callback) {
+export var preCheckEnrollment = /*#__PURE__*/function () {
+  var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(orderId, cardInfo) {
     var _yield$request$getReq, data;
     return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
@@ -270,13 +355,13 @@ export var checkEnrollment = /*#__PURE__*/function () {
             _context2.next = 8;
             break;
           }
-          return _context2.abrupt("return", null);
+          throw new Error('Card does not support 3DS verification');
         case 8:
           return _context2.abrupt("return", data);
         case 11:
           _context2.prev = 11;
           _context2.t0 = _context2["catch"](0);
-          // 记录卡失败的原因
+          // 记录失败日志
           log({
             msg: _context2.t0,
             data: {
@@ -284,24 +369,88 @@ export var checkEnrollment = /*#__PURE__*/function () {
               cardInfo: cardInfo
             }
           });
-          callback({
+          // 直接向上抛出，由调用方处理
+          throw _context2.t0;
+        case 15:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2, null, [[0, 11]]);
+  }));
+  return function preCheckEnrollment(_x3, _x4) {
+    return _ref4.apply(this, arguments);
+  };
+}();
+
+/*******
+ * @title: 步骤2
+ * @description: 提交卡信息到后端
+ * @return {*}
+ * @Author: Wzw
+ * @Date: 2022-10-18 10:26
+ */
+export var checkEnrollment = /*#__PURE__*/function () {
+  var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(orderId, cardInfo, options) {
+    var _ref6, callback, isCancelled, _yield$request$getReq2, data;
+    return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+      while (1) switch (_context3.prev = _context3.next) {
+        case 0:
+          _ref6 = options || {}, callback = _ref6.callback, isCancelled = _ref6.isCancelled;
+          _context3.prev = 1;
+          _context3.next = 4;
+          return request.getRequest().post('/h5/pay/order/mw-3ds-pay/v2/' + orderId, _objectSpread({}, cardInfo));
+        case 4:
+          _yield$request$getReq2 = _context3.sent;
+          data = _yield$request$getReq2.data;
+          if (!(isCancelled !== null && isCancelled !== void 0 && isCancelled())) {
+            _context3.next = 8;
+            break;
+          }
+          return _context3.abrupt("return", 0);
+        case 8:
+          setPayNumber(orderId, data === null || data === void 0 ? void 0 : data.pay_number);
+          if (data !== null && data !== void 0 && data.pay_info) {
+            _context3.next = 11;
+            break;
+          }
+          return _context3.abrupt("return", null);
+        case 11:
+          return _context3.abrupt("return", data);
+        case 14:
+          _context3.prev = 14;
+          _context3.t0 = _context3["catch"](1);
+          // 记录卡失败的原因
+          log({
+            msg: _context3.t0,
+            data: {
+              orderId: orderId,
+              cardInfo: cardInfo
+            }
+          });
+          if (!(isCancelled !== null && isCancelled !== void 0 && isCancelled())) {
+            _context3.next = 19;
+            break;
+          }
+          return _context3.abrupt("return", 0);
+        case 19:
+          callback === null || callback === void 0 || callback({
             key: 'hideModal'
           });
           closeIframe();
           PisellToast({
-            content: (_context2.t0 === null || _context2.t0 === void 0 ? void 0 : _context2.t0.message) || '',
+            content: (_context3.t0 === null || _context3.t0 === void 0 ? void 0 : _context3.t0.message) || '',
             duration: 2
           });
-          console.log('error', _context2.t0);
-          return _context2.abrupt("return", 0);
-        case 19:
+          console.log('error', _context3.t0);
+          return _context3.abrupt("return", 0);
+        case 24:
         case "end":
-          return _context2.stop();
+          return _context3.stop();
       }
-    }, _callee2, null, [[0, 11]]);
+    }, _callee3, null, [[1, 14]]);
   }));
-  return function checkEnrollment(_x3, _x4, _x5) {
-    return _ref3.apply(this, arguments);
+  return function checkEnrollment(_x5, _x6, _x7) {
+    return _ref5.apply(this, arguments);
   };
 }();
 
@@ -314,27 +463,27 @@ export var checkEnrollment = /*#__PURE__*/function () {
  * @Date: 2022-10-18 10:36
  */
 export var createThreeDSMethodIframe = /*#__PURE__*/function () {
-  var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(threeDSMethodData, callback) {
+  var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(threeDSMethodData, callback) {
     var _threeDSMethodData$pa, _threeDSMethodData$pa2, _threeDSMethodData$pa3, _threeDSMethodData$pa4, _threeDSMethodData$pa5, _threeDSMethodData$pa6;
     var defaultReturnParams, displayBox, iframe, form, input, timer;
-    return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-      while (1) switch (_context3.prev = _context3.next) {
+    return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+      while (1) switch (_context4.prev = _context4.next) {
         case 0:
           defaultReturnParams = {
             threeDSServerTransID: (threeDSMethodData === null || threeDSMethodData === void 0 || (_threeDSMethodData$pa = threeDSMethodData.pay_info) === null || _threeDSMethodData$pa === void 0 ? void 0 : _threeDSMethodData$pa.threeDSServerTransID) || (threeDSMethodData === null || threeDSMethodData === void 0 || (_threeDSMethodData$pa2 = threeDSMethodData.pay_info) === null || _threeDSMethodData$pa2 === void 0 ? void 0 : _threeDSMethodData$pa2.paReq) || '',
             threeDSCompInd: (threeDSMethodData === null || threeDSMethodData === void 0 || (_threeDSMethodData$pa3 = threeDSMethodData.pay_info) === null || _threeDSMethodData$pa3 === void 0 ? void 0 : _threeDSMethodData$pa3.threeDSCompInd) || 'N'
           }; // 有返回 threeDSServerTransID 直接走第4步
           if (!(threeDSMethodData !== null && threeDSMethodData !== void 0 && (_threeDSMethodData$pa4 = threeDSMethodData.pay_info) !== null && _threeDSMethodData$pa4 !== void 0 && _threeDSMethodData$pa4.threeDSServerTransID && threeDSMethodData !== null && threeDSMethodData !== void 0 && (_threeDSMethodData$pa5 = threeDSMethodData.pay_info) !== null && _threeDSMethodData$pa5 !== void 0 && _threeDSMethodData$pa5.threeDSCompInd)) {
-            _context3.next = 3;
+            _context4.next = 3;
             break;
           }
-          return _context3.abrupt("return", defaultReturnParams);
+          return _context4.abrupt("return", defaultReturnParams);
         case 3:
           if (!(!(threeDSMethodData !== null && threeDSMethodData !== void 0 && threeDSMethodData.pay_info.acsURL) || typeof (threeDSMethodData === null || threeDSMethodData === void 0 || (_threeDSMethodData$pa6 = threeDSMethodData.pay_info) === null || _threeDSMethodData$pa6 === void 0 ? void 0 : _threeDSMethodData$pa6.acsURL) !== 'string')) {
-            _context3.next = 5;
+            _context4.next = 5;
             break;
           }
-          return _context3.abrupt("return", defaultReturnParams);
+          return _context4.abrupt("return", defaultReturnParams);
         case 5:
           displayBox = document.getElementById('threeds-container'); // 清空dom中的内容
           displayBox.innerHTML = '';
@@ -365,17 +514,9 @@ export var createThreeDSMethodIframe = /*#__PURE__*/function () {
           form.method = 'post';
           form.submit();
           timer = null; // 返回promise
-          return _context3.abrupt("return", new Promise(function (res, rej) {
+          return _context4.abrupt("return", new Promise(function (res, rej) {
             var _threeDSMethodData$pa7;
-            // 10秒内没有成功则走N逻辑
-            timer = setTimeout(function () {
-              res(defaultReturnParams);
-              log({
-                msg: '第三步: 10秒超时则走N逻辑',
-                data: threeDSMethodData
-              });
-            }, (threeDSMethodData === null || threeDSMethodData === void 0 || (_threeDSMethodData$pa7 = threeDSMethodData.pay_info) === null || _threeDSMethodData$pa7 === void 0 ? void 0 : _threeDSMethodData$pa7.tdsMethodTimeoutMS) || 10000);
-            window.addEventListener('message', function (event) {
+            var handleMessage = function handleMessage(event) {
               // 判断域名
               if (event.origin.indexOf(postmessageUrl) !== -1 || event.origin.indexOf('securesuite') !== -1) {
                 // 返回 threeDSServerTransID 则 res
@@ -388,6 +529,8 @@ export var createThreeDSMethodIframe = /*#__PURE__*/function () {
                   if (timer) {
                     clearTimeout(timer);
                   }
+                  // 移除监听器，防止重复触发
+                  window.removeEventListener('message', handleMessage);
                   // 10秒内成功则走Y逻辑
                   res({
                     threeDSServerTransID: event.data.threeDSServerTransID,
@@ -395,16 +538,33 @@ export var createThreeDSMethodIframe = /*#__PURE__*/function () {
                   });
                 }
               }
-            }, false);
+            };
+
+            // 10秒内没有成功则走N逻辑
+            timer = setTimeout(function () {
+              // 超时也要移除监听器
+              window.removeEventListener('message', handleMessage);
+              res(defaultReturnParams);
+              log({
+                msg: '第三步: 10秒超时则走N逻辑',
+                data: threeDSMethodData
+              });
+            }, (threeDSMethodData === null || threeDSMethodData === void 0 || (_threeDSMethodData$pa7 = threeDSMethodData.pay_info) === null || _threeDSMethodData$pa7 === void 0 ? void 0 : _threeDSMethodData$pa7.tdsMethodTimeoutMS) || 10000);
+            window.addEventListener('message', handleMessage, false);
+            activeCleanup = function activeCleanup() {
+              window.removeEventListener('message', handleMessage);
+              if (timer) clearTimeout(timer);
+              rej(0);
+            };
           }));
         case 28:
         case "end":
-          return _context3.stop();
+          return _context4.stop();
       }
-    }, _callee3);
+    }, _callee4);
   }));
-  return function createThreeDSMethodIframe(_x6, _x7) {
-    return _ref4.apply(this, arguments);
+  return function createThreeDSMethodIframe(_x8, _x9) {
+    return _ref7.apply(this, arguments);
   };
 }();
 
@@ -417,12 +577,13 @@ export var createThreeDSMethodIframe = /*#__PURE__*/function () {
  * @Date: 2022-10-18 10:43
  */
 export var checkTDSAuth = /*#__PURE__*/function () {
-  var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(step2, step3, callback) {
-    var pay_number, order_id, pay_info, amount, notifyURL, threeDSServerTransID, threeDSCompInd, currentData, isPre, _yield$request$getReq2, data;
-    return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-      while (1) switch (_context4.prev = _context4.next) {
+  var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(step2, step3, options) {
+    var _ref9, callback, isCancelled, pay_number, order_id, pay_info, amount, notifyURL, threeDSServerTransID, threeDSCompInd, currentData, isPre, request_unique_idempotency_token, _yield$request$getReq3, data;
+    return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+      while (1) switch (_context5.prev = _context5.next) {
         case 0:
-          _context4.prev = 0;
+          _ref9 = options || {}, callback = _ref9.callback, isCancelled = _ref9.isCancelled;
+          _context5.prev = 1;
           pay_number = step2.pay_number, order_id = step2.order_id, pay_info = step2.pay_info, amount = step2.amount, notifyURL = step2.notifyURL;
           threeDSServerTransID = step3.threeDSServerTransID, threeDSCompInd = step3.threeDSCompInd;
           currentData = new Date();
@@ -430,16 +591,21 @@ export var checkTDSAuth = /*#__PURE__*/function () {
           if (REACT_APP_API_ENV === 'pre' && pay_info.check_tds_auth.card_name === 'aa bb') {
             isPre = true;
           }
+
+          // 获取唯一幂等token 方式浏览器自动重试
+          request_unique_idempotency_token = getUniqueIdempotencyToken();
           setHistoryLog({
             msg: '步骤4开始: 调用tds_auth_pay接口',
             time: getCurrentTime(),
             order_id: order_id,
-            pay_number: pay_number
+            pay_number: pay_number,
+            request_unique_idempotency_token: request_unique_idempotency_token
           });
-          _context4.next = 9;
+          _context5.next = 11;
           return request.getRequest().post('/h5/pay/order/mw-3ds-pay/v2/tds_auth_pay', {
             order_id: order_id,
             pay_number: pay_number,
+            request_unique_idempotency_token: request_unique_idempotency_token,
             mw_data: {
               accessToken: pay_info.check_tds_auth.access_token,
               method: 'checkTDSAuth',
@@ -467,16 +633,16 @@ export var checkTDSAuth = /*#__PURE__*/function () {
               billAddrLine1: paymentInfo.billingAddress.billAddrLine1,
               billAddrPostCode: paymentInfo.billingAddress.billAddrPostCode,
               billAddrState: paymentInfo.billingAddress.billAddrState,
-              threeDSCompInd: isPre ? '' : threeDSCompInd,
+              threeDSCompInd: isPre ? '' : threeDSCompInd || 'N',
               threeDSServerTransID: isPre ? '' : threeDSServerTransID,
               threeDSRequestorAuthenticationInd: '01',
               threeDSRequestorURL: window.location.href,
               notifyURL: notifyURL
             }
           });
-        case 9:
-          _yield$request$getReq2 = _context4.sent;
-          data = _yield$request$getReq2.data;
+        case 11:
+          _yield$request$getReq3 = _context5.sent;
+          data = _yield$request$getReq3.data;
           setHistoryLog({
             msg: '步骤4完成: tds_auth_pay接口返回',
             time: getCurrentTime(),
@@ -484,44 +650,55 @@ export var checkTDSAuth = /*#__PURE__*/function () {
           });
           // 有threeDSToken 则走步骤7 直接支付
           if (data) {
-            _context4.next = 14;
+            _context5.next = 16;
             break;
           }
-          return _context4.abrupt("return", null);
-        case 14:
-          return _context4.abrupt("return", data);
-        case 17:
-          _context4.prev = 17;
-          _context4.t0 = _context4["catch"](0);
+          return _context5.abrupt("return", null);
+        case 16:
+          return _context5.abrupt("return", data);
+        case 19:
+          _context5.prev = 19;
+          _context5.t0 = _context5["catch"](1);
           setHistoryLog({
             msg: '步骤4异常',
-            time: getCurrentTime()
+            time: getCurrentTime(),
+            errorCode: _context5.t0 === null || _context5.t0 === void 0 ? void 0 : _context5.t0.code
           });
 
           // 记录卡失败的原因
           log({
-            msg: _context4.t0,
+            msg: _context5.t0,
             data: paymentData
           });
+          if (!(isCancelled !== null && isCancelled !== void 0 && isCancelled())) {
+            _context5.next = 25;
+            break;
+          }
+          return _context5.abrupt("return", 0);
+        case 25:
+          if (!((_context5.t0 === null || _context5.t0 === void 0 ? void 0 : _context5.t0.code) === 700500)) {
+            _context5.next = 27;
+            break;
+          }
+          throw _context5.t0;
+        case 27:
           PisellToast({
-            content: (_context4.t0 === null || _context4.t0 === void 0 ? void 0 : _context4.t0.message) || '',
-            duration: 1000 * 200,
-            onClose: function onClose() {
-              callback({
-                key: 'hideModal'
-              });
-              closeIframe();
-            }
+            content: (_context5.t0 === null || _context5.t0 === void 0 ? void 0 : _context5.t0.message) || '',
+            duration: 1000 * 2
           });
-          return _context4.abrupt("return", 0);
-        case 23:
+          callback === null || callback === void 0 || callback({
+            key: 'hideModal'
+          });
+          closeIframe();
+          return _context5.abrupt("return", 0);
+        case 31:
         case "end":
-          return _context4.stop();
+          return _context5.stop();
       }
-    }, _callee4, null, [[0, 17]]);
+    }, _callee5, null, [[1, 19]]);
   }));
-  return function checkTDSAuth(_x8, _x9, _x10) {
-    return _ref5.apply(this, arguments);
+  return function checkTDSAuth(_x10, _x11, _x12) {
+    return _ref8.apply(this, arguments);
   };
 }();
 
@@ -580,6 +757,7 @@ export var createChallengeIframe = function createChallengeIframe(challengeData,
           if (timer) {
             clearTimeout(timer);
           }
+          window.removeEventListener('message', handleMessage);
           res(event.data.cres);
           closeIframe();
         }
@@ -596,6 +774,11 @@ export var createChallengeIframe = function createChallengeIframe(challengeData,
       rej('time out');
     }, 2 * 60 * 1000);
     window.addEventListener('message', handleMessage, false);
+    activeCleanup = function activeCleanup() {
+      window.removeEventListener('message', handleMessage);
+      if (timer) clearTimeout(timer);
+      rej(0);
+    };
   });
 };
 
@@ -608,15 +791,15 @@ export var createChallengeIframe = function createChallengeIframe(challengeData,
  * @Date: 2022-10-18 10:48
  */
 export var checkPARes = /*#__PURE__*/function () {
-  var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(step2, step4, step5) {
-    var pay_number, order_id, pay_info, amount, tdsPayKey, tdsPayToken, cres, _yield$request$getReq3, data;
-    return _regeneratorRuntime().wrap(function _callee5$(_context5) {
-      while (1) switch (_context5.prev = _context5.next) {
+  var _ref10 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(step2, step4, step5) {
+    var pay_number, order_id, pay_info, amount, tdsPayKey, tdsPayToken, cres, _yield$request$getReq4, data;
+    return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+      while (1) switch (_context6.prev = _context6.next) {
         case 0:
           pay_number = step2.pay_number, order_id = step2.order_id, pay_info = step2.pay_info, amount = step2.amount;
           tdsPayKey = step4.tdsPayKey, tdsPayToken = step4.tdsPayToken;
           cres = step5;
-          _context5.next = 5;
+          _context6.next = 5;
           return request.getRequest().post('/h5/pay/order/mw-3ds-pay/v2/check_pares', {
             order_id: order_id,
             pay_number: pay_number,
@@ -632,17 +815,17 @@ export var checkPARes = /*#__PURE__*/function () {
             }
           });
         case 5:
-          _yield$request$getReq3 = _context5.sent;
-          data = _yield$request$getReq3.data;
-          return _context5.abrupt("return", data);
+          _yield$request$getReq4 = _context6.sent;
+          data = _yield$request$getReq4.data;
+          return _context6.abrupt("return", data);
         case 8:
         case "end":
-          return _context5.stop();
+          return _context6.stop();
       }
-    }, _callee5);
+    }, _callee6);
   }));
-  return function checkPARes(_x11, _x12, _x13) {
-    return _ref6.apply(this, arguments);
+  return function checkPARes(_x13, _x14, _x15) {
+    return _ref10.apply(this, arguments);
   };
 }();