@pisell/private-materials 6.6.3 → 6.6.4

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

@@ -11,11 +11,13 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useState, useImperativeHandle, forwardRef, useContext } from 'react';
 import { PisellModal } from '@pisell/materials';
 import ThreedsLoading from "../MWCreditCard/TDSPay/ThreedsLoading";
+import PaymentReturnContent from "../components/PaymentReturnContent";
 import { Context } from "../../model";
 import { locales } from '@pisell/utils';
 import { getPayGroupParamsFromStorage } from "../../payGroup";
 import useEngineContext from "../../../../../hooks/useEngineContext";
 import usePaymentLogger from "../../../../../hooks/usePaymentLogger";
+import { usePaymentRedirect } from "../hooks";
 import "./index.less";
 import { formatFranchiseeRoute } from "../../utils";
 /**
@@ -28,7 +30,7 @@ import { formatFranchiseeRoute } from "../../utils";
  * @Date: 2024-08-16 10:58
  */
 var ApplePay = function ApplePay(props, ref) {
-  var _context$appHelper, _state$payGroup;
+  var _context$appHelper, _state$payGroup, _state$payGroup2, _state$payGroup4;
   var _useContext = useContext(Context),
     state = _useContext.state;
   var _useState = useState(false),
@@ -45,6 +47,15 @@ var ApplePay = function ApplePay(props, ref) {
     step: '2'
   });
 
+  // 使用支付跳转 hooks
+  var _usePaymentRedirect = usePaymentRedirect({
+      orderId: (_state$payGroup2 = state.payGroup) === null || _state$payGroup2 === void 0 ? void 0 : _state$payGroup2.order_id,
+      paymentType: 'applePay'
+    }),
+    isReturned = _usePaymentRedirect.isReturned,
+    handleRedirect = _usePaymentRedirect.handleRedirect,
+    resetState = _usePaymentRedirect.resetState;
+
   /**
    * @title: 初始化
    * @description:
@@ -56,7 +67,7 @@ var ApplePay = function ApplePay(props, ref) {
   var init = /*#__PURE__*/function () {
     var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref2) {
       var _utils$getStore;
-      var payGroup, utils, dvaStore, values, _dvaStore$core, _dvaStore$core2, _state$payGroup2, 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:
@@ -95,43 +106,50 @@ var ApplePay = function ApplePay(props, ref) {
               key: 'ApplePay获取支付参数成功',
               value: ""
             });
-            try {
-              // 语言
-              locale = ((_dvaStore$core = dvaStore.core) === null || _dvaStore$core === void 0 ? void 0 : _dvaStore$core.translateLocale) || 'en'; // 店铺id
-              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; // 当前url
-              currentURL = window.location.href; // 创建一个a元素，用于解析URL
-              linkElement = document.createElement('a');
-              linkElement.href = currentURL;
+            _context.prev = 12;
+            // 语言
+            locale = ((_dvaStore$core = dvaStore.core) === null || _dvaStore$core === void 0 ? void 0 : _dvaStore$core.translateLocale) || 'en'; // 店铺id
+            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; // 当前url
+            currentURL = window.location.href; // 创建一个a元素，用于解析URL
+            linkElement = document.createElement('a');
+            linkElement.href = currentURL;
+
+            // 提取域名
+            shop_domain = linkElement.hostname;
+            _href = "".concat(config.pay).concat(formatFranchiseeRoute("/apple-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)); // 记录即将跳转到ApplePay
+            paymentLogger.addLog({
+              key: 'ApplePay准备跳转',
+              value: ""
+            });
+            paymentLogger.sendLogs('ApplePay跳转成功');
 
-              // 提取域名
-              shop_domain = linkElement.hostname;
-              _href = "".concat(config.pay).concat(formatFranchiseeRoute("/apple-pay?order_id=".concat((_state$payGroup2 = state.payGroup) === null || _state$payGroup2 === void 0 ? void 0 : _state$payGroup2.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)); // 记录即将跳转到ApplePay
-              paymentLogger.addLog({
-                key: 'ApplePay准备跳转',
-                value: ""
-              });
-              paymentLogger.sendLogs('ApplePay跳转成功');
-              window.location.href = _href;
-            } catch (err) {
-              // 记录ApplePay处理错误
-              paymentLogger.addLog({
-                key: 'ApplePay处理错误',
-                value: {
-                  title: "\u8BA2\u5355".concat(payGroup === null || payGroup === void 0 ? void 0 : payGroup.order_id, " ApplePay\u5904\u7406\u5931\u8D25: ").concat((err === null || err === void 0 ? void 0 : err.message) || '未知错误'),
-                  data: {
-                    payGroup: payGroup,
-                    values: values
-                  }
+            // 使用 hooks 提供的跳转方法
+            _context.next = 24;
+            return handleRedirect(_href);
+          case 24:
+            _context.next = 31;
+            break;
+          case 26:
+            _context.prev = 26;
+            _context.t0 = _context["catch"](12);
+            // 记录ApplePay处理错误
+            paymentLogger.addLog({
+              key: 'ApplePay处理错误',
+              value: {
+                title: "\u8BA2\u5355".concat(payGroup === null || payGroup === void 0 ? void 0 : payGroup.order_id, " ApplePay\u5904\u7406\u5931\u8D25: ").concat((_context.t0 === null || _context.t0 === void 0 ? void 0 : _context.t0.message) || '未知错误'),
+                data: {
+                  payGroup: payGroup,
+                  values: values
                 }
-              });
-              paymentLogger.sendLogs('ApplePay处理失败', err);
-              setOpen(false);
-            }
-          case 13:
+              }
+            });
+            paymentLogger.sendLogs('ApplePay处理失败', _context.t0);
+            setOpen(false);
+          case 31:
           case "end":
             return _context.stop();
         }
-      }, _callee);
+      }, _callee, null, [[12, 26]]);
     }));
     return function init(_x) {
       return _ref3.apply(this, arguments);
@@ -142,6 +160,10 @@ var ApplePay = function ApplePay(props, ref) {
       init: init
     };
   });
+  var handleReturn = function handleReturn() {
+    setOpen(false);
+    resetState();
+  };
   return /*#__PURE__*/React.createElement(PisellModal, {
     platform: 'h5',
     open: open,
@@ -153,8 +175,19 @@ var ApplePay = function ApplePay(props, ref) {
     }
   }, /*#__PURE__*/React.createElement("div", {
     className: ""
-  }, /*#__PURE__*/React.createElement(ThreedsLoading, {
+  }, !isReturned &&
+  /*#__PURE__*/
+  // 跳转前展示 Loading
+  React.createElement(ThreedsLoading, {
     title: locales.getText('tocPay.text.connectingApplePay')
+  }), 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 === null || state === void 0 ? void 0 : state.front_order_uuid
   })));
 };
 export default /*#__PURE__*/forwardRef(ApplePay);

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

@@ -17,6 +17,8 @@ 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:
@@ -27,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, _state$payGroup;
+  var _context$appHelper, _context$appHelper2, _state$payGroup, _state$payGroup2, _state$payGroup4;
   var _useContext = useContext(Context),
     state = _useContext.state;
   var _useState = useState(false),
@@ -46,6 +48,15 @@ var GooglePay = function GooglePay(props, ref) {
     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:
@@ -57,7 +68,7 @@ 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$payGroup2, 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:
@@ -65,13 +76,14 @@ var GooglePay = function GooglePay(props, ref) {
             // 记录GooglePay初始化开始
             paymentLogger.addLog({
               key: 'GooglePay初始化开始',
-              value: ""
+              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 = 10;
+              _context.next = 11;
               break;
             }
             // 记录获取支付参数失败
@@ -87,20 +99,20 @@ var GooglePay = function GooglePay(props, ref) {
             paymentLogger.sendLogs('GooglePay获取支付参数失败');
             setOpen(false);
             return _context.abrupt("return");
-          case 10:
+          case 11:
             // 记录获取支付参数成功
             paymentLogger.addLog({
               key: 'GooglePay获取支付参数成功',
-              value: ""
+              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 = 15;
+              _context.next = 16;
               break;
             }
             // 记录Android客户端支付
             paymentLogger.addLog({
               key: 'GooglePay使用Android客户端支付',
-              value: ""
+              value: ''
             });
             paymentLogger.sendLogs('GooglePay客户端支付');
             return _context.abrupt("return", clientPayment({
@@ -109,44 +121,48 @@ var GooglePay = function GooglePay(props, ref) {
               values: values,
               interaction: interaction
             }));
-          case 15:
-            setOpen(true);
-            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$payGroup2 = state.payGroup) === null || _state$payGroup2 === void 0 ? void 0 : _state$payGroup2.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)); // 记录即将跳转到GooglePay
-              paymentLogger.addLog({
-                key: 'GooglePay准备跳转',
-                value: ""
-              });
-              paymentLogger.sendLogs('GooglePay跳转成功');
-              window.location.href = _href;
-            } catch (err) {
-              // 记录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((err === null || err === void 0 ? void 0 : err.message) || '未知错误'),
-                  data: {
-                    payGroup: payGroup,
-                    values: values
-                  }
+            // 提取域名
+            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处理失败', err);
-              setOpen(false);
-            }
-          case 17:
+              }
+            });
+            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);
@@ -157,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,
@@ -168,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/StripePay/Stripe/StripeSDK/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 declare const StripeSDK: ({ public_key, client_secret, children, lang, }: {
     public_key: string;
     client_secret?: string | undefined;

package/es/components/pay/toC/PaymentMethods/StripePay/Stripe/components/SetupForm/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const SetupForm: ({ onReady, amount, order_id, payment_method, scene, }: any) => JSX.Element;
 export default SetupForm;

package/es/components/pay/toC/PaymentMethods/StripePay/Stripe/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.module.less';
 declare const StripePayment: () => JSX.Element;
 export default StripePayment;

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

@@ -19,6 +19,8 @@ import "./index.less";
 import useEngineContext from "../../../../../hooks/useEngineContext";
 import usePaymentLogger from "../../../../../hooks/usePaymentLogger";
 import { clientPayment } from "../../utils";
+import { usePaymentRedirect } from "../hooks";
+import PaymentReturnContent from "../components/PaymentReturnContent";
 /**
  * @title: 支付宝支付
  * @description:
@@ -27,7 +29,7 @@ import { clientPayment } from "../../utils";
  * @Date: 2024-08-16 11:18
  */
 var SuperPayAliPayH5 = function SuperPayAliPayH5(props, ref) {
-  var _context$appHelper, _state$payGroup;
+  var _context$appHelper, _state$payGroup, _state$payGroup2, _state$payGroup3;
   var _useContext = useContext(Context),
     state = _useContext.state;
   var onChange = props.onChange;
@@ -39,6 +41,10 @@ var SuperPayAliPayH5 = function SuperPayAliPayH5(props, ref) {
     _useState4 = _slicedToArray(_useState3, 2),
     showSuccessBackButton = _useState4[0],
     setShowSuccessBackButton = _useState4[1];
+  var _useState5 = useState(''),
+    _useState6 = _slicedToArray(_useState5, 2),
+    statePayNumber = _useState6[0],
+    setStatePayNumber = _useState6[1];
   var context = useEngineContext();
   var _context$appHelper$ut = (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.utils,
     interaction = _context$appHelper$ut.interaction;
@@ -49,6 +55,15 @@ var SuperPayAliPayH5 = function SuperPayAliPayH5(props, ref) {
     step: '2'
   });
 
+  // 使用支付跳转 hooks
+  var _usePaymentRedirect = usePaymentRedirect({
+      orderId: (_state$payGroup2 = state.payGroup) === null || _state$payGroup2 === void 0 ? void 0 : _state$payGroup2.order_id,
+      paymentType: 'aliPay'
+    }),
+    isReturned = _usePaymentRedirect.isReturned,
+    handleRedirect = _usePaymentRedirect.handleRedirect,
+    resetState = _usePaymentRedirect.resetState;
+
   /**
    * @title: 初始化
    * @description:
@@ -68,7 +83,7 @@ var SuperPayAliPayH5 = function SuperPayAliPayH5(props, ref) {
             // 记录SuperPayAliPayH5初始化开始
             paymentLogger.addLog({
               key: 'SuperPayAliPayH5初始化开始',
-              value: ""
+              value: ''
             });
 
             // 交易组
@@ -80,7 +95,7 @@ var SuperPayAliPayH5 = function SuperPayAliPayH5(props, ref) {
             // 记录App环境检测
             paymentLogger.addLog({
               key: 'SuperPayAliPayH5App环境检测',
-              value: "检测到App环境，调用客户端支付"
+              value: '检测到App环境，调用客户端支付'
             });
             paymentLogger.sendLogs('SuperPayAliPayH5App环境支付');
             return _context.abrupt("return", clientPayment({
@@ -112,51 +127,57 @@ var SuperPayAliPayH5 = function SuperPayAliPayH5(props, ref) {
             // 记录获取支付参数成功
             paymentLogger.addLog({
               key: 'SuperPayAliPayH5获取支付参数成功',
-              value: ""
+              value: ''
             });
             _context.prev = 14;
             _context.next = 17;
             return getAliPayUrl(payGroup.order_id, values);
           case 17:
             data = _context.sent;
-            if (data !== null && data !== void 0 && data.pay_url) {
-              // 记录获取支付宝支付链接成功
-              paymentLogger.addLog({
-                key: 'SuperPayAliPayH5获取支付链接成功',
-                value: ""
-              });
-
-              // 设置交易号
-              setPayNumber(payGroup === null || payGroup === void 0 ? void 0 : payGroup.order_id, data === null || data === void 0 ? void 0 : data.pay_number);
-              setShowSuccessBackButton(true);
+            if (!(data !== null && data !== void 0 && data.pay_url)) {
+              _context.next = 29;
+              break;
+            }
+            // 记录获取支付宝支付链接成功
+            paymentLogger.addLog({
+              key: 'SuperPayAliPayH5获取支付链接成功',
+              value: ''
+            });
 
-              // 记录即将跳转到支付宝
-              paymentLogger.addLog({
-                key: 'SuperPayAliPayH5准备跳转支付宝',
-                value: ""
-              });
-              paymentLogger.sendLogs('SuperPayAliPayH5跳转成功');
+            // 设置交易号
+            setPayNumber(payGroup === null || payGroup === void 0 ? void 0 : payGroup.order_id, data === null || data === void 0 ? void 0 : data.pay_number);
+            setStatePayNumber(data === null || data === void 0 ? void 0 : data.pay_number);
+            setShowSuccessBackButton(true);
 
-              // 跳转
-              window.location.href = data === null || data === void 0 ? void 0 : data.pay_url;
-            } else {
-              // 记录支付链接为空
-              paymentLogger.addLog({
-                key: 'SuperPayAliPayH5支付链接为空',
-                value: {
-                  title: "\u8BA2\u5355".concat(payGroup === null || payGroup === void 0 ? void 0 : payGroup.order_id, " \u652F\u4ED8\u5B9D\u652F\u4ED8\u94FE\u63A5\u4E3A\u7A7A"),
-                  data: {
-                    response_data: data
-                  }
+            // 记录即将跳转到支付宝
+            paymentLogger.addLog({
+              key: 'SuperPayAliPayH5准备跳转支付宝',
+              value: ''
+            });
+            paymentLogger.sendLogs('SuperPayAliPayH5跳转成功');
+            _context.next = 27;
+            return handleRedirect(data === null || data === void 0 ? void 0 : data.pay_url);
+          case 27:
+            _context.next = 32;
+            break;
+          case 29:
+            // 记录支付链接为空
+            paymentLogger.addLog({
+              key: 'SuperPayAliPayH5支付链接为空',
+              value: {
+                title: "\u8BA2\u5355".concat(payGroup === null || payGroup === void 0 ? void 0 : payGroup.order_id, " \u652F\u4ED8\u5B9D\u652F\u4ED8\u94FE\u63A5\u4E3A\u7A7A"),
+                data: {
+                  response_data: data
                 }
-              });
-              paymentLogger.sendLogs('SuperPayAliPayH5支付链接为空');
-              setOpen(false);
-            }
-            _context.next = 26;
+              }
+            });
+            paymentLogger.sendLogs('SuperPayAliPayH5支付链接为空');
+            setOpen(false);
+          case 32:
+            _context.next = 39;
             break;
-          case 21:
-            _context.prev = 21;
+          case 34:
+            _context.prev = 34;
             _context.t0 = _context["catch"](14);
             // 记录SuperPayAliPayH5处理错误
             paymentLogger.addLog({
@@ -171,11 +192,11 @@ var SuperPayAliPayH5 = function SuperPayAliPayH5(props, ref) {
             });
             paymentLogger.sendLogs('SuperPayAliPayH5处理失败', _context.t0);
             setOpen(false);
-          case 26:
+          case 39:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[14, 21]]);
+      }, _callee, null, [[14, 34]]);
     }));
     return function init(_x) {
       return _ref2.apply(this, arguments);
@@ -192,6 +213,10 @@ var SuperPayAliPayH5 = function SuperPayAliPayH5(props, ref) {
       key: 'success'
     });
   };
+  var handleReturn = function handleReturn() {
+    setOpen(false);
+    resetState();
+  };
   return /*#__PURE__*/React.createElement(PisellModal, {
     platform: 'h5',
     open: open,
@@ -203,10 +228,16 @@ var SuperPayAliPayH5 = function SuperPayAliPayH5(props, ref) {
     }
   }, /*#__PURE__*/React.createElement("div", {
     className: ""
-  }, /*#__PURE__*/React.createElement(ThreedsLoading, {
+  }, !isReturned && /*#__PURE__*/React.createElement(ThreedsLoading, {
     title: locales.getText('tocPay.text.redirectingToAlipay'),
     onSuccessBack: handleSuccessBack,
     showSuccessBackButton: showSuccessBackButton
+  }), isReturned && /*#__PURE__*/React.createElement(PaymentReturnContent, {
+    pay_number: statePayNumber,
+    handleReturn: handleReturn,
+    state: state,
+    orderId: (_state$payGroup3 = state.payGroup) === null || _state$payGroup3 === void 0 ? void 0 : _state$payGroup3.order_id,
+    unique_payment_number: state.front_order_uuid
   })));
 };
 export default /*#__PURE__*/forwardRef(SuperPayAliPayH5);

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

@@ -50,6 +50,12 @@ export declare type WalletPassDataType = {
     shop: Shop;
     wallet_pass_usage?: any;
     balance_par_value: string;
+    custom_schedule_snapshot?: {
+        data: any[];
+    };
+    metadata?: {
+        validity_type: string;
+    };
 };
 declare type Shop = {
     id: number;

package/es/components/pay/toC/PaymentMethods/WalletPass/utils.js

@@ -11,7 +11,7 @@ var voucherTime = function voucherTime(data) {
 export var formatMachineCodeServer2CardList = function formatMachineCodeServer2CardList(data) {
   var selectId = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
   return (data || []).map(function (item) {
-    var _item$shop, _item$unified_message, _item$product;
+    var _item$shop, _item$unified_message, _item$product, _item$custom_schedule, _item$metadata;
     return {
       id: item.id,
       name: item.product_name,
@@ -30,7 +30,9 @@ export var formatMachineCodeServer2CardList = function formatMachineCodeServer2C
       cover: (_item$product = item.product) === null || _item$product === void 0 ? void 0 : _item$product.cover,
       qrCode: item.code,
       validDate: voucherTime(item),
-      originData: item
+      originData: item,
+      scheduleList: ((_item$custom_schedule = item.custom_schedule_snapshot) === null || _item$custom_schedule === void 0 ? void 0 : _item$custom_schedule.data) || [],
+      validDateBySchedule: ((_item$metadata = item.metadata) === null || _item$metadata === void 0 ? void 0 : _item$metadata.validity_type) === 'custom_schedule_validity'
     };
   });
 };

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

@@ -0,0 +1,15 @@
+import React from 'react';
+import './index.less';
+export interface PaymentReturnContentProps {
+    orderId?: string;
+    unique_payment_number?: string;
+    state?: any;
+    handleReturn?: () => void;
+    pay_number?: string;
+}
+/**
+ * 支付返回后展示的内容组件
+ * 当用户从外部支付页面返回时展示此组件
+ */
+declare const PaymentReturnContent: React.FC<PaymentReturnContentProps>;
+export default PaymentReturnContent;