@pisell/private-materials 6.2.51 → 6.2.52

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

@@ -15,7 +15,10 @@ import ThreedsLoading from "../MWCreditCard/TDSPay/ThreedsLoading";
 import { Context } from "../../model";
 import { getPayGroupParamsFromStorage } from "../../payGroup";
 import useEngineContext from "../../../../../hooks/useEngineContext";
+import usePaymentLogger from "../../../../../hooks/usePaymentLogger";
 import { clientPayment, formatFranchiseeRoute } from "../../utils";
+import { usePaymentRedirect } from "../hooks";
+import PaymentReturnContent from "../components/PaymentReturnContent";
 /**
  * @title: 谷歌支付
  * @description:
@@ -26,7 +29,7 @@ import { clientPayment, formatFranchiseeRoute } from "../../utils";
  * @Date: 2024-08-16 11:01
  */
 var GooglePay = function GooglePay(props, ref) {
-  var _context$appHelper, _context$appHelper2;
+  var _context$appHelper, _context$appHelper2, _state$payGroup, _state$payGroup2, _state$payGroup4;
   var _useContext = useContext(Context),
     state = _useContext.state;
   var _useState = useState(false),
@@ -39,6 +42,21 @@ var GooglePay = function GooglePay(props, ref) {
   var _context$appHelper$ut = (_context$appHelper2 = context.appHelper) === null || _context$appHelper2 === void 0 ? void 0 : _context$appHelper2.utils,
     interaction = _context$appHelper$ut.interaction;
 
+  // GooglePay支付日志记录器
+  var paymentLogger = usePaymentLogger({
+    orderId: ((_state$payGroup = state.payGroup) === null || _state$payGroup === void 0 ? void 0 : _state$payGroup.order_id) || 'unknown',
+    step: '2'
+  });
+
+  // 使用支付跳转 hooks
+  var _usePaymentRedirect = usePaymentRedirect({
+      orderId: (_state$payGroup2 = state.payGroup) === null || _state$payGroup2 === void 0 ? void 0 : _state$payGroup2.order_id,
+      paymentType: 'googlePay'
+    }),
+    isReturned = _usePaymentRedirect.isReturned,
+    handleRedirect = _usePaymentRedirect.handleRedirect,
+    resetState = _usePaymentRedirect.resetState;
+
   /**
    * @title: 初始化
    * @description:
@@ -50,52 +68,101 @@ var GooglePay = function GooglePay(props, ref) {
   var init = /*#__PURE__*/function () {
     var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref2) {
       var _utils$getStore, _interaction$utils, _interaction$utils$is, _interaction$utils2, _interaction$utils2$i;
-      var payGroup, utils, dvaStore, values, _dvaStore$core, _dvaStore$core2, _state$payGroup, locale, shopId, currentURL, linkElement, shop_domain, _href;
+      var payGroup, utils, dvaStore, values, _dvaStore$core, _dvaStore$core2, _state$payGroup3, locale, shopId, currentURL, linkElement, shop_domain, _href;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             payGroup = _ref2.payGroup;
+            // 记录GooglePay初始化开始
+            paymentLogger.addLog({
+              key: 'GooglePay初始化开始',
+              value: ''
+            });
+            setOpen(true);
             utils = context.appHelper.utils || {};
             dvaStore = utils === null || utils === void 0 || (_utils$getStore = utils.getStore) === null || _utils$getStore === void 0 || (_utils$getStore = _utils$getStore.call(utils)) === null || _utils$getStore === void 0 ? void 0 : _utils$getStore.getState(); // 获取交易组
             values = getPayGroupParamsFromStorage(payGroup.order_id);
+            if (values) {
+              _context.next = 11;
+              break;
+            }
+            // 记录获取支付参数失败
+            paymentLogger.addLog({
+              key: 'GooglePay获取支付参数失败',
+              value: {
+                title: "\u8BA2\u5355".concat(payGroup === null || payGroup === void 0 ? void 0 : payGroup.order_id, " \u672A\u627E\u5230\u5B58\u50A8\u7684\u652F\u4ED8\u53C2\u6570"),
+                data: {
+                  payGroup: payGroup
+                }
+              }
+            });
+            paymentLogger.sendLogs('GooglePay获取支付参数失败');
+            setOpen(false);
+            return _context.abrupt("return");
+          case 11:
+            // 记录获取支付参数成功
+            paymentLogger.addLog({
+              key: 'GooglePay获取支付参数成功',
+              value: ''
+            });
             if (!(interaction !== null && interaction !== void 0 && (_interaction$utils = interaction.utils) !== null && _interaction$utils !== void 0 && (_interaction$utils$is = _interaction$utils.isAppEnv) !== null && _interaction$utils$is !== void 0 && _interaction$utils$is.call(_interaction$utils) && (interaction === null || interaction === void 0 || (_interaction$utils2 = interaction.utils) === null || _interaction$utils2 === void 0 || (_interaction$utils2$i = _interaction$utils2.isAndroid_ios) === null || _interaction$utils2$i === void 0 ? void 0 : _interaction$utils2$i.call(_interaction$utils2)) === 'android')) {
-              _context.next = 6;
+              _context.next = 16;
               break;
             }
+            // 记录Android客户端支付
+            paymentLogger.addLog({
+              key: 'GooglePay使用Android客户端支付',
+              value: ''
+            });
+            paymentLogger.sendLogs('GooglePay客户端支付');
             return _context.abrupt("return", clientPayment({
               order_id: payGroup.order_id,
               type: 'google_pay',
               values: values,
               interaction: interaction
             }));
-          case 6:
-            setOpen(true);
-            if (values) {
-              _context.next = 10;
-              break;
-            }
-            setOpen(false);
-            return _context.abrupt("return");
-          case 10:
-            try {
-              locale = ((_dvaStore$core = dvaStore.core) === null || _dvaStore$core === void 0 ? void 0 : _dvaStore$core.translateLocale) || 'en';
-              shopId = (_dvaStore$core2 = dvaStore.core) === null || _dvaStore$core2 === void 0 || (_dvaStore$core2 = _dvaStore$core2.core) === null || _dvaStore$core2 === void 0 || (_dvaStore$core2 = _dvaStore$core2.shop) === null || _dvaStore$core2 === void 0 ? void 0 : _dvaStore$core2.id;
-              currentURL = window.location.href; // 创建一个a元素，用于解析URL
-              linkElement = document.createElement('a');
-              linkElement.href = currentURL;
+          case 16:
+            _context.prev = 16;
+            locale = ((_dvaStore$core = dvaStore.core) === null || _dvaStore$core === void 0 ? void 0 : _dvaStore$core.translateLocale) || 'en';
+            shopId = (_dvaStore$core2 = dvaStore.core) === null || _dvaStore$core2 === void 0 || (_dvaStore$core2 = _dvaStore$core2.core) === null || _dvaStore$core2 === void 0 || (_dvaStore$core2 = _dvaStore$core2.shop) === null || _dvaStore$core2 === void 0 ? void 0 : _dvaStore$core2.id;
+            currentURL = window.location.href; // 创建一个a元素，用于解析URL
+            linkElement = document.createElement('a');
+            linkElement.href = currentURL;
 
-              // 提取域名
-              shop_domain = linkElement.hostname;
-              _href = "".concat(config.pay).concat(formatFranchiseeRoute("/google-pay?order_id=".concat((_state$payGroup = state.payGroup) === null || _state$payGroup === void 0 ? void 0 : _state$payGroup.order_id, "&shop_id=").concat(shopId, "&locale=").concat(locale, "&shop_domain=").concat(shop_domain, "&total_amount=").concat(values.amount, "&payment_group_id=").concat(values.payment_group_id), state.history));
-              window.location.href = _href;
-            } catch (err) {
-              setOpen(false);
-            }
-          case 11:
+            // 提取域名
+            shop_domain = linkElement.hostname;
+            _href = "".concat(config.pay).concat(formatFranchiseeRoute("/google-pay?order_id=".concat((_state$payGroup3 = state.payGroup) === null || _state$payGroup3 === void 0 ? void 0 : _state$payGroup3.order_id, "&shop_id=").concat(shopId, "&locale=").concat(locale, "&shop_domain=").concat(shop_domain, "&total_amount=").concat(values.amount, "&payment_group_id=").concat(values.payment_group_id, "&front_order_uuid=").concat(state.front_order_uuid, "&is_replace_router=1"), state.history)); // 记录即将跳转到GooglePay
+            paymentLogger.addLog({
+              key: 'GooglePay准备跳转',
+              value: ''
+            });
+            paymentLogger.sendLogs('GooglePay跳转成功');
+            _context.next = 28;
+            return handleRedirect(_href);
+          case 28:
+            _context.next = 35;
+            break;
+          case 30:
+            _context.prev = 30;
+            _context.t0 = _context["catch"](16);
+            // 记录GooglePay处理错误
+            paymentLogger.addLog({
+              key: 'GooglePay处理错误',
+              value: {
+                title: "\u8BA2\u5355".concat(payGroup === null || payGroup === void 0 ? void 0 : payGroup.order_id, " GooglePay\u5904\u7406\u5931\u8D25: ").concat((_context.t0 === null || _context.t0 === void 0 ? void 0 : _context.t0.message) || '未知错误'),
+                data: {
+                  payGroup: payGroup,
+                  values: values
+                }
+              }
+            });
+            paymentLogger.sendLogs('GooglePay处理失败', _context.t0);
+            setOpen(false);
+          case 35:
           case "end":
             return _context.stop();
         }
-      }, _callee);
+      }, _callee, null, [[16, 30]]);
     }));
     return function init(_x) {
       return _ref3.apply(this, arguments);
@@ -106,6 +173,10 @@ var GooglePay = function GooglePay(props, ref) {
       init: init
     };
   });
+  var handleReturn = function handleReturn() {
+    setOpen(false);
+    resetState();
+  };
   return /*#__PURE__*/React.createElement(PisellModal, {
     platform: 'h5',
     open: open,
@@ -117,8 +188,16 @@ var GooglePay = function GooglePay(props, ref) {
     }
   }, /*#__PURE__*/React.createElement("div", {
     className: ""
-  }, /*#__PURE__*/React.createElement(ThreedsLoading, {
+  }, !isReturned && /*#__PURE__*/React.createElement(ThreedsLoading, {
     title: locales.getText('tocPay.text.connectingGooglePay')
+  }), isReturned &&
+  /*#__PURE__*/
+  // 跳转后返回时展示新组件内容
+  React.createElement(PaymentReturnContent, {
+    handleReturn: handleReturn,
+    state: state,
+    orderId: (_state$payGroup4 = state.payGroup) === null || _state$payGroup4 === void 0 ? void 0 : _state$payGroup4.order_id,
+    unique_payment_number: state.front_order_uuid
   })));
 };
 export default /*#__PURE__*/forwardRef(GooglePay);

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

@@ -476,16 +476,7 @@ export var createChallengeIframe = function createChallengeIframe(challengeData,
   // 返回iframe
   return new Promise(function (res, rej) {
     var timer = null;
-
-    // 120秒没成功 认为失败
-    timer = setTimeout(function () {
-      log({
-        msg: '第五步: 60秒超时则走N逻辑',
-        data: challengeData
-      });
-      rej('time out');
-    }, 2 * 60 * 1000);
-    window.addEventListener('message', function (event) {
+    var handleMessage = function handleMessage(event) {
       // loadingSpinnerAnimation("on");
       if (event.origin.indexOf(postmessageUrl) !== -1 || event.origin.indexOf('securesuite') !== -1) {
         if (typeof event.data.cres == 'string') {
@@ -496,7 +487,18 @@ export var createChallengeIframe = function createChallengeIframe(challengeData,
           closeIframe();
         }
       }
-    }, false);
+    };
+
+    // 120秒没成功 认为失败
+    timer = setTimeout(function () {
+      log({
+        msg: '第五步: 60秒超时则走N逻辑',
+        data: challengeData
+      });
+      window.removeEventListener('message', handleMessage);
+      rej('time out');
+    }, 2 * 60 * 1000);
+    window.addEventListener('message', handleMessage, false);
   });
 };
 

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

@@ -6,6 +6,7 @@ import { useImperativeHandle, forwardRef, useContext } from 'react';
 import { offlinePayment } from "./serve";
 import { Context } from "../../model";
 import { getPayGroupParamsFromStorage } from "../../payGroup";
+import usePaymentLogger from "../../../../../hooks/usePaymentLogger";
 import "./index.less";
 /**
  * @title: 线下支付
@@ -17,9 +18,16 @@ import "./index.less";
  * @Date: 2024-08-16 11:16
  */
 var OfflinePayment = function OfflinePayment(props, ref) {
+  var _state$payGroup;
   var _useContext = useContext(Context),
     state = _useContext.state;
 
+  // OfflinePayment支付日志记录器
+  var paymentLogger = usePaymentLogger({
+    orderId: ((_state$payGroup = state.payGroup) === null || _state$payGroup === void 0 ? void 0 : _state$payGroup.order_id) || 'unknown',
+    step: '2'
+  });
+
   /**
    * @title: 初始化
    * @description:
@@ -30,34 +38,91 @@ var OfflinePayment = function OfflinePayment(props, ref) {
    */
   var init = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
-      var _item$params;
-      var payGroup, _item, params;
+      var payGroup, _item$params, _item$params2, _item, params;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             payGroup = _ref.payGroup;
+            _context.prev = 1;
+            // 记录OfflinePayment初始化开始
+            paymentLogger.addLog({
+              key: 'OfflinePayment初始化开始',
+              value: ""
+            });
             _item = payGroup === null || payGroup === void 0 ? void 0 : payGroup.otherPayment; // 获取交易组信息
             params = getPayGroupParamsFromStorage(payGroup === null || payGroup === void 0 ? void 0 : payGroup.order_id, {
               order_id: payGroup === null || payGroup === void 0 ? void 0 : payGroup.order_id,
               payment_method: _item === null || _item === void 0 || (_item$params = _item.params) === null || _item$params === void 0 ? void 0 : _item$params.payment_method
             });
             if (params) {
-              _context.next = 5;
+              _context.next = 9;
               break;
             }
+            // 记录获取支付参数失败
+            paymentLogger.addLog({
+              key: 'OfflinePayment获取支付参数失败',
+              value: {
+                title: "\u8BA2\u5355".concat(payGroup === null || payGroup === void 0 ? void 0 : payGroup.order_id, " \u672A\u627E\u5230\u5B58\u50A8\u7684\u652F\u4ED8\u53C2\u6570"),
+                data: {
+                  payGroup: payGroup
+                }
+              }
+            });
+            paymentLogger.sendLogs('OfflinePayment获取支付参数失败');
             return _context.abrupt("return");
-          case 5:
-            _context.next = 7;
+          case 9:
+            // 记录获取支付参数成功
+            paymentLogger.addLog({
+              key: 'OfflinePayment获取支付参数成功',
+              value: ""
+            });
+
+            // 记录开始执行线下支付
+            paymentLogger.addLog({
+              key: 'OfflinePayment开始执行支付',
+              value: {
+                title: "\u8BA2\u5355".concat(payGroup === null || payGroup === void 0 ? void 0 : payGroup.order_id, " \u5F00\u59CB\u6267\u884C\u7EBF\u4E0B\u652F\u4ED8"),
+                data: {
+                  params: params,
+                  paymentMethod: _item === null || _item === void 0 || (_item$params2 = _item.params) === null || _item$params2 === void 0 ? void 0 : _item$params2.payment_method
+                }
+              }
+            });
+
+            // 支付
+            _context.next = 13;
             return offlinePayment(params);
-          case 7:
+          case 13:
+            // 记录支付成功
+            paymentLogger.addLog({
+              key: 'OfflinePayment支付成功',
+              value: ""
+            });
+            paymentLogger.sendLogs('OfflinePayment支付成功');
             state.payCallback({
               key: 'success'
             });
-          case 8:
+            _context.next = 22;
+            break;
+          case 18:
+            _context.prev = 18;
+            _context.t0 = _context["catch"](1);
+            // 记录OfflinePayment处理错误
+            paymentLogger.addLog({
+              key: 'OfflinePayment处理错误',
+              value: {
+                title: "\u8BA2\u5355".concat(payGroup === null || payGroup === void 0 ? void 0 : payGroup.order_id, " OfflinePayment\u5904\u7406\u5931\u8D25: ").concat((_context.t0 === null || _context.t0 === void 0 ? void 0 : _context.t0.message) || '未知错误'),
+                data: {
+                  payGroup: payGroup
+                }
+              }
+            });
+            paymentLogger.sendLogs('OfflinePayment处理失败', _context.t0);
+          case 22:
           case "end":
             return _context.stop();
         }
-      }, _callee);
+      }, _callee, null, [[1, 18]]);
     }));
     return function init(_x) {
       return _ref2.apply(this, arguments);

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

@@ -5,6 +5,7 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
 import { useImperativeHandle, forwardRef, useContext } from 'react';
 import { Context } from "../../model";
 import useEngineContext from "../../../../../hooks/useEngineContext";
+import usePaymentLogger from "../../../../../hooks/usePaymentLogger";
 import "./index.less";
 /**
  * @title: StripePay
@@ -16,10 +17,17 @@ import "./index.less";
  * @Date: 2024-08-16 11:17
  */
 var StripePay = function StripePay(props, ref) {
-  var _useContext = useContext(Context),
-    state = _useContext.state;
+  var _state$payGroup;
+  var _ref = useContext(Context),
+    state = _ref.state;
   var context = useEngineContext();
 
+  // StripePay支付日志记录器
+  var paymentLogger = usePaymentLogger({
+    orderId: (state === null || state === void 0 || (_state$payGroup = state.payGroup) === null || _state$payGroup === void 0 ? void 0 : _state$payGroup.order_id) || 'unknown',
+    step: '2'
+  });
+
   /**
    * @title: 初始化
    * @description:
@@ -29,19 +37,42 @@ var StripePay = function StripePay(props, ref) {
    * @Date: 2024-08-16 11:17
    */
   var init = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
-      var payGroup, _context$appHelper, _item, platform;
+    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref2) {
+      var payGroup, _context$appHelper, _item, platform, redirectUrl;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            payGroup = _ref.payGroup;
-            _context.prev = 1;
+            payGroup = _ref2.payGroup;
+            // 记录StripePay初始化开始
+            paymentLogger.addLog({
+              key: 'StripePay初始化开始',
+              value: ""
+            });
+            _context.prev = 2;
             _item = payGroup === null || payGroup === void 0 ? void 0 : payGroup.otherPayment;
-            platform = ((_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 || (_context$appHelper = _context$appHelper.constants) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.platform) || 'h5'; // pc打开弹窗
+            platform = ((_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 || (_context$appHelper = _context$appHelper.constants) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.platform) || 'h5'; // 记录平台信息
+            paymentLogger.addLog({
+              key: 'StripePay平台检测',
+              value: {
+                platform: platform,
+                paymentItem: _item
+              }
+            });
+
+            // pc打开弹窗
             if (!(platform === 'pc')) {
-              _context.next = 7;
+              _context.next = 11;
               break;
             }
+            // 记录PC端回调准备
+            paymentLogger.addLog({
+              key: 'StripePay PC端回调准备',
+              value: {
+                service: _item.service,
+                orderId: payGroup.order_id,
+                paymentMethod: _item.title
+              }
+            });
             state.payCallback({
               key: _item.service,
               data: {
@@ -49,23 +80,43 @@ var StripePay = function StripePay(props, ref) {
                 payment_method: _item.title
               }
             });
+            paymentLogger.sendLogs('StripePay PC端回调成功');
             return _context.abrupt("return");
-          case 7:
+          case 11:
             // h5跳转页面
-            state.history.push("/pay/stripe?order_id=".concat(payGroup.order_id, "&payment_method=").concat(encodeURIComponent(_item.title)));
-            _context.next = 12;
+            redirectUrl = "/pay/stripe?order_id=".concat(payGroup.order_id, "&payment_method=").concat(encodeURIComponent(_item.title)); // 记录H5端跳转准备
+            paymentLogger.addLog({
+              key: 'StripePay H5端跳转准备',
+              value: {
+                redirectUrl: redirectUrl
+              }
+            });
+            state.history.push(redirectUrl);
+            paymentLogger.sendLogs('StripePay H5端跳转成功');
+            _context.next = 21;
             break;
-          case 10:
-            _context.prev = 10;
-            _context.t0 = _context["catch"](1);
-          case 12:
+          case 17:
+            _context.prev = 17;
+            _context.t0 = _context["catch"](2);
+            // 记录StripePay处理错误
+            paymentLogger.addLog({
+              key: 'StripePay处理错误',
+              value: {
+                title: "\u8BA2\u5355".concat(payGroup === null || payGroup === void 0 ? void 0 : payGroup.order_id, " StripePay\u5904\u7406\u5931\u8D25: ").concat((_context.t0 === null || _context.t0 === void 0 ? void 0 : _context.t0.message) || '未知错误'),
+                data: {
+                  payGroup: payGroup
+                }
+              }
+            });
+            paymentLogger.sendLogs('StripePay处理失败', _context.t0);
+          case 21:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[1, 10]]);
+      }, _callee, null, [[2, 17]]);
     }));
     return function init(_x) {
-      return _ref2.apply(this, arguments);
+      return _ref3.apply(this, arguments);
     };
   }();
   useImperativeHandle(ref, function () {