@pisell/private-materials 6.4.72 → 6.4.73

package/lib/components/booking/info2/utilsByBooking.js

@@ -43,7 +43,6 @@ var import_dayjs = __toESM(require("dayjs"));
 var import_utils = require("@pisell/utils");
 var import_utils2 = require("../utils");
 var import_utils3 = require("../../ticketBooking/components/addServiceVariant/utils");
-var import_utils4 = require("./service/addService/utils");
 var getUseableEventCount = (eventList, current) => {
   return (eventList || []).reduce((pre, event) => {
     return pre - event.pax;
@@ -220,20 +219,13 @@ var getServiceStartTimeAndEndTime = (state, cacheItem, timeObj) => {
   }
   const appointmentTimingPreference = getAppointmentTimingPreference(state);
   let lastServer = (0, import_utils2.getLastServer)((_a = state.service.value) == null ? void 0 : _a.filter((item) => !item.isCustomItem));
-  const getDuration = (cacheItem2) => {
-    var _a2;
-    if ((0, import_utils4.isMultiDayProduct)(cacheItem2)) {
-      return (0, import_utils2.getDays)(cacheItem2, "days");
-    }
-    return (0, import_utils2.findNextDuration)(
-      cacheItem2.duration,
-      timeObj == null ? void 0 : timeObj.durationSlicesBasedOnTime,
-      (_a2 = cacheItem2 == null ? void 0 : cacheItem2.duration) == null ? void 0 : _a2.value
-    );
-  };
   let _extend = {
     // 时长: 当前商品时长 > 第一个时长
-    duration: getDuration(cacheItem)
+    duration: (0, import_utils2.findNextDuration)(
+      cacheItem.duration,
+      timeObj == null ? void 0 : timeObj.durationSlicesBasedOnTime,
+      (_b = cacheItem == null ? void 0 : cacheItem.duration) == null ? void 0 : _b.value
+    )
   };
   if (lastServer) {
     let lastServerStartDate = lastServer._extend.startDate;
@@ -242,9 +234,9 @@ var getServiceStartTimeAndEndTime = (state, cacheItem, timeObj) => {
       _extend.start_time = lastServerStartDate.format("HH:mm");
     } else {
       if ((0, import_dayjs.default)(lastServerEndDate).isAfter(lastServerStartDate, "day")) {
-        _extend.start_time = timeObj == null ? void 0 : timeObj.timeSlices[((_b = timeObj == null ? void 0 : timeObj.timeSlices) == null ? void 0 : _b.length) - 1].value;
+        _extend.start_time = timeObj == null ? void 0 : timeObj.timeSlices[((_c = timeObj == null ? void 0 : timeObj.timeSlices) == null ? void 0 : _c.length) - 1].value;
       } else {
-        _extend.start_time = (_c = lastServerEndDate || (0, import_dayjs.default)()) == null ? void 0 : _c.format("HH:mm");
+        _extend.start_time = lastServerEndDate.format("HH:mm");
       }
     }
   } else {
@@ -272,10 +264,7 @@ var getServiceStartTimeAndEndTime = (state, cacheItem, timeObj) => {
     ..._extend,
     ...cacheItem._extend
   };
-  const { startDate, endDate } = (0, import_utils2.getServiceTimes)({
-    ...cacheItem,
-    _extend
-  });
+  const { startDate, endDate } = (0, import_utils2.getServiceTimes)({ _extend });
   _extend.startDate = startDate;
   _extend.endDate = endDate;
   const session = (_e = (_d = cacheItem == null ? void 0 : cacheItem._extend) == null ? void 0 : _d.other) == null ? void 0 : _e.session;

package/lib/components/booking/utils.d.ts

@@ -22,14 +22,6 @@ export declare const request: Request;
  * @Date: 2024-04-26 14:00
  */
 export declare const getDiscountTime: (service_times: number, isDay?: boolean) => string;
-/**
- * @title: 格式化跨日预约的时长用于展示
- * @description:
- * @param {number} days
- * @param {number} minutes
- * @return {*}
- */
-export declare const getDiscountTimeByDayMinutes: (days: number, minutes: number) => string;
 /**
  * @title: 时间切片
  * @description:
@@ -121,7 +113,7 @@ export declare const flexibleObj: {
 export declare const getEndDate: (startDate: any, duration: string | number, endDate: any) => any;
 export declare const getServiceTimes: (service: any) => {
     startDate: dayjs.Dayjs;
-    endDate: any;
+    endDate: dayjs.Dayjs;
 };
 export declare const getErrorList: (resource: any, cacheItem: any, isDay?: boolean) => {
     label: any;
@@ -173,10 +165,10 @@ export declare const getProductTotalPrice: (item: any) => number;
 export declare const getDuration: (duration: number | {
     type: string;
     value: number;
-}) => number | "flexible" | {
+}) => number | {
     type: string;
     value: number;
-};
+} | "flexible";
 export declare const isWalkIn: (customer_id?: number | string) => boolean;
 export declare const getIsEdit: (state: any) => boolean;
 export {};

package/lib/components/booking/utils.js

@@ -39,7 +39,6 @@ __export(utils_exports, {
   getCacheParams: () => getCacheParams,
   getDays: () => getDays,
   getDiscountTime: () => getDiscountTime,
-  getDiscountTimeByDayMinutes: () => getDiscountTimeByDayMinutes,
   getDuration: () => getDuration,
   getEndDate: () => getEndDate,
   getErrorList: () => getErrorList,
@@ -68,7 +67,6 @@ var import_utils2 = require("./info/service2/utils");
 var import_lodash = require("lodash");
 var import_utilsByBooking = require("./info2/utilsByBooking");
 var import_decimal = __toESM(require("decimal.js"));
-var import_utils3 = require("./info2/service/addService/utils");
 var Request = class {
   request = {};
   constructor() {
@@ -101,12 +99,6 @@ var getDiscountTime = (service_times, isDay) => {
     return str;
   }
 };
-var getDiscountTimeByDayMinutes = (days, minutes) => {
-  if (days === 0) {
-    return getDiscountTime(minutes);
-  }
-  return `${days} ${import_utils.locales.getText("pisell2.text.day")(days)} ${getDiscountTime(minutes)}`;
-};
 var sliceDayIntoFiveMinutes = (config, locale, isDay) => {
   let _locale = locale;
   let dayjsLocale = _locale === "en-US" || _locale === "en" ? "en" : "zh-cn";
@@ -416,12 +408,6 @@ var getServiceTimes = (service) => {
   const startDate = (0, import_dayjs.default)(
     (0, import_dayjs.default)(service._extend.start_date).format("YYYY-MM-DD ") + getServeStartTime(service._extend.start_time)
   );
-  if ((0, import_utils3.isMultiDayProduct)(service)) {
-    return {
-      startDate,
-      endDate: service._extend.end_date
-    };
-  }
   const endDate = startDate.add(
     flexibleObj.getValue(service._extend.duration),
     "minute"
@@ -710,7 +696,6 @@ var getIsEdit = (state) => {
   getCacheParams,
   getDays,
   getDiscountTime,
-  getDiscountTimeByDayMinutes,
   getDuration,
   getEndDate,
   getErrorList,

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

@@ -8,7 +8,7 @@ import { PosProps } from './const';
  */
 declare const _default: ({ className, onChange, onClose, formatAmount, isMobile, net, client }: {
     className?: string | undefined;
-    onChange?: ((status: "page" | "success" | "print" | "fail" | "mark_tx_processed", params?: string | {
+    onChange?: ((status: "success" | "page" | "fail" | "print" | "mark_tx_processed", params?: string | {
         [keys: string]: unknown;
     } | undefined, other?: any) => void) | undefined;
     onClose: () => void;

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

@@ -11,7 +11,7 @@ import './device.less';
 declare const _default: ({ api, onChange, onClose, className, device_number, isMobile, net, client, formatAmount, containerStyle, }: {
     api: PayProps['api'];
     className?: string | undefined;
-    onChange?: ((status: "page" | "success" | "print" | "fail" | "mark_tx_processed", params?: string | {
+    onChange?: ((status: "success" | "page" | "fail" | "print" | "mark_tx_processed", params?: string | {
         [keys: string]: unknown;
     } | undefined, other?: any) => void) | undefined;
     onClose: () => void;

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

@@ -15,11 +15,11 @@ 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<"success" | "warn" | "loading" | "fail" | "pedding" | "resove" | "reject" | "question">;
     readonly netRef: React.MutableRefObject<boolean | undefined>;
     readonly symbolRef: React.MutableRefObject<string>;
     readonly amountRef: React.MutableRefObject<string | number>;
-    readonly eftposRef: React.MutableRefObject<"stripe" | "tyro" | "windcave" | "payo" | "linkly">;
+    readonly eftposRef: React.MutableRefObject<"payo" | "tyro" | "windcave" | "stripe" | "linkly">;
     readonly clientRef: React.MutableRefObject<ClientEnum>;
     readonly dataRef: React.MutableRefObject<import("./store").State>;
 };

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: "success" | "warn" | "loading" | "fail" | "question";
     };
 };
 /**
@@ -295,9 +295,9 @@ export declare const backUpFree: (payload: Partial<State>) => {
         name?: string | undefined;
         symbol?: string | undefined;
         amount?: string | number | undefined;
-        mode?: "pay" | "refund" | "fullPay" | "query" | undefined;
+        mode?: "pay" | "fullPay" | "refund" | "query" | undefined;
         order_id?: string | number | undefined;
-        eftpos?: "stripe" | "tyro" | "windcave" | "payo" | "linkly" | undefined;
+        eftpos?: "payo" | "tyro" | "windcave" | "stripe" | "linkly" | undefined;
         action?: "amount" | "pay" | "deviceList" | undefined;
         key?: number | undefined;
         step?: number | 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/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/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
+      }
     ))
   );
 };

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

@@ -43,18 +43,25 @@ var import_index = require("./index.less");
 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 SuperPayAliPayH5 = (props, ref) => {
-  var _a, _b;
+  var _a, _b, _c, _d;
   const { state } = (0, import_react.useContext)(import_model.Context);
   const { onChange } = props;
   const [open, setOpen] = (0, import_react.useState)(false);
   const [showSuccessBackButton, setShowSuccessBackButton] = (0, import_react.useState)(false);
+  const [statePayNumber, setStatePayNumber] = (0, import_react.useState)("");
   const context = (0, import_useEngineContext.default)();
   const { interaction } = (_a = context.appHelper) == null ? void 0 : _a.utils;
   const paymentLogger = (0, import_usePaymentLogger.default)({
     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: "aliPay"
+  });
   const init = async ({ payGroup }) => {
     var _a2, _b2;
     paymentLogger.addLog({
@@ -68,7 +75,12 @@ var SuperPayAliPayH5 = (props, ref) => {
         value: "检测到App环境，调用客户端支付"
       });
       paymentLogger.sendLogs("SuperPayAliPayH5App环境支付");
-      return (0, import_utils2.clientPayment)({ order_id: payGroup.order_id, type: "aliPay", values, interaction });
+      return (0, import_utils2.clientPayment)({
+        order_id: payGroup.order_id,
+        type: "aliPay",
+        values,
+        interaction
+      });
     }
     setOpen(true);
     if (!values) {
@@ -97,13 +109,14 @@ var SuperPayAliPayH5 = (props, ref) => {
           value: ""
         });
         (0, import_payGroup.setPayNumber)(payGroup == null ? void 0 : payGroup.order_id, data == null ? void 0 : data.pay_number);
+        setStatePayNumber(data == null ? void 0 : data.pay_number);
         setShowSuccessBackButton(true);
         paymentLogger.addLog({
           key: "SuperPayAliPayH5准备跳转支付宝",
           value: ""
         });
         paymentLogger.sendLogs("SuperPayAliPayH5跳转成功");
-        window.location.href = data == null ? void 0 : data.pay_url;
+        await handleRedirect(data == null ? void 0 : data.pay_url);
       } else {
         paymentLogger.addLog({
           key: "SuperPayAliPayH5支付链接为空",
@@ -144,6 +157,10 @@ var SuperPayAliPayH5 = (props, ref) => {
       key: "success"
     });
   };
+  const handleReturn = () => {
+    setOpen(false);
+    resetState();
+  };
   return /* @__PURE__ */ import_react.default.createElement(
     import_materials.PisellModal,
     {
@@ -154,13 +171,22 @@ var SuperPayAliPayH5 = (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.redirectingToAlipay"),
         onSuccessBack: handleSuccessBack,
         showSuccessBackButton
       }
+    ), isReturned && /* @__PURE__ */ import_react.default.createElement(
+      import_PaymentReturnContent.default,
+      {
+        pay_number: statePayNumber,
+        handleReturn,
+        state,
+        orderId: (_d = state.payGroup) == null ? void 0 : _d.order_id,
+        unique_payment_number: state.front_order_uuid
+      }
     ))
   );
 };

package/lib/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;