@pisell/private-materials 6.9.1 → 6.9.3

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

@@ -47,6 +47,15 @@ var log = function log(data) {
     }]
   });
 };
+var setHistoryLog = function setHistoryLog(log) {
+  if (!paymentData.logList) {
+    paymentData.logList = [];
+  }
+  paymentData.logList.push(log);
+};
+var getCurrentTime = function getCurrentTime() {
+  return dayjs().format('YYYY-MM-DD HH:mm:ss');
+};
 
 /**
  * @title: 点击支付
@@ -68,104 +77,169 @@ export var startPayment = /*#__PURE__*/function () {
             order_id: 0
           };
           _context.prev = 2;
-          paymentData = {};
+          paymentData = {
+            orderId: orderId,
+            logList: []
+          };
+          setHistoryLog({
+            msg: 'startPayment 开始',
+            time: getCurrentTime(),
+            hasPayData: !!payData,
+            payDataOrderId: payData === null || payData === void 0 ? void 0 : payData.order_id,
+            payDataPayNumber: payData === null || payData === void 0 ? void 0 : payData.pay_number
+          });
+
           // 提交卡信息到后端, 如果有 payData, 则直接使用传入数据
           if (!payData) {
-            _context.next = 8;
+            _context.next = 9;
             break;
           }
           _context.t0 = payData;
-          _context.next = 11;
+          _context.next = 12;
           break;
-        case 8:
-          _context.next = 10;
+        case 9:
+          _context.next = 11;
           return checkEnrollment(orderId, cardInfo, callback);
-        case 10:
-          _context.t0 = _context.sent;
         case 11:
+          _context.t0 = _context.sent;
+        case 12:
           step2 = _context.t0;
+          setHistoryLog({
+            msg: '步骤2完成: 提交卡信息到后端',
+            time: getCurrentTime(),
+            hasStep2: !!step2
+          });
           if (!(step2 === 0)) {
-            _context.next = 14;
+            _context.next = 16;
             break;
           }
           return _context.abrupt("return");
-        case 14:
+        case 16:
           paymentData.step2 = step2;
           paymentInfo.amount = step2.amount;
           paymentInfo.order_id = step2.order_id;
           console.log('第三步');
+          setHistoryLog({
+            msg: '步骤3开始: 创建iframe监听postMessage',
+            time: getCurrentTime()
+          });
 
           // 监听postMessage
-          _context.next = 20;
+          _context.next = 23;
           return createThreeDSMethodIframe(step2, callback);
-        case 20:
+        case 23:
           step3 = _context.sent;
           paymentData.step3 = step3;
+          setHistoryLog({
+            msg: '步骤3完成: iframe监听结束',
+            time: getCurrentTime(),
+            step3Result: step3
+          });
           if (!(step3 === 'N')) {
-            _context.next = 24;
+            _context.next = 28;
             break;
           }
           return _context.abrupt("return");
-        case 24:
-          _context.next = 26;
+        case 28:
+          setHistoryLog({
+            msg: '步骤4开始: 调用checkTDSAuth',
+            time: getCurrentTime(),
+            order_id: step2 === null || step2 === void 0 ? void 0 : step2.order_id,
+            pay_number: step2 === null || step2 === void 0 ? void 0 : step2.pay_number
+          });
+
+          // 提交token至后端
+          _context.next = 31;
           return checkTDSAuth(step2, step3, callback);
-        case 26:
+        case 31:
           step4 = _context.sent;
+          setHistoryLog({
+            msg: '步骤4完成: checkTDSAuth 返回',
+            time: getCurrentTime(),
+            hasStep4: !!step4
+          });
           if (!(step4 === 0)) {
-            _context.next = 29;
+            _context.next = 35;
             break;
           }
           return _context.abrupt("return");
-        case 29:
+        case 35:
           paymentData.step4 = step4;
 
           // 返回数据执行步骤5, 没有则略过 5&6
           if (!step4) {
-            _context.next = 37;
+            _context.next = 47;
             break;
           }
-          _context.next = 33;
+          setHistoryLog({
+            msg: '步骤5开始: 创建challenge iframe',
+            time: getCurrentTime()
+          });
+          _context.next = 40;
           return createChallengeIframe(step4, callback);
-        case 33:
+        case 40:
           step5 = _context.sent;
           paymentData.step5 = step5;
+          setHistoryLog({
+            msg: '步骤5完成: challenge iframe结束',
+            time: getCurrentTime()
+          });
+          setHistoryLog({
+            msg: '步骤6开始: 调用check_pares接口',
+            time: getCurrentTime()
+          });
 
           // 步骤6, 换取token
-          _context.next = 37;
+          _context.next = 46;
           return checkPARes(step2, step4, step5);
-        case 37:
+        case 46:
+          setHistoryLog({
+            msg: '步骤6完成: check_pares接口返回',
+            time: getCurrentTime()
+          });
+        case 47:
           callback({
             key: 'hideModal'
           });
+          setHistoryLog({
+            msg: '支付成功',
+            time: getCurrentTime()
+          });
+
           // 支付结束
           paymentEnd(_objectSpread({
             status: 'success'
           }, paymentInfo), callback);
           return _context.abrupt("return", true);
-        case 42:
-          _context.prev = 42;
+        case 53:
+          _context.prev = 53;
           _context.t1 = _context["catch"](2);
           console.log('error', _context.t1);
+          setHistoryLog({
+            msg: '支付异常',
+            time: getCurrentTime(),
+            error: _context.t1
+          });
           callback({
             key: 'hideModal'
           });
           closeIframe();
           if (!(_context.t1 === 0)) {
-            _context.next = 49;
+            _context.next = 61;
             break;
           }
           return _context.abrupt("return");
-        case 49:
+        case 61:
           paymentData.error = _context.t1;
           paymentEnd(_objectSpread({
             status: 'fail'
           }, paymentInfo), callback);
           return _context.abrupt("return", false);
-        case 52:
+        case 64:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[2, 42]]);
+    }, _callee, null, [[2, 53]]);
   }));
   return function startPayment(_x, _x2) {
     return _ref2.apply(this, arguments);
@@ -241,22 +315,22 @@ export var checkEnrollment = /*#__PURE__*/function () {
  */
 export var createThreeDSMethodIframe = /*#__PURE__*/function () {
   var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(threeDSMethodData, callback) {
-    var _threeDSMethodData$pa, _threeDSMethodData$pa2, _threeDSMethodData$pa3, _threeDSMethodData$pa4, _threeDSMethodData$pa5;
+    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) {
         case 0:
           defaultReturnParams = {
-            threeDSServerTransID: (threeDSMethodData === null || threeDSMethodData === void 0 || (_threeDSMethodData$pa = threeDSMethodData.pay_info) === null || _threeDSMethodData$pa === void 0 ? void 0 : _threeDSMethodData$pa.threeDSServerTransID) || '',
-            threeDSCompInd: (threeDSMethodData === null || threeDSMethodData === void 0 || (_threeDSMethodData$pa2 = threeDSMethodData.pay_info) === null || _threeDSMethodData$pa2 === void 0 ? void 0 : _threeDSMethodData$pa2.threeDSCompInd) || ''
+            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$pa3 = threeDSMethodData.pay_info) !== null && _threeDSMethodData$pa3 !== void 0 && _threeDSMethodData$pa3.threeDSServerTransID && threeDSMethodData !== null && threeDSMethodData !== void 0 && (_threeDSMethodData$pa4 = threeDSMethodData.pay_info) !== null && _threeDSMethodData$pa4 !== void 0 && _threeDSMethodData$pa4.threeDSCompInd)) {
+          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;
             break;
           }
           return _context3.abrupt("return", defaultReturnParams);
         case 3:
-          if (!(!(threeDSMethodData !== null && threeDSMethodData !== void 0 && threeDSMethodData.pay_info.acsURL) || typeof (threeDSMethodData === null || threeDSMethodData === void 0 || (_threeDSMethodData$pa5 = threeDSMethodData.pay_info) === null || _threeDSMethodData$pa5 === void 0 ? void 0 : _threeDSMethodData$pa5.acsURL) !== 'string')) {
+          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;
             break;
           }
@@ -292,6 +366,7 @@ export var createThreeDSMethodIframe = /*#__PURE__*/function () {
           form.submit();
           timer = null; // 返回promise
           return _context3.abrupt("return", new Promise(function (res, rej) {
+            var _threeDSMethodData$pa7;
             // 10秒内没有成功则走N逻辑
             timer = setTimeout(function () {
               res(defaultReturnParams);
@@ -299,12 +374,17 @@ export var createThreeDSMethodIframe = /*#__PURE__*/function () {
                 msg: '第三步: 10秒超时则走N逻辑',
                 data: threeDSMethodData
               });
-            }, 10000);
+            }, (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) {
               // 判断域名
               if (event.origin.indexOf(postmessageUrl) !== -1 || event.origin.indexOf('securesuite') !== -1) {
                 // 返回 threeDSServerTransID 则 res
                 if (typeof event.data.threeDSServerTransID == 'string') {
+                  setHistoryLog({
+                    msg: '第三步: message 返回 threeDSServerTransID',
+                    time: getCurrentTime(),
+                    threeDSServerTransID: event.data.threeDSServerTransID
+                  });
                   if (timer) {
                     clearTimeout(timer);
                   }
@@ -350,7 +430,13 @@ export var checkTDSAuth = /*#__PURE__*/function () {
           if (REACT_APP_API_ENV === 'pre' && pay_info.check_tds_auth.card_name === 'aa bb') {
             isPre = true;
           }
-          _context4.next = 8;
+          setHistoryLog({
+            msg: '步骤4开始: 调用tds_auth_pay接口',
+            time: getCurrentTime(),
+            order_id: order_id,
+            pay_number: pay_number
+          });
+          _context4.next = 9;
           return request.getRequest().post('/h5/pay/order/mw-3ds-pay/v2/tds_auth_pay', {
             order_id: order_id,
             pay_number: pay_number,
@@ -388,19 +474,30 @@ export var checkTDSAuth = /*#__PURE__*/function () {
               notifyURL: notifyURL
             }
           });
-        case 8:
+        case 9:
           _yield$request$getReq2 = _context4.sent;
           data = _yield$request$getReq2.data;
+          setHistoryLog({
+            msg: '步骤4完成: tds_auth_pay接口返回',
+            time: getCurrentTime(),
+            hasStep4: !!data
+          });
+          // 有threeDSToken 则走步骤7 直接支付
           if (data) {
-            _context4.next = 12;
+            _context4.next = 14;
             break;
           }
           return _context4.abrupt("return", null);
-        case 12:
+        case 14:
           return _context4.abrupt("return", data);
-        case 15:
-          _context4.prev = 15;
+        case 17:
+          _context4.prev = 17;
           _context4.t0 = _context4["catch"](0);
+          setHistoryLog({
+            msg: '步骤4异常',
+            time: getCurrentTime()
+          });
+
           // 记录卡失败的原因
           log({
             msg: _context4.t0,
@@ -417,11 +514,11 @@ export var checkTDSAuth = /*#__PURE__*/function () {
             }
           });
           return _context4.abrupt("return", 0);
-        case 20:
+        case 23:
         case "end":
           return _context4.stop();
       }
-    }, _callee4, null, [[0, 15]]);
+    }, _callee4, null, [[0, 17]]);
   }));
   return function checkTDSAuth(_x8, _x9, _x10) {
     return _ref5.apply(this, arguments);

package/es/components/pay/toC/PaymentMethods/StripePay/index.js

@@ -91,7 +91,7 @@ var StripePay = function StripePay(props, ref) {
                 redirectUrl: redirectUrl
               }
             });
-            state.history.push(redirectUrl);
+            window.location.href = redirectUrl;
             paymentLogger.sendLogs('StripePay H5端跳转成功');
             _context.next = 21;
             break;

package/es/components/pay/toC/PaymentMethods/WalletPass/index.d.ts

@@ -15,11 +15,16 @@ export interface WalletPassProps {
     walletPass: {
         cards: WalletPassDataType[];
         amount: number;
+        recommended?: WalletPassDataType[];
+        transformList?: WalletPassDataType[];
+        noApplicableVoucher?: WalletPassDataType[];
     };
     walletSetting: {
         name: string;
         popup_status: 0 | 1;
     };
+    orderDetail: any;
+    total_amount: number;
 }
 declare const _default: React.MemoExoticComponent<React.ForwardRefExoticComponent<WalletPassProps & React.RefAttributes<WalletPassRef>>>;
 export default _default;