@pisell/private-materials 6.5.27 → 6.7.1

package/es/components/eftposPay/linkly/index.js

@@ -1,4 +1,7 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -6,7 +9,7 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import React, { useEffect, useRef } from 'react';
 import { Button } from 'antd';
-import { locales } from '@pisell/utils';
+import { locales, sendWarningLog } from '@pisell/utils';
 import { useContextData, useDispatch, updateCustom, updateState, updateNextStep } from "../store";
 import { useFail, useStoreRef } from "../hooks";
 import useEngineContext from "../../../hooks/useEngineContext";
@@ -101,6 +104,7 @@ var Linkly = function Linkly(_ref) {
     failRef.current = fail;
   }, [fail]);
   useEffect(function () {
+    var _utils$isTerminal, _utils$interaction;
     if (statusRef.current === StatusEnum.Success || statusRef.current === StatusEnum.Fail) {
       return;
     }
@@ -114,7 +118,65 @@ var Linkly = function Linkly(_ref) {
       resultQuery();
       return;
     }
-    payOrRefund(resultQuery, handleLinklySuccess);
+
+    // 如果是terminal环境，判定当前页面是否处于活跃状态
+    if (utils !== null && utils !== void 0 && (_utils$isTerminal = utils.isTerminal) !== null && _utils$isTerminal !== void 0 && _utils$isTerminal.call(utils) && utils !== null && utils !== void 0 && (_utils$interaction = utils.interaction) !== null && _utils$interaction !== void 0 && (_utils$interaction = _utils$interaction.utils) !== null && _utils$interaction !== void 0 && _utils$interaction.asyncDataManager) {
+      var _payOrRefund = /*#__PURE__*/function () {
+        var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+          var _utils$interaction2, _utils$interaction2$a, activeStatus;
+          return _regeneratorRuntime().wrap(function _callee$(_context) {
+            while (1) switch (_context.prev = _context.next) {
+              case 0:
+                _context.prev = 0;
+                _context.next = 3;
+                return utils === null || utils === void 0 || (_utils$interaction2 = utils.interaction) === null || _utils$interaction2 === void 0 || (_utils$interaction2 = _utils$interaction2.utils) === null || _utils$interaction2 === void 0 || (_utils$interaction2$a = _utils$interaction2.asyncDataManager) === null || _utils$interaction2$a === void 0 ? void 0 : _utils$interaction2$a.call(_utils$interaction2, {
+                  module: 'get',
+                  key: 'pay_webview_active'
+                });
+              case 3:
+                activeStatus = _context.sent;
+                // 强判定不为 unActive 则进行支付，为了兼容老版本
+                if (activeStatus !== 'unActive') {
+                  payOrRefund(resultQuery, handleLinklySuccess);
+                } else {
+                  sendWarningLog({
+                    title: 'Linkly-支付-当前页面非活跃状态，无法进行支付',
+                    content: [{
+                      key: 'response',
+                      value: JSON.stringify({
+                        activeStatus: activeStatus
+                      })
+                    }]
+                  });
+                }
+                _context.next = 11;
+                break;
+              case 7:
+                _context.prev = 7;
+                _context.t0 = _context["catch"](0);
+                sendWarningLog({
+                  title: 'Linkly-支付-获取当前页面活跃状态失败',
+                  content: [{
+                    key: 'error',
+                    value: JSON.stringify(_context.t0)
+                  }]
+                });
+                // 如果获取活跃状态失败，则进行支付，防止流程卡死
+                payOrRefund(resultQuery, handleLinklySuccess);
+              case 11:
+              case "end":
+                return _context.stop();
+            }
+          }, _callee, null, [[0, 7]]);
+        }));
+        return function _payOrRefund() {
+          return _ref2.apply(this, arguments);
+        };
+      }();
+      _payOrRefund();
+    } else {
+      payOrRefund(resultQuery, handleLinklySuccess);
+    }
   }, []);
   useEffect(function () {
     return function () {

package/es/components/eftposPay/store/index.d.ts

@@ -174,7 +174,7 @@ export declare const updateCustom: (payload: {
 export declare const updateStatus: (status: 'loading' | 'warn' | 'fail' | 'success' | 'question') => {
     type: EActionTypes;
     payload: {
-        status: "loading" | "success" | "warn" | "fail" | "question";
+        status: "success" | "warn" | "loading" | "fail" | "question";
     };
 };
 /**
@@ -297,8 +297,8 @@ export declare const backUpFree: (payload: Partial<State>) => {
         amount?: string | number | undefined;
         mode?: "pay" | "refund" | "fullPay" | "query" | undefined;
         order_id?: string | number | undefined;
-        eftpos?: "stripe" | "payo" | "tyro" | "windcave" | "linkly" | undefined;
-        action?: "pay" | "amount" | "deviceList" | undefined;
+        eftpos?: "tyro" | "windcave" | "stripe" | "payo" | "linkly" | undefined;
+        action?: "amount" | "pay" | "deviceList" | undefined;
         key?: number | undefined;
         step?: number | undefined;
         title?: string | undefined;
@@ -308,7 +308,7 @@ export declare const backUpFree: (payload: Partial<State>) => {
         net?: boolean | undefined;
         component?: string | undefined;
         form?: string | undefined;
-        status?: "loading" | "success" | "warn" | "fail" | "pedding" | "resove" | "reject" | "question" | undefined;
+        status?: "success" | "warn" | "loading" | "fail" | "pedding" | "resove" | "reject" | "question" | undefined;
         warn?: string | undefined;
         steps?: {
             /** 用于重置当前步骤 */

package/es/components/index.d.ts

@@ -9,8 +9,8 @@ import ProductExtension from './productExtension';
 import RuleSetting from './ruleSetting';
 import TaxSelect from './taxSelect';
 import ToCPay from './pay/toC';
-import Wallet from './wallet';
 import WalletList from './walletList';
+import Wallet from './wallet';
 import WorkspaceListDetail from './workSpaceListDetail/';
 import WorkspaceList from './workSpaceList';
 import PisellSelectCustomerModal from './pisellSelectCustomerModal';
@@ -19,4 +19,5 @@ import EditBookingModal from './booking/editBookingModal';
 import StepController from './stepController';
 import PinModal from './pinModal';
 import PinVerifyModal from './pinVerifyModal';
-export { Login, BookingInfo, Booking, BookingNotes, BookingAddons, BookingForms, Schedules, ProductExtension, RuleSetting, TaxSelect, ToCPay, PisellSelectCustomerModal, Wallet, WalletList, WorkspaceList, WorkspaceListDetail, SubTotal, EditBookingModal, StepController, PinModal, PinVerifyModal, };
+import { OAuthConfig, SaaSAdminAuth, OrgAdminAuth, CustomerAuth, CustomerOAuthConfig, DeviceAuth, POSOperatorAuth, OnlineShopAuth, SaaSManagermentAuth } from './authentication/admin';
+export { Login, BookingInfo, Booking, BookingNotes, BookingAddons, BookingForms, Schedules, ProductExtension, RuleSetting, TaxSelect, ToCPay, PisellSelectCustomerModal, Wallet, WalletList, WorkspaceList, WorkspaceListDetail, SubTotal, EditBookingModal, StepController, PinModal, PinVerifyModal, OAuthConfig, SaaSAdminAuth, OrgAdminAuth, CustomerAuth, CustomerOAuthConfig, DeviceAuth, POSOperatorAuth, OnlineShopAuth, SaaSManagermentAuth, };

package/es/components/index.js

@@ -9,8 +9,8 @@ import ProductExtension from "./productExtension";
 import RuleSetting from "./ruleSetting";
 import TaxSelect from "./taxSelect";
 import ToCPay from "./pay/toC";
-import Wallet from "./wallet";
 import WalletList from "./walletList";
+import Wallet from "./wallet";
 import WorkspaceListDetail from "./workSpaceListDetail/";
 import WorkspaceList from "./workSpaceList";
 import PisellSelectCustomerModal from "./pisellSelectCustomerModal";
@@ -19,4 +19,5 @@ import EditBookingModal from "./booking/editBookingModal";
 import StepController from "./stepController";
 import PinModal from "./pinModal";
 import PinVerifyModal from "./pinVerifyModal";
-export { Login, BookingInfo, Booking, BookingNotes, BookingAddons, BookingForms, Schedules, ProductExtension, RuleSetting, TaxSelect, ToCPay, PisellSelectCustomerModal, Wallet, WalletList, WorkspaceList, WorkspaceListDetail, SubTotal, EditBookingModal, StepController, PinModal, PinVerifyModal };
+import { OAuthConfig, SaaSAdminAuth, OrgAdminAuth, CustomerAuth, CustomerOAuthConfig, DeviceAuth, POSOperatorAuth, OnlineShopAuth, SaaSManagermentAuth } from "./authentication/admin";
+export { Login, BookingInfo, Booking, BookingNotes, BookingAddons, BookingForms, Schedules, ProductExtension, RuleSetting, TaxSelect, ToCPay, PisellSelectCustomerModal, Wallet, WalletList, WorkspaceList, WorkspaceListDetail, SubTotal, EditBookingModal, StepController, PinModal, PinVerifyModal, OAuthConfig, SaaSAdminAuth, OrgAdminAuth, CustomerAuth, CustomerOAuthConfig, DeviceAuth, POSOperatorAuth, OnlineShopAuth, SaaSManagermentAuth };

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);