@pisell/private-materials 3.4.93 → 3.4.95

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/eventBooking/components/bookingDetailModal/components/BookingOptions.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 declare const BookingOptions: (props: {
     onChangeBookingOption?: ((bookingOption: any) => void) | undefined;
 }) => JSX.Element;

package/lib/components/eventBooking/components/scheduleCalendar/ProductItem/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare type Item = any;
 interface ProductItemProps {

package/lib/components/eventBooking/components/scheduleCalendar/components/ScheduleTimeItem/index.d.ts

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

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

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

package/lib/components/login/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 export interface LoginProps {
     title: string;

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

@@ -40,18 +40,22 @@ var import_serve = require("./serve");
 var import_model = require("../../model");
 var import_payGroup = require("../../payGroup");
 var import_usePaymentLogger = __toESM(require("../../../../../hooks/usePaymentLogger"));
+var import_useEngineContext = __toESM(require("../../../../../hooks/useEngineContext"));
 var import_index = require("./index.less");
 var GlobePayAliPayH5 = (props, ref) => {
-  var _a;
+  var _a, _b;
   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 context = (0, import_useEngineContext.default)();
+  const { token } = ((_a = context.appHelper) == null ? void 0 : _a.utils) || {};
   const paymentLogger = (0, import_usePaymentLogger.default)({
-    orderId: ((_a = state.payGroup) == null ? void 0 : _a.order_id) || "unknown",
+    orderId: ((_b = state.payGroup) == null ? void 0 : _b.order_id) || "unknown",
     step: "2"
   });
   const init = async ({ payGroup }) => {
+    var _a2;
     paymentLogger.addLog({
       key: "GlobePayAliPayH5初始化开始",
       value: ""
@@ -88,7 +92,7 @@ var GlobePayAliPayH5 = (props, ref) => {
           key: "GlobePayAliPayH5获取支付链接成功",
           value: ""
         });
-        (0, import_payGroup.setPayNumber)(payGroup == null ? void 0 : payGroup.order_id, data == null ? void 0 : data.pay_number);
+        await (0, import_payGroup.setPayNumber)(payGroup == null ? void 0 : payGroup.order_id, data == null ? void 0 : data.pay_number, (_a2 = token == null ? void 0 : token.get) == null ? void 0 : _a2.call(token));
         paymentLogger.addLog({
           key: "GlobePayAliPayH5准备跳转支付宝",
           value: ""

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

@@ -40,17 +40,21 @@ var import_serve = require("./serve");
 var import_model = require("../../model");
 var import_payGroup = require("../../payGroup");
 var import_usePaymentLogger = __toESM(require("../../../../../hooks/usePaymentLogger"));
+var import_useEngineContext = __toESM(require("../../../../../hooks/useEngineContext"));
 var import_index = require("./index.less");
 var GlobePayPaypalH5 = (props, ref) => {
-  var _a;
+  var _a, _b;
   const { state } = (0, import_react.useContext)(import_model.Context);
   const { onChange } = props;
   const [open, setOpen] = (0, import_react.useState)(false);
+  const context = (0, import_useEngineContext.default)();
+  const { token } = ((_a = context.appHelper) == null ? void 0 : _a.utils) || {};
   const paymentLogger = (0, import_usePaymentLogger.default)({
-    orderId: ((_a = state.payGroup) == null ? void 0 : _a.order_id) || "unknown",
+    orderId: ((_b = state.payGroup) == null ? void 0 : _b.order_id) || "unknown",
     step: "2"
   });
   const init = async ({ payGroup }) => {
+    var _a2;
     paymentLogger.addLog({
       key: "GlobePayPaypalH5初始化开始",
       value: ""
@@ -87,7 +91,7 @@ var GlobePayPaypalH5 = (props, ref) => {
           key: "GlobePayPaypalH5获取支付链接成功",
           value: ""
         });
-        (0, import_payGroup.setPayNumber)(payGroup == null ? void 0 : payGroup.order_id, data == null ? void 0 : data.pay_number);
+        await (0, import_payGroup.setPayNumber)(payGroup == null ? void 0 : payGroup.order_id, data == null ? void 0 : data.pay_number, (_a2 = token == null ? void 0 : token.get) == null ? void 0 : _a2.call(token));
         paymentLogger.addLog({
           key: "GlobePayPaypalH5准备跳转Paypal",
           value: ""

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

@@ -40,17 +40,21 @@ var import_serve = require("./serve");
 var import_model = require("../../model");
 var import_payGroup = require("../../payGroup");
 var import_usePaymentLogger = __toESM(require("../../../../../hooks/usePaymentLogger"));
+var import_useEngineContext = __toESM(require("../../../../../hooks/useEngineContext"));
 var import_index = require("./index.less");
 var GlobePayWxH5 = (props, ref) => {
-  var _a;
+  var _a, _b;
   const { state } = (0, import_react.useContext)(import_model.Context);
   const { onChange } = props;
   const [open, setOpen] = (0, import_react.useState)(false);
+  const context = (0, import_useEngineContext.default)();
+  const { token } = ((_a = context.appHelper) == null ? void 0 : _a.utils) || {};
   const paymentLogger = (0, import_usePaymentLogger.default)({
-    orderId: ((_a = state.payGroup) == null ? void 0 : _a.order_id) || "unknown",
+    orderId: ((_b = state.payGroup) == null ? void 0 : _b.order_id) || "unknown",
     step: "2"
   });
   const init = async ({ payGroup }) => {
+    var _a2;
     paymentLogger.addLog({
       key: "GlobePayWxH5初始化开始",
       value: ""
@@ -87,7 +91,7 @@ var GlobePayWxH5 = (props, ref) => {
           key: "GlobePayWxH5获取支付链接成功",
           value: ""
         });
-        (0, import_payGroup.setPayNumber)(payGroup == null ? void 0 : payGroup.order_id, data == null ? void 0 : data.pay_number);
+        await (0, import_payGroup.setPayNumber)(payGroup == null ? void 0 : payGroup.order_id, data == null ? void 0 : data.pay_number, (_a2 = token == null ? void 0 : token.get) == null ? void 0 : _a2.call(token));
         paymentLogger.addLog({
           key: "GlobePayWxH5准备跳转微信",
           value: ""

package/lib/components/pay/toC/PaymentMethods/MWCreditCard/TDSPay/index.js

@@ -42,13 +42,17 @@ var import_model = require("../../../model");
 var import_payGroup = require("../../../payGroup");
 var import_index = require("./index.less");
 var import_utils = require("@pisell/utils");
+var import_useEngineContext = __toESM(require("../../../../../../hooks/useEngineContext"));
 var TDSPay = (props, ref) => {
+  var _a;
   const { onChange, closeAll } = props;
   const [open, setOpen] = (0, import_react.useState)(false);
   const [showCloseConfirm, setShowCloseConfirm] = (0, import_react.useState)(false);
   const sessionIdRef = (0, import_react.useRef)(0);
   const payingRef = (0, import_react.useRef)(false);
   const { state } = (0, import_react.useContext)(import_model.Context);
+  const engineContext = (0, import_useEngineContext.default)();
+  const { token } = ((_a = engineContext.appHelper) == null ? void 0 : _a.utils) || {};
   (0, import_react.useEffect)(() => {
     return () => {
       sessionIdRef.current += 1;
@@ -64,6 +68,7 @@ var TDSPay = (props, ref) => {
     onChange == null ? void 0 : onChange(res);
   };
   const init = async (res, order, preCheckData) => {
+    var _a2;
     if (payingRef.current) return;
     payingRef.current = true;
     sessionIdRef.current += 1;
@@ -73,7 +78,10 @@ var TDSPay = (props, ref) => {
     const isCancelled = () => sessionIdRef.current !== session;
     const callback = createSessionCallback(session);
     if (preCheckData) {
-      (0, import_tds2.startPayment)({ payData: preCheckData }, { callback, isCancelled });
+      (0, import_tds2.startPayment)(
+        { payData: preCheckData },
+        { callback, isCancelled, stashAuthToken: (_a2 = token == null ? void 0 : token.get) == null ? void 0 : _a2.call(token) }
+      );
       return;
     }
     if (res.id) {
@@ -98,10 +106,10 @@ var TDSPay = (props, ref) => {
     onChange == null ? void 0 : onChange({ key: "cancel" });
   };
   const _fastPayNew = async (res, callback, isCancelled) => {
-    var _a, _b, _c;
+    var _a2, _b, _c, _d;
     try {
       const params = (0, import_payGroup.getPayGroupParamsFromStorage)(
-        (_a = state.payGroup) == null ? void 0 : _a.order_id,
+        (_a2 = state.payGroup) == null ? void 0 : _a2.order_id,
         { card_id: res.id }
       );
       if (!params) {
@@ -120,7 +128,11 @@ var TDSPay = (props, ref) => {
         params
       });
       if (isCancelled()) return;
-      (0, import_payGroup.setPayNumber)((_c = state.payGroup) == null ? void 0 : _c.order_id, data == null ? void 0 : data.pay_number);
+      await (0, import_payGroup.setPayNumber)(
+        (_c = state.payGroup) == null ? void 0 : _c.order_id,
+        data == null ? void 0 : data.pay_number,
+        (_d = token == null ? void 0 : token.get) == null ? void 0 : _d.call(token)
+      );
       if ((data == null ? void 0 : data.type) === "token") {
         callback({ key: "success", data });
       }
@@ -139,7 +151,7 @@ var TDSPay = (props, ref) => {
     }
   };
   const newCardPay = (res, callback, isCancelled) => {
-    var _a, _b;
+    var _a2, _b, _c;
     let _cardInfo = {
       card_name: res.card_name,
       card_number: res.card_number,
@@ -149,7 +161,7 @@ var TDSPay = (props, ref) => {
       is_save: res.is_save ? 1 : 0
     };
     _cardInfo = (0, import_payGroup.getPayGroupParamsFromStorage)(
-      (_a = state.payGroup) == null ? void 0 : _a.order_id,
+      (_a2 = state.payGroup) == null ? void 0 : _a2.order_id,
       _cardInfo
     );
     if (!_cardInfo) {
@@ -165,7 +177,7 @@ var TDSPay = (props, ref) => {
     }
     (0, import_tds2.startPayment)(
       { orderId: (_b = state.payGroup) == null ? void 0 : _b.order_id, cardInfo: _cardInfo },
-      { callback, isCancelled }
+      { callback, isCancelled, stashAuthToken: (_c = token == null ? void 0 : token.get) == null ? void 0 : _c.call(token) }
     );
   };
   (0, import_react.useImperativeHandle)(

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

@@ -51,6 +51,7 @@ var MWCreditCard = (props, ref) => {
   const TDSPayRef2 = (0, import_react.useRef)();
   const context = (0, import_useEngineContext.default)();
   const utils = context.appHelper.utils || {};
+  const { token } = utils;
   const [order, setOrder] = (0, import_react.useState)(null);
   const [tdsErrorVisible, setTdsErrorVisible] = (0, import_react.useState)(false);
   const [bankVerifyFailVisible, setBankVerifyFailVisible] = (0, import_react.useState)(false);
@@ -67,7 +68,7 @@ var MWCreditCard = (props, ref) => {
     (_b = AddMWCreditCardRef2.current) == null ? void 0 : _b.close();
   };
   const fastPay = async (card) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k;
     try {
       setLoading(true);
       (_b = (_a = utils == null ? void 0 : utils.Toast) == null ? void 0 : _a.loading) == null ? void 0 : _b.call(_a, import_utils.locales.getText("tocPay.text.checkingCard"), 0, void 0, true);
@@ -90,13 +91,17 @@ var MWCreditCard = (props, ref) => {
         order_id: (_e = state.payGroup) == null ? void 0 : _e.order_id,
         params
       });
-      (0, import_payGroup.setPayNumber)((_f = state.payGroup) == null ? void 0 : _f.order_id, data == null ? void 0 : data.pay_number);
+      await (0, import_payGroup.setPayNumber)(
+        (_f = state.payGroup) == null ? void 0 : _f.order_id,
+        data == null ? void 0 : data.pay_number,
+        (_g = token == null ? void 0 : token.get) == null ? void 0 : _g.call(token)
+      );
       if ((data == null ? void 0 : data.type) === "token") {
-        (_g = TDSPayRef2.current) == null ? void 0 : _g.init(card, order, data);
+        (_h = TDSPayRef2.current) == null ? void 0 : _h.init(card, order, data);
         return;
       }
       if ((data == null ? void 0 : data.type) === "3ds") {
-        (_h = TDSPayRef2.current) == null ? void 0 : _h.init(card, order, data);
+        (_i = TDSPayRef2.current) == null ? void 0 : _i.init(card, order, data);
         return;
       }
     } catch (e) {
@@ -107,11 +112,11 @@ var MWCreditCard = (props, ref) => {
       }
     } finally {
       setLoading(false);
-      (_j = (_i = utils == null ? void 0 : utils.Toast) == null ? void 0 : _i.hide) == null ? void 0 : _j.call(_i);
+      (_k = (_j = utils == null ? void 0 : utils.Toast) == null ? void 0 : _j.hide) == null ? void 0 : _k.call(_j);
     }
   };
   const onCreate = async (res) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i;
     try {
       setLoading(true);
       (_b = (_a = utils == null ? void 0 : utils.Toast) == null ? void 0 : _a.loading) == null ? void 0 : _b.call(_a, import_utils.locales.getText("tocPay.text.checkingCard"), 0, void 0, true);
@@ -140,9 +145,10 @@ var MWCreditCard = (props, ref) => {
       }
       const preCheckData = await (0, import_tds2.preCheckEnrollment)(
         (_e = state.payGroup) == null ? void 0 : _e.order_id,
-        _cardInfo
+        _cardInfo,
+        (_f = token == null ? void 0 : token.get) == null ? void 0 : _f.call(token)
       );
-      (_f = TDSPayRef2.current) == null ? void 0 : _f.init(res, order, preCheckData);
+      (_g = TDSPayRef2.current) == null ? void 0 : _g.init(res, order, preCheckData);
     } catch (e) {
       if ((e == null ? void 0 : e.code) === 700500) {
         setTdsErrorVisible(true);
@@ -151,7 +157,7 @@ var MWCreditCard = (props, ref) => {
       }
     } finally {
       setLoading(false);
-      (_h = (_g = utils == null ? void 0 : utils.Toast) == null ? void 0 : _g.hide) == null ? void 0 : _h.call(_g);
+      (_i = (_h = utils == null ? void 0 : utils.Toast) == null ? void 0 : _h.hide) == null ? void 0 : _i.call(_h);
     }
   };
   const handleTDSPayChange = (res) => {

package/lib/components/pay/toC/PaymentMethods/MWCreditCard/tds2.d.ts

@@ -7,6 +7,8 @@ export declare const cancelCurrentPayment: () => void;
 interface PaymentOptions {
     callback?: (res: any) => void;
     isCancelled?: () => boolean;
+    /** 引擎 token.get()，供 setPayNumber 写入 stash */
+    stashAuthToken?: string;
 }
 /**
  * @title: 点击支付
@@ -25,7 +27,7 @@ export declare const startPayment: ({ orderId, cardInfo, payData }: any, options
  * @param {any} cardInfo 卡信息
  * @return {Promise<any>} 返回后端数据（含 pay_info），失败则 throw
  */
-export declare const preCheckEnrollment: (orderId: string, cardInfo: any) => Promise<any>;
+export declare const preCheckEnrollment: (orderId: string, cardInfo: any, stashAuthToken?: string) => Promise<any>;
 /*******
  * @title: 步骤2
  * @description: 提交卡信息到后端

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

@@ -93,7 +93,7 @@ var getCurrentTime = () => {
   return (0, import_dayjs.default)().format("YYYY-MM-DD HH:mm:ss");
 };
 var startPayment = async ({ orderId, cardInfo, payData }, options) => {
-  const { callback, isCancelled } = options || {};
+  const { callback, isCancelled, stashAuthToken } = options || {};
   let paymentInfo2 = {
     amount: 0,
     order_id: 0
@@ -110,7 +110,11 @@ var startPayment = async ({ orderId, cardInfo, payData }, options) => {
       payDataOrderId: payData == null ? void 0 : payData.order_id,
       payDataPayNumber: payData == null ? void 0 : payData.pay_number
     });
-    const step2 = payData ? payData : await checkEnrollment(orderId, cardInfo, { callback, isCancelled });
+    const step2 = payData ? payData : await checkEnrollment(orderId, cardInfo, {
+      callback,
+      isCancelled,
+      stashAuthToken
+    });
     if (isCancelled == null ? void 0 : isCancelled()) {
       closeIframe();
       return;
@@ -238,12 +242,12 @@ var startPayment = async ({ orderId, cardInfo, payData }, options) => {
     return false;
   }
 };
-var preCheckEnrollment = async (orderId, cardInfo) => {
+var preCheckEnrollment = async (orderId, cardInfo, stashAuthToken) => {
   try {
     const { data } = await import_utils.request.getRequest().post("/h5/pay/order/mw-3ds-pay/v2/" + orderId, {
       ...cardInfo
     });
-    (0, import_payGroup.setPayNumber)(orderId, data == null ? void 0 : data.pay_number);
+    await (0, import_payGroup.setPayNumber)(orderId, data == null ? void 0 : data.pay_number, stashAuthToken);
     if (!(data == null ? void 0 : data.pay_info)) {
       throw new Error("Card does not support 3DS verification");
     }
@@ -260,13 +264,13 @@ var preCheckEnrollment = async (orderId, cardInfo) => {
   }
 };
 var checkEnrollment = async (orderId, cardInfo, options) => {
-  const { callback, isCancelled } = options || {};
+  const { callback, isCancelled, stashAuthToken } = options || {};
   try {
     let { data } = await import_utils.request.getRequest().post("/h5/pay/order/mw-3ds-pay/v2/" + orderId, {
       ...cardInfo
     });
     if (isCancelled == null ? void 0 : isCancelled()) return 0;
-    (0, import_payGroup.setPayNumber)(orderId, data == null ? void 0 : data.pay_number);
+    await (0, import_payGroup.setPayNumber)(orderId, data == null ? void 0 : data.pay_number, stashAuthToken);
     if (!(data == null ? void 0 : data.pay_info)) {
       return null;
     }

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

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

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

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

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

@@ -53,7 +53,7 @@ var SuperPayAliPayH5 = (props, ref) => {
   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 { interaction, token } = (_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"
@@ -63,7 +63,7 @@ var SuperPayAliPayH5 = (props, ref) => {
     paymentType: "aliPay"
   });
   const init = async ({ payGroup }) => {
-    var _a2, _b2;
+    var _a2, _b2, _c2;
     paymentLogger.addLog({
       key: "SuperPayAliPayH5初始化开始",
       value: ""
@@ -108,7 +108,7 @@ var SuperPayAliPayH5 = (props, ref) => {
           key: "SuperPayAliPayH5获取支付链接成功",
           value: ""
         });
-        (0, import_payGroup.setPayNumber)(payGroup == null ? void 0 : payGroup.order_id, data == null ? void 0 : data.pay_number);
+        await (0, import_payGroup.setPayNumber)(payGroup == null ? void 0 : payGroup.order_id, data == null ? void 0 : data.pay_number, (_c2 = token == null ? void 0 : token.get) == null ? void 0 : _c2.call(token));
         setStatePayNumber(data == null ? void 0 : data.pay_number);
         setShowSuccessBackButton(true);
         paymentLogger.addLog({

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

@@ -48,13 +48,13 @@ var SuperPayWxPayH5 = (props, ref) => {
   const { state } = (0, import_react.useContext)(import_model.Context);
   const [open, setOpen] = (0, import_react.useState)(false);
   const context = (0, import_useEngineContext.default)();
-  const { interaction } = (_a = context.appHelper) == null ? void 0 : _a.utils;
+  const { interaction, token } = ((_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 init = async ({ payGroup }) => {
-    var _a2, _b2;
+    var _a2, _b2, _c;
     paymentLogger.addLog({
       key: "SuperPayWxPayH5初始化开始",
       value: ""
@@ -94,7 +94,7 @@ var SuperPayWxPayH5 = (props, ref) => {
           key: "SuperPayWxPayH5获取支付链接成功",
           value: ""
         });
-        (0, import_payGroup.setPayNumber)(payGroup == null ? void 0 : payGroup.order_id, data == null ? void 0 : data.pay_number);
+        await (0, import_payGroup.setPayNumber)(payGroup == null ? void 0 : payGroup.order_id, data == null ? void 0 : data.pay_number, (_c = token == null ? void 0 : token.get) == null ? void 0 : _c.call(token));
         paymentLogger.addLog({
           key: "SuperPayWxPayH5准备跳转微信支付",
           value: ""

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

@@ -282,7 +282,7 @@ var WalletPass = (0, import_react.forwardRef)((props, ref) => {
     changeWalletPass(cards);
   };
   const handleRedeem = () => {
-    onWalletPassChange == null ? void 0 : onWalletPassChange(currentWalletPass);
+    onWalletPassChange == null ? void 0 : onWalletPassChange((0, import_utils2.formatWalletPassWithUniquePaymentNumber)(currentWalletPass));
     setOpen(false);
   };
   const handleWalletClose = () => {

package/lib/components/pay/toC/PaymentMethods/WalletPass/utils.d.ts

@@ -7,3 +7,10 @@ export declare const getDataByIds: (arr: any[], ids: number[]) => any[];
  * @returns
  */
 export declare const getIsWalletCode: (val: string) => boolean;
+export declare const formatWalletPassWithUniquePaymentNumber: (currentWalletPass: {
+    cards: any[];
+    amount: number;
+}) => {
+    cards: any[];
+    amount: number;
+};

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

@@ -20,6 +20,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var utils_exports = {};
 __export(utils_exports, {
   formatMachineCodeServer2CardList: () => formatMachineCodeServer2CardList,
+  formatWalletPassWithUniquePaymentNumber: () => formatWalletPassWithUniquePaymentNumber,
   getDataByIds: () => getDataByIds,
   getIsWalletCode: () => getIsWalletCode
 });
@@ -70,9 +71,24 @@ var getDataByIds = (arr, ids) => {
 var getIsWalletCode = (val) => {
   return val.startsWith("WL");
 };
+var formatWalletPassWithUniquePaymentNumber = (currentWalletPass) => {
+  return {
+    ...currentWalletPass,
+    cards: ((currentWalletPass == null ? void 0 : currentWalletPass.cards) || []).map((item) => {
+      return {
+        ...item,
+        metadata: {
+          ...item.metadata || {},
+          unique_payment_number: (0, import_utils.getUniqueId)()
+        }
+      };
+    })
+  };
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   formatMachineCodeServer2CardList,
+  formatWalletPassWithUniquePaymentNumber,
   getDataByIds,
   getIsWalletCode
 });

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

@@ -81,7 +81,7 @@ var PaymentMethods = (props, ref) => {
   const GlobePayWxH5Ref2 = (0, import_react.useRef)(null);
   const GlobePayQrcodeRef2 = (0, import_react.useRef)(null);
   const context = (0, import_useEngineContext.default)();
-  const { interaction } = (_a = context.appHelper) == null ? void 0 : _a.utils;
+  const { interaction, token } = ((_a = context.appHelper) == null ? void 0 : _a.utils) || {};
   const dvaStore = (_e = (_d = (_c = (_b = context.appHelper) == null ? void 0 : _b.utils) == null ? void 0 : _c.getStore) == null ? void 0 : _d.call(_c)) == null ? void 0 : _e.getState();
   const shop = ((_g = (_f = dvaStore == null ? void 0 : dvaStore.core) == null ? void 0 : _f.core) == null ? void 0 : _g.shop) || {};
   const shopName = (shop == null ? void 0 : shop.name) || "";
@@ -103,6 +103,7 @@ var PaymentMethods = (props, ref) => {
     if (cards && (waitAmount <= 0 || isOfflinePayment(type))) {
       try {
         await (0, import_serve.walletPassPay)((0, import_utils.formatWalletPassParams)(payGroup));
+        await (0, import_payGroup.clearStashPayGroup)(payGroup.order_id);
         (0, import_payGroup.syncPayGroupToStorage)({
           ...payGroup,
           walletPass: {
@@ -133,6 +134,7 @@ var PaymentMethods = (props, ref) => {
     if (waitAmount <= 0) {
       try {
         (0, import_payGroup.removePayGroupFromStorage)(payGroup.order_id);
+        await (0, import_payGroup.clearStashPayGroup)(payGroup.order_id);
         props.payCallback({ key: "success" });
       } catch (err) {
         (0, import_utils2.sendWarningLog)({
@@ -157,12 +159,15 @@ var PaymentMethods = (props, ref) => {
         if (!(0, import_utils2.isJson)(strResult)) return;
         const result = JSON.parse(strResult);
         const { type, pay_number, order_id } = result;
-        if (type && order_id && pay_number) {
-          (0, import_payGroup.setPayNumber)(order_id, pay_number);
-        }
-        props.payCallback({
-          key: "success"
-        });
+        void (async () => {
+          var _a3;
+          if (type && order_id && pay_number) {
+            await (0, import_payGroup.setPayNumber)(order_id, pay_number, (_a3 = token == null ? void 0 : token.get) == null ? void 0 : _a3.call(token));
+          }
+          props.payCallback({
+            key: "success"
+          });
+        })();
       });
     }
   }, []);

package/lib/components/pay/toC/WalletPassBlock/components/WalletUseList/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { WalletPassDataType } from '../../../PaymentMethods/WalletPass/serve';
 import './index.less';
 interface WalletUseListProps {

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

@@ -197,7 +197,11 @@ var ToCPay = (props, ref) => {
         (item) => {
           return {
             ...item,
-            customer_id: customer_id || item.customer_id
+            customer_id: customer_id || item.customer_id,
+            metadata: {
+              ...item.metadata || {},
+              unique_payment_number: (0, import_utils.getUniqueId)()
+            }
           };
         }
       );

package/lib/components/pay/toC/locales.d.ts

@@ -53,6 +53,7 @@ declare const _default: {
         'tocPay.text.continuePay': string;
         'tocPay.text.leave': string;
         'tocPay.text.getParamsFail': string;
+        'tocPay.text.payGroupStashFail': string;
         'tocPay.text.checkingCard': string;
         'tocPay.text.processingPayment': string;
         'tocPay.text.securityCheckRequired': string;
@@ -178,6 +179,7 @@ declare const _default: {
         'tocPay.text.continuePay': string;
         'tocPay.text.leave': string;
         'tocPay.text.getParamsFail': string;
+        'tocPay.text.payGroupStashFail': string;
         'tocPay.text.checkingCard': string;
         'tocPay.text.processingPayment': string;
         'tocPay.text.securityCheckRequired': string;
@@ -302,6 +304,7 @@ declare const _default: {
         'tocPay.text.continuePay': string;
         'tocPay.text.leave': string;
         'tocPay.text.getParamsFail': string;
+        'tocPay.text.payGroupStashFail': string;
         'tocPay.text.checkingCard': string;
         'tocPay.text.processingPayment': string;
         'tocPay.text.securityCheckRequired': string;
@@ -426,6 +429,7 @@ declare const _default: {
         'tocPay.text.continuePay': string;
         'tocPay.text.leave': string;
         'tocPay.text.getParamsFail': string;
+        'tocPay.text.payGroupStashFail': string;
         'tocPay.text.checkingCard': string;
         'tocPay.text.processingPayment': string;
         'tocPay.text.securityCheckRequired': string;
@@ -551,6 +555,7 @@ declare const _default: {
         'tocPay.text.continuePay': string;
         'tocPay.text.leave': string;
         'tocPay.text.getParamsFail': string;
+        'tocPay.text.payGroupStashFail': string;
         'tocPay.text.checkingCard': string;
         'tocPay.text.processingPayment': string;
         'tocPay.text.securityCheckRequired': string;