@pisell/private-materials 6.6.2 → 6.7.2

package/lib/components/checkout/locales.d.ts

@@ -154,7 +154,6 @@ declare const _default: {
         'wallet-pass-module-customer-name-walk-in': string;
         'pisell2.amount-summary.amount-cannot-be-zero': string;
         'pisell2.checkout.order-sync-failed': string;
-        'pisell2.checkout.order-create-failed': string;
         'pisell2.checkout.sync-retry-hint': string;
         'pisell2.checkout.tips': string;
         retry: string;
@@ -323,7 +322,6 @@ declare const _default: {
         'wallet-pass-module-customer-name-walk-in': string;
         'pisell2.amount-summary.amount-cannot-be-zero': string;
         'pisell2.checkout.order-sync-failed': string;
-        'pisell2.checkout.order-create-failed': string;
         'pisell2.checkout.sync-retry-hint': string;
         'pisell2.checkout.tips': string;
         retry: string;
@@ -492,7 +490,6 @@ declare const _default: {
         'wallet-pass-module-customer-name-walk-in': string;
         'pisell2.amount-summary.amount-cannot-be-zero': string;
         'pisell2.checkout.order-sync-failed': string;
-        'pisell2.checkout.order-create-failed': string;
         'pisell2.checkout.sync-retry-hint': string;
         'pisell2.checkout.tips': string;
         retry: string;

package/lib/components/checkout/locales.js

@@ -210,7 +210,6 @@ var locales_default = {
     "pisell2.amount-summary.amount-cannot-be-zero": "The amount cannot be 0",
     // Order sync errors
     "pisell2.checkout.order-sync-failed": "Order sync failed, please check your network",
-    "pisell2.checkout.order-create-failed": "Order create failed, please refresh app",
     "pisell2.checkout.sync-retry-hint": "Network error, please click the retry button to resync the order",
     "pisell2.checkout.tips": "Tips",
     "retry": "Retry",
@@ -416,7 +415,6 @@ var locales_default = {
     "pisell2.amount-summary.amount-cannot-be-zero": "金额不能为0",
     // Order sync errors
     "pisell2.checkout.order-sync-failed": "订单同步失败，请检查网络",
-    "pisell2.checkout.order-create-failed": "订单创建失败，请重启APP",
     "pisell2.checkout.sync-retry-hint": "网络异常，请点击重试按钮重新同步订单",
     "pisell2.checkout.tips": "提示",
     "retry": "重试",
@@ -622,7 +620,6 @@ var locales_default = {
     "pisell2.amount-summary.amount-cannot-be-zero": "金額不能為0",
     // Order sync errors
     "pisell2.checkout.order-sync-failed": "訂單同步失敗，請檢查網絡",
-    "pisell2.checkout.order-create-failed": "订单创建失败，请重启APP",
     "pisell2.checkout.sync-retry-hint": "網絡異常，請點擊重試按鈕重新同步訂單",
     "pisell2.checkout.tips": "提示",
     "retry": "重試",

package/lib/components/eftpos/deviceList/index.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const _default: ({ input, ...formItemProps }: any) => JSX.Element;
 export default _default;

package/lib/components/eftpos/form/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 /**
  * @title: 递归循环表单数据
  * @Author: hongbing.wang

package/lib/components/eftpos/group/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { RadioGroupProps } from 'antd';
 export declare const CheckboxGroup: ({ direction, options, ...props }: any) => JSX.Element;
 export declare const RadioGroup: ({ direction, options, ...props }: RadioGroupProps & {

package/lib/components/eftpos/hooks.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { Eftpos } from './const';
 /**
  * @title: tyro 设备连接

package/lib/components/eftpos/icon/apiKey.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 declare const _default: ({ color }: {
     color?: string | undefined;
 }) => JSX.Element;

package/lib/components/eftpos/icon/device.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 declare const _default: ({ color }: {
     color?: string | undefined;
 }) => JSX.Element;

package/lib/components/eftpos/receipt/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 /**
  * @title: 自定义组件设置
  * @description: 自定义组件设置

package/lib/components/eftposPay/component/alert/warn.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const _default: () => JSX.Element;
 export default _default;

package/lib/components/eftposPay/component/header/titlebar.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './titlebar.less';
 declare enum EPopupTitleBarVariantType {
     BackTitleClose = "back-title-cancel",

package/lib/components/eftposPay/component/step/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { StatusType } from '../../const';
 declare const _default: (props: {
     status: StatusType;

package/lib/components/eftposPay/component/step/step.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 declare const _default: (props: {
     status: string;
     pedding?: string;

package/lib/components/eftposPay/hooks.d.ts

@@ -15,7 +15,7 @@ export declare const useStoreRef: <T extends {
     readonly numRef: React.MutableRefObject<string | number | undefined>;
     readonly orderIdRef: React.MutableRefObject<string | number>;
     readonly modeRef: React.MutableRefObject<ModeEnum>;
-    readonly statusRef: React.MutableRefObject<"loading" | "success" | "warn" | "fail" | "pedding" | "resove" | "reject" | "question">;
+    readonly statusRef: React.MutableRefObject<"loading" | "warn" | "success" | "fail" | "pedding" | "resove" | "reject" | "question">;
     readonly netRef: React.MutableRefObject<boolean | undefined>;
     readonly symbolRef: React.MutableRefObject<string>;
     readonly amountRef: React.MutableRefObject<string | number>;

package/lib/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: "loading" | "warn" | "success" | "fail" | "question";
     };
 };
 /**
@@ -298,7 +298,7 @@ export declare const backUpFree: (payload: Partial<State>) => {
         mode?: "pay" | "refund" | "fullPay" | "query" | undefined;
         order_id?: string | number | undefined;
         eftpos?: "stripe" | "payo" | "tyro" | "windcave" | "linkly" | undefined;
-        action?: "pay" | "amount" | "deviceList" | 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?: "loading" | "warn" | "success" | "fail" | "pedding" | "resove" | "reject" | "question" | undefined;
         warn?: string | undefined;
         steps?: {
             /** 用于重置当前步骤 */

package/lib/components/eftposPay/tyro/hooks.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 /**
  * @title: 获取 Tyro 资源
  * @description:

package/lib/components/eftposPay/tyro/index.js

@@ -158,12 +158,6 @@ var tyro_default = ({
       response: {},
       metadata: {
         receipt: []
-      },
-      _config: {
-        retry: {
-          count: 10,
-          delay: 500
-        }
       }
     }).then((res) => {
       requestIdRef.current = res.data.id;
@@ -235,12 +229,6 @@ var tyro_default = ({
       response: {},
       metadata: {
         receipt: []
-      },
-      _config: {
-        retry: {
-          count: 10,
-          delay: 500
-        }
       }
     }).then((res) => {
       requestIdRef.current = res.data.id;

package/lib/components/eventBooking/components/ErrorTip/index.d.ts

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

package/lib/components/eventBooking/components/Provider/Cart/Deposit/index.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const Deposit: () => JSX.Element;
 export default Deposit;

package/lib/components/eventBooking/components/Provider/InformationOptionsModal/index.d.ts

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

package/lib/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/CalenDateStatus/index.d.ts

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

package/lib/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/CalenDateWeek/CallToBook/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare type CallToBookProps = {
     show: boolean;

package/lib/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/CalenDateWeek/WeekItem/index.d.ts

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

package/lib/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/CalenDateWeek/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare type CalenDateWeekProps = {
     currentDate: string;

package/lib/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/Item/DayItem/index.d.ts

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

package/lib/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/Item/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 import { CalendarItemProps } from '../../../../../type';
 declare const Item: (props: CalendarItemProps) => JSX.Element;

package/lib/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/Status/index.d.ts

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

package/lib/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/lib/components/index.js

@@ -34,13 +34,22 @@ __export(components_exports, {
   BookingForms: () => import_forms.default,
   BookingInfo: () => import_info.default,
   BookingNotes: () => import_notes.default,
+  CustomerAuth: () => import_admin.CustomerAuth,
+  CustomerOAuthConfig: () => import_admin.CustomerOAuthConfig,
+  DeviceAuth: () => import_admin.DeviceAuth,
   EditBookingModal: () => import_editBookingModal.default,
   Login: () => import_login.default,
+  OAuthConfig: () => import_admin.OAuthConfig,
+  OnlineShopAuth: () => import_admin.OnlineShopAuth,
+  OrgAdminAuth: () => import_admin.OrgAdminAuth,
+  POSOperatorAuth: () => import_admin.POSOperatorAuth,
   PinModal: () => import_pinModal.default,
   PinVerifyModal: () => import_pinVerifyModal.default,
   PisellSelectCustomerModal: () => import_pisellSelectCustomerModal.default,
   ProductExtension: () => import_productExtension.default,
   RuleSetting: () => import_ruleSetting.default,
+  SaaSAdminAuth: () => import_admin.SaaSAdminAuth,
+  SaaSManagermentAuth: () => import_admin.SaaSManagermentAuth,
   Schedules: () => import_schedules.default,
   StepController: () => import_stepController.default,
   SubTotal: () => import_subTotal.default,
@@ -63,8 +72,8 @@ var import_productExtension = __toESM(require("./productExtension"));
 var import_ruleSetting = __toESM(require("./ruleSetting"));
 var import_taxSelect = __toESM(require("./taxSelect"));
 var import_toC = __toESM(require("./pay/toC"));
-var import_wallet = __toESM(require("./wallet"));
 var import_walletList = __toESM(require("./walletList"));
+var import_wallet = __toESM(require("./wallet"));
 var import_workSpaceListDetail = __toESM(require("./workSpaceListDetail/"));
 var import_workSpaceList = __toESM(require("./workSpaceList"));
 var import_pisellSelectCustomerModal = __toESM(require("./pisellSelectCustomerModal"));
@@ -73,6 +82,7 @@ var import_editBookingModal = __toESM(require("./booking/editBookingModal"));
 var import_stepController = __toESM(require("./stepController"));
 var import_pinModal = __toESM(require("./pinModal"));
 var import_pinVerifyModal = __toESM(require("./pinVerifyModal"));
+var import_admin = require("./authentication/admin");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   Booking,
@@ -80,13 +90,22 @@ var import_pinVerifyModal = __toESM(require("./pinVerifyModal"));
   BookingForms,
   BookingInfo,
   BookingNotes,
+  CustomerAuth,
+  CustomerOAuthConfig,
+  DeviceAuth,
   EditBookingModal,
   Login,
+  OAuthConfig,
+  OnlineShopAuth,
+  OrgAdminAuth,
+  POSOperatorAuth,
   PinModal,
   PinVerifyModal,
   PisellSelectCustomerModal,
   ProductExtension,
   RuleSetting,
+  SaaSAdminAuth,
+  SaaSManagermentAuth,
   Schedules,
   StepController,
   SubTotal,

package/lib/components/list/List.js

@@ -145,9 +145,6 @@ var List = (props) => {
   };
   const processedData = (0, import_react.useMemo)(() => {
     const sourceData = loading ? MOCK_LIST_DATA : data || [];
-    console.log(`processedData recalculating: tabStyle=${tabStyle}, activeTab=${activeTab}, tabItems=${tabItems.length}, dataLength=${sourceData.length}`);
-    console.log(`sourceData sample: ${JSON.stringify(sourceData.slice(0, 2), null, 2)}`);
-    console.log(`tabGroup: ${tabGroup}`);
     if (tabStyle === "anchor" && tabItems.length > 0) {
       const groupedData = [];
       const categoryTabs = tabItems.filter((tab) => tab.key !== "all");

package/lib/components/pay/toB/components/Cache/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const ToBPayCache: (props: {
     open: boolean;

package/lib/components/pay/toB/components/CardGroup/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { PayMethod, PayMethodGroup } from '../../types';
 import './index.less';
 declare const ToBPayCardGroup: (props: {

package/lib/components/pay/toB/components/MX51/index.js

@@ -33,8 +33,8 @@ __export(MX51_exports, {
 });
 module.exports = __toCommonJS(MX51_exports);
 var import_react = require("react");
-var import_utils = require("@pisell/utils");
 var import_useLogger = __toESM(require("../../../../../hooks/useLogger"));
+var import_useEngineContext = __toESM(require("../../../../../hooks/useEngineContext"));
 var getUuid = () => {
   return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxx".replace(/[xy]/g, (c) => {
     const r = Math.random() * 16 | 0;
@@ -43,7 +43,10 @@ var getUuid = () => {
   });
 };
 var MX51 = (props, ref) => {
+  var _a, _b;
   const logger = (0, import_useLogger.default)();
+  const context = (0, import_useEngineContext.default)();
+  const action = (_b = (_a = context == null ? void 0 : context.appHelper) == null ? void 0 : _a.utils) == null ? void 0 : _b.action;
   const onOpen = ({ data, payCallback }) => {
     const { params, mode } = data;
     const uniquePaymentNumber = getUuid();
@@ -62,18 +65,40 @@ var MX51 = (props, ref) => {
       title: "ToB_MX51_onOpen 开始调用",
       metadata: { params: newData }
     });
-    (0, import_utils.webPayment)(newData, (res) => {
-      const isSame = (res == null ? void 0 : res.uniquePaymentNumber) === uniquePaymentNumber;
-      logger == null ? void 0 : logger.addLog({
-        type: "info",
-        title: "ToB_MX51_onOpen_callback",
-        metadata: {
-          msg: isSame ? "uniquePaymentNumber一致" : "uniquePaymentNumber不一致",
-          res
+    action({
+      type: "webpos.handleMX51Pay",
+      data: newData,
+      callback: (res) => {
+        var _a2, _b2;
+        let isSame = false;
+        if (res == null ? void 0 : res.uniquePaymentNumber) {
+          const _res = res;
+          isSame = (_res == null ? void 0 : _res.uniquePaymentNumber) === uniquePaymentNumber;
+          if (isSame) {
+            payCallback == null ? void 0 : payCallback(_res);
+          }
+        } else {
+          const _res = res;
+          const newRes = {
+            result: (_res == null ? void 0 : _res.code) == "200" ? true : false,
+            msg: _res == null ? void 0 : _res.msg,
+            amount: (_a2 = _res == null ? void 0 : _res.data) == null ? void 0 : _a2.amount,
+            surcharge: (_b2 = _res == null ? void 0 : _res.data) == null ? void 0 : _b2.surcharge,
+            uniquePaymentNumber: _res == null ? void 0 : _res.uuid
+          };
+          isSame = (_res == null ? void 0 : _res.uuid) === uniquePaymentNumber;
+          if (isSame) {
+            payCallback == null ? void 0 : payCallback(newRes);
+          }
         }
-      });
-      if (isSame) {
-        payCallback == null ? void 0 : payCallback(res);
+        logger == null ? void 0 : logger.addLog({
+          type: "info",
+          title: "ToB_MX51_onOpen_callback",
+          metadata: {
+            msg: isSame ? "交易流水号一致" : "交易流水号不一致",
+            res
+          }
+        });
       }
     });
   };

package/lib/components/pay/toB/types/index.d.ts

@@ -58,3 +58,15 @@ export interface MX51PayResult {
     surcharge: number;
     uniquePaymentNumber: string;
 }
+/**
+ * @title 原生MX51支付结果
+ */
+export interface NativeMX51PayResult {
+    code: string;
+    msg?: string;
+    data: {
+        amount: number;
+        surcharge: number;
+    };
+    uuid: string;
+}

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

@@ -35,15 +35,17 @@ module.exports = __toCommonJS(ApplePay_exports);
 var import_react = __toESM(require("react"));
 var import_materials = require("@pisell/materials");
 var import_ThreedsLoading = __toESM(require("../MWCreditCard/TDSPay/ThreedsLoading"));
+var import_PaymentReturnContent = __toESM(require("../components/PaymentReturnContent"));
 var import_model = require("../../model");
 var import_utils = require("@pisell/utils");
 var import_payGroup = require("../../payGroup");
 var import_useEngineContext = __toESM(require("../../../../../hooks/useEngineContext"));
 var import_usePaymentLogger = __toESM(require("../../../../../hooks/usePaymentLogger"));
+var import_hooks = require("../hooks");
 var import_index = require("./index.less");
 var import_utils2 = require("../../utils");
 var ApplePay = (props, ref) => {
-  var _a, _b;
+  var _a, _b, _c, _d;
   const { state } = (0, import_react.useContext)(import_model.Context);
   const [open, setOpen] = (0, import_react.useState)(false);
   const context = (0, import_useEngineContext.default)();
@@ -52,8 +54,12 @@ var ApplePay = (props, ref) => {
     orderId: ((_b = state.payGroup) == null ? void 0 : _b.order_id) || "unknown",
     step: "2"
   });
+  const { isReturned, handleRedirect, resetState } = (0, import_hooks.usePaymentRedirect)({
+    orderId: (_c = state.payGroup) == null ? void 0 : _c.order_id,
+    paymentType: "applePay"
+  });
   const init = async ({ payGroup }) => {
-    var _a2, _b2, _c, _d, _e, _f, _g;
+    var _a2, _b2, _c2, _d2, _e, _f, _g;
     paymentLogger.addLog({
       key: "ApplePay初始化开始",
       value: ""
@@ -81,14 +87,14 @@ var ApplePay = (props, ref) => {
       value: ""
     });
     try {
-      const locale = ((_c = dvaStore.core) == null ? void 0 : _c.translateLocale) || "en";
-      const shopId = (_f = (_e = (_d = dvaStore.core) == null ? void 0 : _d.core) == null ? void 0 : _e.shop) == null ? void 0 : _f.id;
+      const locale = ((_c2 = dvaStore.core) == null ? void 0 : _c2.translateLocale) || "en";
+      const shopId = (_f = (_e = (_d2 = dvaStore.core) == null ? void 0 : _d2.core) == null ? void 0 : _e.shop) == null ? void 0 : _f.id;
       const currentURL = window.location.href;
       const linkElement = document.createElement("a");
       linkElement.href = currentURL;
       const shop_domain = linkElement.hostname;
       const _href = `${config.pay}${(0, import_utils2.formatFranchiseeRoute)(
-        `/apple-pay?order_id=${(_g = state.payGroup) == null ? void 0 : _g.order_id}&shop_id=${shopId}&locale=${locale}&shop_domain=${shop_domain}&total_amount=${values.amount}&payment_group_id=${values.payment_group_id}`,
+        `/apple-pay?order_id=${(_g = state.payGroup) == null ? void 0 : _g.order_id}&shop_id=${shopId}&locale=${locale}&shop_domain=${shop_domain}&total_amount=${values.amount}&payment_group_id=${values.payment_group_id}&front_order_uuid=${state.front_order_uuid}&is_replace_router=1`,
         state.history
       )}`;
       paymentLogger.addLog({
@@ -96,7 +102,7 @@ var ApplePay = (props, ref) => {
         value: ""
       });
       paymentLogger.sendLogs("ApplePay跳转成功");
-      window.location.href = _href;
+      await handleRedirect(_href);
     } catch (err) {
       paymentLogger.addLog({
         key: "ApplePay处理错误",
@@ -118,6 +124,10 @@ var ApplePay = (props, ref) => {
       init
     })
   );
+  const handleReturn = () => {
+    setOpen(false);
+    resetState();
+  };
   return /* @__PURE__ */ import_react.default.createElement(
     import_materials.PisellModal,
     {
@@ -128,11 +138,21 @@ var ApplePay = (props, ref) => {
       closable: false,
       bodyStyle: { padding: 0 }
     },
-    /* @__PURE__ */ import_react.default.createElement("div", { className: "" }, /* @__PURE__ */ import_react.default.createElement(
+    /* @__PURE__ */ import_react.default.createElement("div", { className: "" }, !isReturned && // 跳转前展示 Loading
+    /* @__PURE__ */ import_react.default.createElement(
       import_ThreedsLoading.default,
       {
         title: import_utils.locales.getText("tocPay.text.connectingApplePay")
       }
+    ), isReturned && // 跳转后返回时展示新组件内容
+    /* @__PURE__ */ import_react.default.createElement(
+      import_PaymentReturnContent.default,
+      {
+        handleReturn,
+        state,
+        orderId: (_d = state.payGroup) == null ? void 0 : _d.order_id,
+        unique_payment_number: state == null ? void 0 : state.front_order_uuid
+      }
     ))
   );
 };

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

@@ -41,8 +41,10 @@ var import_payGroup = require("../../payGroup");
 var import_useEngineContext = __toESM(require("../../../../../hooks/useEngineContext"));
 var import_usePaymentLogger = __toESM(require("../../../../../hooks/usePaymentLogger"));
 var import_utils2 = require("../../utils");
+var import_hooks = require("../hooks");
+var import_PaymentReturnContent = __toESM(require("../components/PaymentReturnContent"));
 var GooglePay = (props, ref) => {
-  var _a, _b, _c;
+  var _a, _b, _c, _d, _e;
   const { state } = (0, import_react.useContext)(import_model.Context);
   const [open, setOpen] = (0, import_react.useState)(false);
   const context = (0, import_useEngineContext.default)();
@@ -52,12 +54,17 @@ var GooglePay = (props, ref) => {
     orderId: ((_c = state.payGroup) == null ? void 0 : _c.order_id) || "unknown",
     step: "2"
   });
+  const { isReturned, handleRedirect, resetState } = (0, import_hooks.usePaymentRedirect)({
+    orderId: (_d = state.payGroup) == null ? void 0 : _d.order_id,
+    paymentType: "googlePay"
+  });
   const init = async ({ payGroup }) => {
-    var _a2, _b2, _c2, _d, _e, _f, _g, _h, _i, _j, _k;
+    var _a2, _b2, _c2, _d2, _e2, _f, _g, _h, _i, _j, _k;
     paymentLogger.addLog({
       key: "GooglePay初始化开始",
       value: ""
     });
+    setOpen(true);
     const utils = context.appHelper.utils || {};
     const dvaStore = (_b2 = (_a2 = utils == null ? void 0 : utils.getStore) == null ? void 0 : _a2.call(utils)) == null ? void 0 : _b2.getState();
     const values = (0, import_payGroup.getPayGroupParamsFromStorage)(payGroup.order_id);
@@ -79,15 +86,19 @@ var GooglePay = (props, ref) => {
       key: "GooglePay获取支付参数成功",
       value: ""
     });
-    if (((_d = (_c2 = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _c2.isAppEnv) == null ? void 0 : _d.call(_c2)) && ((_f = (_e = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _e.isAndroid_ios) == null ? void 0 : _f.call(_e)) === "android") {
+    if (((_d2 = (_c2 = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _c2.isAppEnv) == null ? void 0 : _d2.call(_c2)) && ((_f = (_e2 = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _e2.isAndroid_ios) == null ? void 0 : _f.call(_e2)) === "android") {
       paymentLogger.addLog({
         key: "GooglePay使用Android客户端支付",
         value: ""
       });
       paymentLogger.sendLogs("GooglePay客户端支付");
-      return (0, import_utils2.clientPayment)({ order_id: payGroup.order_id, type: "google_pay", values, interaction });
+      return (0, import_utils2.clientPayment)({
+        order_id: payGroup.order_id,
+        type: "google_pay",
+        values,
+        interaction
+      });
     }
-    setOpen(true);
     try {
       const locale = ((_g = dvaStore.core) == null ? void 0 : _g.translateLocale) || "en";
       const shopId = (_j = (_i = (_h = dvaStore.core) == null ? void 0 : _h.core) == null ? void 0 : _i.shop) == null ? void 0 : _j.id;
@@ -96,7 +107,7 @@ var GooglePay = (props, ref) => {
       linkElement.href = currentURL;
       const shop_domain = linkElement.hostname;
       const _href = `${config.pay}${(0, import_utils2.formatFranchiseeRoute)(
-        `/google-pay?order_id=${(_k = state.payGroup) == null ? void 0 : _k.order_id}&shop_id=${shopId}&locale=${locale}&shop_domain=${shop_domain}&total_amount=${values.amount}&payment_group_id=${values.payment_group_id}`,
+        `/google-pay?order_id=${(_k = state.payGroup) == null ? void 0 : _k.order_id}&shop_id=${shopId}&locale=${locale}&shop_domain=${shop_domain}&total_amount=${values.amount}&payment_group_id=${values.payment_group_id}&front_order_uuid=${state.front_order_uuid}&is_replace_router=1`,
         state.history
       )}`;
       paymentLogger.addLog({
@@ -104,7 +115,7 @@ var GooglePay = (props, ref) => {
         value: ""
       });
       paymentLogger.sendLogs("GooglePay跳转成功");
-      window.location.href = _href;
+      await handleRedirect(_href);
     } catch (err) {
       paymentLogger.addLog({
         key: "GooglePay处理错误",
@@ -126,6 +137,10 @@ var GooglePay = (props, ref) => {
       init
     })
   );
+  const handleReturn = () => {
+    setOpen(false);
+    resetState();
+  };
   return /* @__PURE__ */ import_react.default.createElement(
     import_materials.PisellModal,
     {
@@ -136,11 +151,20 @@ var GooglePay = (props, ref) => {
       closable: false,
       bodyStyle: { padding: 0 }
     },
-    /* @__PURE__ */ import_react.default.createElement("div", { className: "" }, /* @__PURE__ */ import_react.default.createElement(
+    /* @__PURE__ */ import_react.default.createElement("div", { className: "" }, !isReturned && /* @__PURE__ */ import_react.default.createElement(
       import_ThreedsLoading.default,
       {
         title: import_utils.locales.getText("tocPay.text.connectingGooglePay")
       }
+    ), isReturned && // 跳转后返回时展示新组件内容
+    /* @__PURE__ */ import_react.default.createElement(
+      import_PaymentReturnContent.default,
+      {
+        handleReturn,
+        state,
+        orderId: (_e = state.payGroup) == null ? void 0 : _e.order_id,
+        unique_payment_number: state.front_order_uuid
+      }
     ))
   );
 };