@pisell/private-materials 3.4.61 → 3.4.62

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);
@@ -351,7 +425,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,
@@ -389,19 +469,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,
@@ -418,11 +509,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/index.js

@@ -314,7 +314,7 @@ var ToCPay = function ToCPay(props, ref) {
 
             // 初始化支付列表
             _context3.next = 11;
-            return (_paymentListRef$curre = paymentListRef.current) === null || _paymentListRef$curre === void 0 ? void 0 : _paymentListRef$curre.init(payment_list);
+            return (_paymentListRef$curre = paymentListRef.current) === null || _paymentListRef$curre === void 0 ? void 0 : _paymentListRef$curre.init(payment_list, remain_amount || 0);
           case 11:
             // 解除loading
             setTimeout(function () {
@@ -894,6 +894,7 @@ var ToCPay = function ToCPay(props, ref) {
       open: open,
       cancelVisible: false,
       okText: okText,
+      wrapClassName: 'toc-pay-modal-content',
       bodyStyle: {
         padding: 24
       },

package/es/components/pay/toC/locales.d.ts

@@ -98,6 +98,8 @@ declare const _default: {
         'tocPay.text.paymentCompletedAndViewOrder': string;
         'tocPay.text.paymentFailed': string;
         'tocPay.text.weAreVerifyingYourPaymentPleaseCheckYourOrderStatusLater': string;
+        'tocPay.text.domestic': string;
+        'tocPay.text.rest-of-world': string;
     };
     'zh-CN': {
         'tocPay.text.checkout': string;
@@ -197,6 +199,8 @@ declare const _default: {
         'tocPay.text.paymentCompletedAndViewOrder': string;
         'tocPay.text.paymentFailed': string;
         'tocPay.text.weAreVerifyingYourPaymentPleaseCheckYourOrderStatusLater': string;
+        'tocPay.text.domestic': string;
+        'tocPay.text.rest-of-world': string;
     };
     'zh-HK': {
         'tocPay.text.checkout': string;
@@ -296,6 +300,8 @@ declare const _default: {
         'tocPay.text.paymentCompletedAndViewOrder': string;
         'tocPay.text.paymentFailed': string;
         'tocPay.text.weAreVerifyingYourPaymentPleaseCheckYourOrderStatusLater': string;
+        'tocPay.text.domestic': string;
+        'tocPay.text.rest-of-world': string;
     };
 };
 export default _default;

package/es/components/pay/toC/locales.js

@@ -117,7 +117,9 @@ export default {
     'tocPay.text.returnAndSelectOtherPaymentMethod': 'Go Back / Choose Another Payment',
     'tocPay.text.paymentCompletedAndViewOrder': 'Payment Completed / View Order',
     'tocPay.text.paymentFailed': 'Not paid yet, please check if the payment is successful',
-    'tocPay.text.weAreVerifyingYourPaymentPleaseCheckYourOrderStatusLater': 'We are verifying your payment. Please check your order status later.'
+    'tocPay.text.weAreVerifyingYourPaymentPleaseCheckYourOrderStatusLater': 'We are verifying your payment. Please check your order status later.',
+    'tocPay.text.domestic': 'Domestic',
+    'tocPay.text.rest-of-world': 'Rest of world'
   },
   'zh-CN': {
     'tocPay.text.checkout': '结账',
@@ -236,7 +238,9 @@ export default {
     'tocPay.text.returnAndSelectOtherPaymentMethod': '返回 / 选择其他支付方式',
     'tocPay.text.paymentCompletedAndViewOrder': '支付完成 / 查看订单',
     'tocPay.text.paymentFailed': "未支付完成，请检查是否支付成功",
-    'tocPay.text.weAreVerifyingYourPaymentPleaseCheckYourOrderStatusLater': '我们正在确认您的支付状态，请稍后查看订单状态。'
+    'tocPay.text.weAreVerifyingYourPaymentPleaseCheckYourOrderStatusLater': '我们正在确认您的支付状态，请稍后查看订单状态。',
+    'tocPay.text.domestic': '本国',
+    'tocPay.text.rest-of-world': '国外'
   },
   'zh-HK': {
     'tocPay.text.checkout': '結帳',
@@ -355,6 +359,8 @@ export default {
     'tocPay.text.returnAndSelectOtherPaymentMethod': '返回 / 選擇其他支付方式',
     'tocPay.text.paymentCompletedAndViewOrder': '支付完成 / 查看訂單',
     'tocPay.text.paymentFailed': "未支付完成，请检查是否支付成功",
-    'tocPay.text.weAreVerifyingYourPaymentPleaseCheckYourOrderStatusLater': '我們正在確認您的支付狀態，請稍後查看訂單狀態。'
+    'tocPay.text.weAreVerifyingYourPaymentPleaseCheckYourOrderStatusLater': '我們正在確認您的支付狀態，請稍後查看訂單狀態。',
+    'tocPay.text.domestic': '本國',
+    'tocPay.text.rest-of-world': '國外'
   }
 };

package/es/components/pay/toC/model.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 export interface FormState {
     platform: 'pc' | 'h5' | '' | undefined;
     order: any;
@@ -30,11 +29,4 @@ export interface PayGroup {
     _order: any;
     front_order_uuid?: string;
 }
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: FormState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
+export declare const Provider: any, Context: any;

package/es/components/schedules/model.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { CalendarDataItem, ScheduleItem } from "./type";
 import dayjs from "dayjs";
 export interface FormState {
@@ -69,11 +68,4 @@ export interface FormState {
     };
     setGlobalState: Function | null;
 }
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: FormState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
+export declare const Provider: any, Context: any;

package/es/components/ticketBooking/components/addServiceVariant/addService.js

@@ -379,7 +379,8 @@ var AddSerivce = function AddSerivce(props) {
                   start_date: state.date.value,
                   quantity: (e === null || e === void 0 ? void 0 : e.quantity) || 1,
                   product_name: item.title,
-                  other: other
+                  other: other,
+                  isNormalProduct: isNormalProductByDurationSchedule(item)
                 },
                 new: 1
               });