@pisell/private-materials 6.4.42 → 6.5.2

package/lib/components/checkout/utils/PaymentResultToastUtils.js

@@ -70,7 +70,7 @@ var calculateSubtitle = (status, amount, gapAmount, getData) => {
     case "paid":
       if (gapAmount) {
         text = `${import_utils.locales.getText("payment.result.changeDue") || "Change Due"} ${formatCurrency(Math.abs(gapAmount), amountSymbol)}`;
-        colorClass = "paid";
+        colorClass = "partially-paid";
       } else {
         text = `${import_utils.locales.getText("payment.result.paid") || "Paid"} ${formatCurrency(amount, amountSymbol)}`;
         colorClass = "paid";
@@ -93,7 +93,7 @@ var calculateSubtitle = (status, amount, gapAmount, getData) => {
     default:
       return null;
   }
-  return /* @__PURE__ */ import_react.default.createElement("div", { className: "payment-result-toast-subtitle" }, /* @__PURE__ */ import_react.default.createElement("div", { className: getSubtitleClassName(colorClass) }, text));
+  return /* @__PURE__ */ import_react.default.createElement("div", { className: "payment-result-toast-subtitle" }, /* @__PURE__ */ import_react.default.createElement("h1", { className: getSubtitleClassName(colorClass) }, text));
 };
 var calculateStatusClassName = (status) => {
   switch (status) {
@@ -109,36 +109,36 @@ var calculateStatusClassName = (status) => {
   }
 };
 var calculateAutoCloseConfig = (status, hasChangeDue) => {
-  const autoCloseDelay = 30;
   switch (status) {
     case "paid":
       return {
         autoClose: true,
-        autoCloseDelay,
-        maskClosable: false
+        autoCloseDelay: hasChangeDue ? 30 : 5,
+        // 有找零30秒，无找零5秒
+        maskClosable: true
       };
     case "partially_paid":
       return {
         autoClose: true,
-        autoCloseDelay,
-        maskClosable: false
+        autoCloseDelay: 5,
+        maskClosable: true
       };
     case "failed":
     case "wallet-pass-redemption-failed":
       return {
         autoClose: false,
-        autoCloseDelay,
+        autoCloseDelay: 0,
         maskClosable: false
       };
     default:
       return {
         autoClose: false,
-        autoCloseDelay,
+        autoCloseDelay: 5,
         maskClosable: false
       };
   }
 };
-var displayPaymentResultToast = async (params, config) => {
+var displayPaymentResultToast = (params, config) => {
   const {
     paymentStatus,
     orderTotalAmount,
@@ -149,7 +149,7 @@ var displayPaymentResultToast = async (params, config) => {
   } = params;
   const { getData, onToastClose } = config;
   if (paymentStatus === "paid") {
-    await (0, import_PaymentResultToast.showPaymentResultToastSuccess)({
+    (0, import_PaymentResultToast.showPaymentResultToastSuccess)({
       title: calculateTitle(paymentStatus),
       subtitle: calculateSubtitle(
         paymentStatus,
@@ -161,14 +161,10 @@ var displayPaymentResultToast = async (params, config) => {
       autoCloseDelay: (autoCloseConfig == null ? void 0 : autoCloseConfig.autoCloseDelay) || 3e3,
       showCountdownProgress: true,
       actionButtons: actionButtons || [],
-      onClose: onToastClose || (() => {
-      }),
-      // 提供默认空函数
-      closable: false
-      // 控制关闭按钮显示
+      onClose: onToastClose
     });
   } else if (paymentStatus === "partially_paid") {
-    await (0, import_PaymentResultToast.showPaymentResultToastSuccess)({
+    (0, import_PaymentResultToast.showPaymentResultToastSuccess)({
       title: calculateTitle(paymentStatus),
       subtitle: calculateSubtitle(
         paymentStatus,
@@ -178,12 +174,10 @@ var displayPaymentResultToast = async (params, config) => {
       ),
       autoClose: (autoCloseConfig == null ? void 0 : autoCloseConfig.autoClose) || false,
       actionButtons: actionButtons || [],
-      onClose: onToastClose || (() => {
-      })
-      // 提供默认空函数
+      onClose: onToastClose
     });
   } else if (paymentStatus === "failed" || paymentStatus === "error") {
-    await (0, import_PaymentResultToast.showPaymentResultToastFailed)({
+    (0, import_PaymentResultToast.showPaymentResultToastFailed)({
       title: calculateTitle(paymentStatus, failureReason),
       subtitle: calculateSubtitle(
         paymentStatus,
@@ -193,14 +187,12 @@ var displayPaymentResultToast = async (params, config) => {
       ),
       autoClose: (autoCloseConfig == null ? void 0 : autoCloseConfig.autoClose) || false,
       actionButtons: actionButtons || [],
-      onClose: onToastClose || (() => {
-      })
-      // 提供默认空函数
+      onClose: onToastClose
     });
   }
 };
 var createShowSuccessToast = (config, getActionButtons) => {
-  return async (result) => {
+  return (result) => {
     var _a;
     const responseData = (_a = result.response) == null ? void 0 : _a.data;
     const paymentStatus = responseData == null ? void 0 : responseData.payment_status;
@@ -211,7 +203,7 @@ var createShowSuccessToast = (config, getActionButtons) => {
       !!gapAmount
     );
     const actionButtons = getActionButtons ? getActionButtons(paymentStatus) : [];
-    await displayPaymentResultToast({
+    displayPaymentResultToast({
       paymentStatus,
       orderTotalAmount,
       gapAmount,

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/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { Eftpos, DeviceStatus } from './const';
 import './index.less';
 interface PosProps {

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { DeviceProp } from "./const";
 interface PosProps {
     eftposName: string;

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

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

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { PosProps } from './const';
 /**
  * @title: 支付金额信息配置页

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/fail/failCustom.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { ActionProps } from '../../const';
 declare const _default: ({ className, isMobile, onChange }: ActionProps) => JSX.Element;
 export default _default;

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { ActionProps } from '../../const';
 declare const _default: ({ onChange, className, isMobile }: ActionProps) => JSX.Element;
 export default _default;

package/lib/components/eftposPay/component/fail/network.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { ActionProps } from '../../const';
 /**
  * @title: 断网(客户端)提示页

package/lib/components/eftposPay/component/fail/unknow.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { ActionProps } from '../../const';
 /**
  * @title: 支付状态未知页面

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/manual/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { ActionProps } from '../../const';
 import './index.less';
 /**

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { ActionProps } from '../../const';
 /**
  * @title: 取消签名确认页

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/pay.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { PayProps } from './const';
 import './index.less';
 /**

package/lib/components/eftposPay/payo/config.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { StatusEnum } from '../const';
 export declare const POS: ({ api, onChange, }: {
     api: {

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './tip.less';
 /**
  * @title: 支付状态未知页面

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

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

package/lib/components/eftposPay/windcave/receiptAction.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 /**
  * @title: 按钮操作区
  * @description: 仅包含签名

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 declare const _default: ({ api, onChange, formatAmount, }: {
     api: any;
     onChange: any;

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/Cart/Item/index.d.ts

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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/Provider/OrderProductModal/index.d.ts

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

package/lib/components/eventBooking/components/Provider/RemoveOptionConfirmModal.d.ts

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

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

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

package/lib/components/eventBooking/components/Provider/SelectHolderModal.d.ts

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

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

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

package/lib/components/eventBooking/components/bookingDetailModal/components/Schedule.d.ts

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

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/login/index.d.ts

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

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

@@ -38,13 +38,9 @@ var import_ahooks = require("ahooks");
 var import_EFTPos = __toESM(require("../../../../eftposPay/EFTPos"));
 var import_utils = require("../../../../../utils");
 var import_useLogger = __toESM(require("../../../../../hooks/useLogger"));
-var import_hooks = require("../../../../../hooks");
 var import_index = require("./index.less");
 var updateTransactionReceiveStatus = async (params) => import_utils.request.getRequest().post("/shop/pay/card-reader/transaction/receive/status", params);
 var EFTPOS = (props, ref) => {
-  var _a;
-  const context = (0, import_hooks.useEngineContext)();
-  const { interaction } = ((_a = context.appHelper) == null ? void 0 : _a.utils) || {};
   const logger = (0, import_useLogger.default)();
   const network = (0, import_ahooks.useNetwork)();
   const [visible, setVisible] = (0, import_react.useState)(false);
@@ -55,9 +51,9 @@ var EFTPOS = (props, ref) => {
   const eftposInitDataRef = (0, import_react.useRef)(null);
   const [isEftposLoading, setIsEftposLoading] = (0, import_react.useState)(false);
   (0, import_react.useEffect)(() => {
-    var _a2, _b;
+    var _a, _b;
     if (eftposRef.current) {
-      (_b = (_a2 = eftposRef.current) == null ? void 0 : _a2.updateNetwork) == null ? void 0 : _b.call(_a2, { network: network.online });
+      (_b = (_a = eftposRef.current) == null ? void 0 : _a.updateNetwork) == null ? void 0 : _b.call(_a, { network: network.online });
     }
   }, [network.online]);
   const closeModal = () => {
@@ -65,8 +61,8 @@ var EFTPOS = (props, ref) => {
     eftposHandlingRef.current = false;
     setVisible(false);
   };
-  const onOpen = async ({ source, data, payCallback }) => {
-    var _a2, _b, _c, _d, _e;
+  const onOpen = ({ source, data, payCallback }) => {
+    var _a, _b, _c;
     if (eftposHandlingRef.current || visible) {
       logger == null ? void 0 : logger.addLog({
         type: "info",
@@ -76,15 +72,6 @@ var EFTPOS = (props, ref) => {
       return;
     }
     eftposHandlingRef.current = true;
-    let device_number = "";
-    try {
-      device_number = await ((_b = (_a2 = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _a2.asyncDataManager) == null ? void 0 : _b.call(_a2, {
-        module: "get",
-        key: "device_number"
-      }));
-    } catch (error) {
-      console.error("获取设备编号失败", error);
-    }
     const { type, payMethod, params, mode } = data;
     const newData = {
       type,
@@ -96,14 +83,12 @@ var EFTPOS = (props, ref) => {
         order_id: params.orderId,
         name: payMethod.name,
         symbol: params.symbol,
-        amount: params.amount,
-        device_number
+        amount: params.amount
       },
       mode
     };
-    console.log("newData>>>>>>>>>>>>>>", newData);
     if (!(newData == null ? void 0 : newData.type) && (newData == null ? void 0 : newData.code)) {
-      newData.type = (_e = (_d = (_c = newData.code) == null ? void 0 : _c.split("_")) == null ? void 0 : _d[1]) == null ? void 0 : _e.toLocaleLowerCase();
+      newData.type = (_c = (_b = (_a = newData.code) == null ? void 0 : _a.split("_")) == null ? void 0 : _b[1]) == null ? void 0 : _c.toLocaleLowerCase();
     }
     logger == null ? void 0 : logger.addLog({
       type: "info",
@@ -128,7 +113,7 @@ var EFTPOS = (props, ref) => {
     }
   };
   const onAfterOpenChange = (v) => {
-    var _a2, _b;
+    var _a, _b;
     logger == null ? void 0 : logger.addLog({
       type: "info",
       title: "ToB_EFTPOS_modal_onAfterOpenChange",
@@ -136,7 +121,7 @@ var EFTPOS = (props, ref) => {
     });
     if (v) {
       const { data, source } = eftposInitDataRef.current;
-      (_b = (_a2 = eftposRef.current) == null ? void 0 : _a2.update) == null ? void 0 : _b.call(_a2, data, source);
+      (_b = (_a = eftposRef.current) == null ? void 0 : _a.update) == null ? void 0 : _b.call(_a, data, source);
       eftposInitDataRef.current = null;
     }
   };
@@ -163,7 +148,7 @@ var EFTPOS = (props, ref) => {
     eftposHandlingRef.current = false;
   };
   const onPayResult = ({ status, params }) => {
-    var _a2;
+    var _a;
     logger == null ? void 0 : logger.addLog({
       type: "info",
       title: "ToB_EFTPOS_onPayResult",
@@ -171,7 +156,7 @@ var EFTPOS = (props, ref) => {
     });
     handleResult(status, params);
     if (status === "success" || status === "fail") {
-      (_a2 = payCallbackRef.current) == null ? void 0 : _a2.call(payCallbackRef, { status, params });
+      (_a = payCallbackRef.current) == null ? void 0 : _a.call(payCallbackRef, { status, params });
       closeModal();
     }
   };

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