@pisell/private-materials 6.3.215 → 6.3.216

package/es/components/eftposPay/aggregatePayment/utils/payment.js

@@ -4,7 +4,7 @@ import { _asyncToGenerator } from "../../../../_virtual/_@oxc-project_runtime@0.
 import { PayStatus } from "../../const.js";
 import { cloneDeep, getUuid } from "../../helper.js";
 import payLog from "../../utils/payLog.js";
-import { ActionType, EPaymentStatus, QUERY_INTERVAL, QUERY_START_DELAY, REQUEST_TIMEOUT } from "../types.js";
+import { ActionType, EPaymentStatus, QUERY_INTERVAL, QUERY_START_DELAY } from "../types.js";
 import { AGPTActionApi, AGPTPayApi, AGPTQueryApi, AGPTRefundActionApi, AGPTRefundApi, AGPTRefundQueryApi } from "../service.js";
 import { locales } from "@pisell/utils";
 //#region src/components/eftposPay/aggregatePayment/utils/payment.ts
@@ -35,6 +35,7 @@ var PaymentMethod = class {
 		_defineProperty(this, "callback", void 0);
 		_defineProperty(this, "shouldContinue", void 0);
 		_defineProperty(this, "config", {});
+		_defineProperty(this, "mx51TransactionVersion", void 0);
 		_defineProperty(this, "controller", null);
 		_defineProperty(this, "queryController", null);
 		_defineProperty(this, "queryStartTimer", null);
@@ -65,22 +66,37 @@ var PaymentMethod = class {
 			}
 		});
 	}
+	get isMx51() {
+		return this.initOptions.paymentCode === "EFTPOS_MX51";
+	}
+	updateMx51TransactionVersion(res) {
+		var _res$data;
+		if (!this.isMx51 || `${res === null || res === void 0 ? void 0 : res.code}` !== "200") return;
+		const version = res === null || res === void 0 || (_res$data = res.data) === null || _res$data === void 0 || (_res$data = _res$data.external_unified_response) === null || _res$data === void 0 || (_res$data = _res$data.transaction) === null || _res$data === void 0 ? void 0 : _res$data.version;
+		if (typeof version !== "number" || !Number.isSafeInteger(version) || version <= 0) return;
+		this.mx51TransactionVersion = Math.max(this.mx51TransactionVersion || 0, version);
+	}
+	isMx51QueryRetry(res) {
+		var _res$data2;
+		const response = res === null || res === void 0 || (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.external_unified_response;
+		return this.isMx51 && (response === null || response === void 0 ? void 0 : response.external_unified_status) === EPaymentStatus.Processing && !(response === null || response === void 0 ? void 0 : response.transaction) && (response === null || response === void 0 ? void 0 : response.external_unified_retry) === true;
+	}
 	/**
 	* 判断请求是否需要等待轮询结果
 	* 1. 有明确错误code且不是超时和支付超时，则直接失败
 	* @param code 错误码
 	*/
 	isBusinessFailed(res) {
-		var _res$data;
-		const { external_unified_status, response_code } = (res === null || res === void 0 || (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.external_unified_response) || {};
+		var _res$data3;
+		const { external_unified_status, response_code } = (res === null || res === void 0 || (_res$data3 = res.data) === null || _res$data3 === void 0 ? void 0 : _res$data3.external_unified_response) || {};
 		return `${res === null || res === void 0 ? void 0 : res.code}` === "200" && external_unified_status === EPaymentStatus.Failed && response_code !== PayStatus.Timeout && response_code !== PayStatus.PayTimeout;
 	}
 	/**
 	* 判断业务是否成功
 	*/
 	isBusinessSuccess(res) {
-		var _res$data2;
-		const { external_unified_status } = (res === null || res === void 0 || (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.external_unified_response) || {};
+		var _res$data4;
+		const { external_unified_status } = (res === null || res === void 0 || (_res$data4 = res.data) === null || _res$data4 === void 0 ? void 0 : _res$data4.external_unified_response) || {};
 		return `${res === null || res === void 0 ? void 0 : res.code}` === "200" && external_unified_status === EPaymentStatus.Success;
 	}
 	/**
@@ -243,10 +259,10 @@ var PaymentMethod = class {
 	* 处理接口响应
 	*/
 	handleResponse(res) {
-		var _res$data3;
+		var _res$data5;
 		if (!this.currentActionType) return;
 		let needContinue = true;
-		const { external_unified_status } = (res === null || res === void 0 || (_res$data3 = res.data) === null || _res$data3 === void 0 ? void 0 : _res$data3.external_unified_response) || {};
+		const { external_unified_status } = (res === null || res === void 0 || (_res$data5 = res.data) === null || _res$data5 === void 0 ? void 0 : _res$data5.external_unified_response) || {};
 		switch (external_unified_status) {
 			case EPaymentStatus.Success:
 				this.handleOperationSuccess(res);
@@ -302,16 +318,21 @@ var PaymentMethod = class {
 			_this.currentQueryId = queryId;
 			_this.queryController = new AbortController();
 			const { signal } = _this.queryController;
+			let _extraParams = {};
+			if (_this.isMx51) {
+				var _this$mx51Transaction;
+				_extraParams.min_version = ((_this$mx51Transaction = _this.mx51TransactionVersion) !== null && _this$mx51Transaction !== void 0 ? _this$mx51Transaction : 0) + 1;
+			}
 			paymentLog.addLog({ title: "查询轮询：开始单次查询" });
 			try {
-				var _this$initOptions, _res$data4;
-				const res = yield Promise.race([_this.currentQueryApi({
+				var _this$initOptions, _res$data6;
+				const res = yield Promise.race([_this.currentQueryApi(_objectSpread2({
 					order_id: _this.orderId,
 					unique_payment_number: _this.paymentNum,
 					payment_code: (_this$initOptions = _this.initOptions) === null || _this$initOptions === void 0 ? void 0 : _this$initOptions.paymentCode,
 					request_version: queryId,
 					is_force_request_api: 1
-				}, { signal }), _this.createTimeoutPromise(REQUEST_TIMEOUT)]);
+				}, _extraParams), { signal }), _this.createTimeoutPromise(_this.config.singleQueryTimeout || 1e4)]);
 				paymentLog.addLog({
 					title: "查询轮询：单次查询返回",
 					content: {
@@ -323,7 +344,7 @@ var PaymentMethod = class {
 					clearTimeout(_this.requestTimeoutTimer);
 					_this.requestTimeoutTimer = null;
 				}
-				if ((res === null || res === void 0 || (_res$data4 = res.data) === null || _res$data4 === void 0 ? void 0 : _res$data4.request_version) !== _this.currentQueryId) {
+				if ((res === null || res === void 0 || (_res$data6 = res.data) === null || _res$data6 === void 0 ? void 0 : _res$data6.request_version) !== _this.currentQueryId) {
 					paymentLog.addLog({ title: "查询轮询结果：过期的查询响应，忽略" });
 					return;
 				}
@@ -336,6 +357,12 @@ var PaymentMethod = class {
 					_this.handleOperationError(res);
 					return;
 				}
+				if (_this.isMx51QueryRetry(res)) {
+					paymentLog.addLog({ title: "查询轮询：MX51等待新版本，保持当前渲染并重试" });
+					_this.scheduleNextQuery(actionType);
+					return;
+				}
+				_this.updateMx51TransactionVersion(res);
 				if (_this.isBusinessSuccess(res)) {
 					paymentLog.addLog({ title: "查询轮询结果：查询成功" });
 					if (_this.handleResponse(res)) _this.scheduleNextQuery(actionType);
@@ -531,7 +558,7 @@ var PaymentMethod = class {
 				_this3.startQuery(actionType);
 			};
 			try {
-				var _res$data5;
+				var _res$data7;
 				paymentLog.addLog({
 					title: `发起${actionType}请求`,
 					content: {
@@ -548,7 +575,7 @@ var PaymentMethod = class {
 						res
 					}
 				});
-				if (runId != (res === null || res === void 0 || (_res$data5 = res.data) === null || _res$data5 === void 0 ? void 0 : _res$data5.request_version)) {
+				if ((res === null || res === void 0 || (_res$data7 = res.data) === null || _res$data7 === void 0 ? void 0 : _res$data7.request_version) !== _this3.currentRunId) {
 					paymentLog.addLog({
 						title: "响应过期，忽略",
 						content: { actionType }
@@ -567,6 +594,7 @@ var PaymentMethod = class {
 					_this3.handleOperationError(res);
 					return;
 				}
+				_this3.updateMx51TransactionVersion(res);
 				if (_this3.isBusinessSuccess(res)) {
 					paymentLog.addLog({
 						title: `${actionType}接口成功`,
@@ -589,7 +617,7 @@ var PaymentMethod = class {
 					_this3.handleOperationError(res);
 				} else {
 					_this3.handleOperationProcess(res);
-					_query("failed", `${actionType}超时或无明确错误，开始轮询`, {
+					_query("processing", `${actionType}接口未返回最终结果，开始轮询`, {
 						actionType,
 						res
 					});
@@ -642,7 +670,7 @@ var PaymentMethod = class {
 			_this4.controller = new AbortController();
 			const { signal } = _this4.controller;
 			try {
-				var _res$data6;
+				var _res$data8;
 				const res = yield actionApi(_objectSpread2(_objectSpread2({}, params || {}), {}, { request_version: runActionId }), { signal });
 				if (_this4.isFinished || !_this4.shouldContinue()) {
 					paymentLog.addLog({
@@ -651,13 +679,14 @@ var PaymentMethod = class {
 					});
 					return;
 				}
-				if (runActionId !== (res === null || res === void 0 || (_res$data6 = res.data) === null || _res$data6 === void 0 ? void 0 : _res$data6.request_version)) {
+				if ((res === null || res === void 0 || (_res$data8 = res.data) === null || _res$data8 === void 0 ? void 0 : _res$data8.request_version) !== _this4.currentRunId) {
 					paymentLog.addLog({
 						title: "Action响应过期，忽略",
 						content: { actionType }
 					});
 					return;
 				}
+				_this4.updateMx51TransactionVersion(res);
 				if (config === null || config === void 0 ? void 0 : config.needResponse) {
 					_this4.handleResponse(res);
 					return;
@@ -766,6 +795,7 @@ var PaymentMethod = class {
 	destroy() {
 		paymentLog.addLog({ title: "支付步骤结束，销毁实例" });
 		this.clean(true);
+		this.mx51TransactionVersion = void 0;
 	}
 };
 //#endregion

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

@@ -9,7 +9,7 @@ import { useFail, useStoreRef } from "../hooks.js";
 import payLog from "../utils/payLog.js";
 import { EPaymentStatus } from "../aggregatePayment/types.js";
 import { usePayment } from "../aggregatePayment/hooks/usePayment.js";
-import { CANCEL_ACTION_TIMEOUT, EButtonKeyType } from "./types.js";
+import { EButtonKeyType } from "./types.js";
 import { parseMX51Params } from "./utils.js";
 import Action from "./Action.js";
 import { getInitState } from "../manufacturer.js";
@@ -41,7 +41,6 @@ const AggregatePayment = ({ onChange }) => {
 	const [cancelDisabled, setCancelDisabled] = useState(false);
 	const clickLockedRef = useRef(false);
 	const clickUnlockTimerRef = useRef(null);
-	const actionTimeoutRef = useRef(null);
 	const clearRef = useRef(null);
 	useEffect(() => {
 		failRef.current = fail;
@@ -62,7 +61,8 @@ const AggregatePayment = ({ onChange }) => {
 		config: {
 			hasQueryInterval: false,
 			globalQueryTimeout: 1e3 * 60 * 2,
-			requestDelaySeconds: 130
+			requestDelaySeconds: 130,
+			singleQueryTimeout: 1e3 * 30
 		},
 		callback: (_instance, response) => {
 			var _data$data;
@@ -72,7 +72,6 @@ const AggregatePayment = ({ onChange }) => {
 			const transformedData = parseMX51Params(transaction, status, data);
 			console.log("event_transformedData =>>>>>> ", transformedData);
 			dispatch(updateCustom({ customAction: transformedData }));
-			let needClearActionTimeout = true;
 			if (status === EPaymentStatus.Processing) if (action === "signature") {
 				var _transformedData$auto;
 				dispatch(updateStatus(StatusEnum.Question));
@@ -82,22 +81,12 @@ const AggregatePayment = ({ onChange }) => {
 					const merchantReceipt = (transformedData === null || transformedData === void 0 ? void 0 : transformedData.merchantReceipt) || "";
 					onChange("print", merchantReceipt ? [merchantReceipt] : []);
 				}
-			} else {
-				needClearActionTimeout = false;
-				updateToLoading();
-			}
+			} else updateToLoading();
 			else if (status === EPaymentStatus.Success) handleSuccess(data);
 			else if (status === EPaymentStatus.Failed) if (transformedData) {
 				dispatch(updateStatus("fail"));
 				dispatch(updateState({ title: (transformedData === null || transformedData === void 0 ? void 0 : transformedData.message) || "" }));
 			} else handleFail(data);
-			if (needClearActionTimeout) {
-				if (actionTimeoutRef.current) {
-					payLog.log("清除操作行为超时定时器");
-					clearTimeout(actionTimeoutRef.current);
-					actionTimeoutRef.current = null;
-				}
-			}
 		}
 	});
 	useEffect(() => {
@@ -116,10 +105,6 @@ const AggregatePayment = ({ onChange }) => {
 		return () => {
 			console.log("页面卸载");
 			unloadRef.current = true;
-			if (actionTimeoutRef.current) {
-				clearTimeout(actionTimeoutRef.current);
-				actionTimeoutRef.current = null;
-			}
 			if (clearRef.current) {
 				clearTimeout(clearRef.current);
 				clearRef.current = null;
@@ -188,12 +173,6 @@ const AggregatePayment = ({ onChange }) => {
 		console.log("onCancel", element);
 		setCancelDisabled(true);
 		payment.action({ submit_url: element === null || element === void 0 ? void 0 : element.submitUrl });
-		actionTimeoutRef.current = setTimeout(() => {
-			var _payment$_instance, _payment$_instance$st, _failRef$current2;
-			payLog.log("取消操作超时，前往标记支付");
-			payment === null || payment === void 0 || (_payment$_instance = payment._instance) === null || _payment$_instance === void 0 || (_payment$_instance$st = _payment$_instance.stop) === null || _payment$_instance$st === void 0 || _payment$_instance$st.call(_payment$_instance);
-			(_failRef$current2 = failRef.current) === null || _failRef$current2 === void 0 || _failRef$current2.call(failRef, { code: PayStatus.Timeout }, true);
-		}, CANCEL_ACTION_TIMEOUT);
 	};
 	const onDecline = (element) => {
 		payment.action({ submit_url: element === null || element === void 0 ? void 0 : element.submitUrl });

package/es/components/eftposPay/mx51/types.js

@@ -20,9 +20,5 @@ let EButtonKeyType = /* @__PURE__ */ function(EButtonKeyType) {
 	EButtonKeyType["CallTestFunction"] = "call_test_function";
 	return EButtonKeyType;
 }({});
-/**
-* 操作行为超时时间
-*/
-const CANCEL_ACTION_TIMEOUT = 1e3 * 20;
 //#endregion
-export { CANCEL_ACTION_TIMEOUT, EButtonKeyType };
+export { EButtonKeyType };

package/es/index.js

@@ -106,7 +106,6 @@ import PisellVenueControlPage from "./plus/pisellReservation/PisellVenueControlP
 import PisellVenueWallPage from "./plus/pisellReservation/PisellVenueWallPage.js";
 import PisellReservationTablePage from "./plus/pisellReservation/PisellReservationTablePage.js";
 import SelectFloorMapResourceDialog from "./plus/pisellReservation/components/SelectFloorMapResourceDialog.js";
-import "./plus/pisellReservation/index.js";
 import { PisellTopology, PisellTopologyCore } from "./plus/pisellTopology/PisellTopology.js";
 import pisellAdyenDashboard_default from "./plus/pisellAdyenDashboard/index.js";
 import weekday from "dayjs/plugin/weekday";

package/es/plus/pisellReservation/data/bookingToReservationTables.js

@@ -259,4 +259,4 @@ function bookingListToReservationTableRows(bookings) {
 	return rows;
 }
 //#endregion
-export { applyHostResourceShellToBaseRow, bookingListToReservationTableRows, customerBrief, extractResourceRecordIds, filterBookingsByResourceIds, hostBookingStatusToCardStatus, hostBookingUiPatchFromRecord, isMonitorScheduleBookingSkipped, mergeBookingsForResourceRecord };
+export { applyHostResourceShellToBaseRow, bookingListToReservationTableRows, customerBrief, extractResourceRecordIds, filterBookingsByResourceIds, hostBookingUiPatchFromRecord, isMonitorScheduleBookingSkipped, mergeBookingsForResourceRecord };

package/es/plus/pisellReservation/floorMap/floorPlanApi.js

@@ -79,4 +79,4 @@ function toastFloorPlanLoadError(err) {
 	PisellToast({ content: err instanceof Error ? err.message : String(err) });
 }
 //#endregion
-export { PISELL_RESERVATION_FLOOR_PLAN_CODE, buildDefaultReservationFloorPlanPostBody, ensureShopFloorPlanByCode, putShopFloorPlan, saveViewConfigToShopFloorPlan, shopLayoutToSceneElements$1 as shopLayoutToSceneElements, toastFloorPlanLoadError, toastFloorPlanSaveError, unsubscribeShopFloorPlanCodeQuery };
+export { PISELL_RESERVATION_FLOOR_PLAN_CODE, ensureShopFloorPlanByCode, saveViewConfigToShopFloorPlan, shopLayoutToSceneElements$1 as shopLayoutToSceneElements, toastFloorPlanLoadError, toastFloorPlanSaveError, unsubscribeShopFloorPlanCodeQuery };

package/es/plus/pisellReservation/floorMap/reservationMock.js

@@ -927,4 +927,4 @@ function getReservationDataSourceFormColumns() {
 	];
 }
 //#endregion
-export { RESERVATION_BOUND_ROUND_TABLE_ELEMENT_KIND, RESERVATION_BOUND_TABLE_ELEMENT_KIND, applyReservationFloorMapLiveLabels, defaultReservationSceneElements, defaultReservationTableRows, getDefaultReservationFloorMapConfig, getReservationDataSourceFormColumns, getReservationFloorMapShellConfig, mergeFloorMapElementKindCategoriesWithDefaults, mergeFloorMapElementKindsWithDefaults };
+export { RESERVATION_BOUND_ROUND_TABLE_ELEMENT_KIND, RESERVATION_BOUND_TABLE_ELEMENT_KIND, applyReservationFloorMapLiveLabels, defaultReservationTableRows, getDefaultReservationFloorMapConfig, getReservationDataSourceFormColumns, getReservationFloorMapShellConfig, mergeFloorMapElementKindCategoriesWithDefaults, mergeFloorMapElementKindsWithDefaults };

package/es/plus/saasDevice/devicePasscodes/model.js

@@ -1,10 +1,10 @@
 import { _objectSpread2 } from "../../../_virtual/_@oxc-project_runtime@0.122.0/helpers/objectSpread2.js";
 import dayjs from "dayjs";
-import timezone from "dayjs/plugin/timezone";
-import utc from "dayjs/plugin/utc";
+import timezonePlugin from "dayjs/plugin/timezone";
+import utcPlugin from "dayjs/plugin/utc";
 //#region src/plus/saasDevice/devicePasscodes/model.ts
-dayjs.extend(utc);
-dayjs.extend(timezone);
+dayjs.extend(utcPlugin);
+dayjs.extend(timezonePlugin);
 const INITIAL_DEVICE_PASSCODE_STATE = {
 	deviceIds: [],
 	devicesById: {}

package/es/plus/walletPassGallery/components/timelineSection/index.js

@@ -6,12 +6,12 @@ import React, { useCallback, useMemo } from "react";
 import { locales } from "@pisell/utils";
 import { Button, PisellEmpty, PisellModal, PisellStatisticList, Skeleton, Timeline, usePisellConfig } from "@pisell/materials";
 import { useRequest } from "ahooks";
-import timezone from "dayjs/plugin/timezone";
-import utc from "dayjs/plugin/utc";
+import timezonePlugin from "dayjs/plugin/timezone";
+import utcPlugin from "dayjs/plugin/utc";
 import "./index.less";
 //#region src/plus/walletPassGallery/components/timelineSection/index.tsx
-dayjs.extend(timezone);
-dayjs.extend(utc);
+dayjs.extend(timezonePlugin);
+dayjs.extend(utcPlugin);
 const stateTimeUnix = 1723255863;
 const TimelineSection = (props) => {
 	const { code, tag, timezone, apiPrefix, isTerminalEnv, interaction, locale, translation, virtualCurrencyDisplay } = props;

package/es/private-materials/lowcode/authmodal/meta.d.ts

@@ -0,0 +1 @@
+export { };

package/es/pro/Login2.0/AuthModal.d.ts

@@ -9,4 +9,4 @@ interface AuthModalProps {}
  */
 declare const AuthModal: React.FC<AuthModalProps>;
 //#endregion
-export { AuthModal };
+export { AuthModal, AuthModalProps };

package/es/pro/Login2.0/index.d.ts

@@ -1,4 +1,3 @@
-import { AuthMethodType, EmailAuthConfig, EmailRegistrationVerification, LoginFormData, OAuthConfig, PhoneAuthConfig, RegisterFormData, UIConfig, VerificationMethod } from "./shared/types.js";
 import { Login2, Login2Config, Login2Events, Login2Props } from "./Login2.js";
 import { Register2, Register2Config, Register2Events, Register2Props } from "./Register2.js";
-import { AuthModal } from "./AuthModal.js";
+import { AuthModal, AuthModalProps } from "./AuthModal.js";

package/es/pro/Login2.0/shared/types.d.ts

@@ -226,4 +226,4 @@ interface RegisterFormData {
   verification_token?: string;
 }
 //#endregion
-export { AuthMethodType, EmailAuthConfig, EmailRegistrationVerification, LegalTermsConfig, LoginFormData, LoginMethodItem, OAuthConfig, PhoneAuthConfig, RegisterFormData, RegistrationMethodItem, UIConfig, VerificationMethod };
+export { AuthMethodType, EmailAuthConfig, LegalTermsConfig, LoginFormData, LoginMethodItem, OAuthConfig, PhoneAuthConfig, RegisterFormData, RegistrationMethodItem, UIConfig };

package/lib/components/eftposPay/aggregatePayment/utils/payment.js

@@ -36,6 +36,7 @@ var PaymentMethod = class {
 		require_defineProperty._defineProperty(this, "callback", void 0);
 		require_defineProperty._defineProperty(this, "shouldContinue", void 0);
 		require_defineProperty._defineProperty(this, "config", {});
+		require_defineProperty._defineProperty(this, "mx51TransactionVersion", void 0);
 		require_defineProperty._defineProperty(this, "controller", null);
 		require_defineProperty._defineProperty(this, "queryController", null);
 		require_defineProperty._defineProperty(this, "queryStartTimer", null);
@@ -66,22 +67,37 @@ var PaymentMethod = class {
 			}
 		});
 	}
+	get isMx51() {
+		return this.initOptions.paymentCode === "EFTPOS_MX51";
+	}
+	updateMx51TransactionVersion(res) {
+		var _res$data;
+		if (!this.isMx51 || `${res === null || res === void 0 ? void 0 : res.code}` !== "200") return;
+		const version = res === null || res === void 0 || (_res$data = res.data) === null || _res$data === void 0 || (_res$data = _res$data.external_unified_response) === null || _res$data === void 0 || (_res$data = _res$data.transaction) === null || _res$data === void 0 ? void 0 : _res$data.version;
+		if (typeof version !== "number" || !Number.isSafeInteger(version) || version <= 0) return;
+		this.mx51TransactionVersion = Math.max(this.mx51TransactionVersion || 0, version);
+	}
+	isMx51QueryRetry(res) {
+		var _res$data2;
+		const response = res === null || res === void 0 || (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.external_unified_response;
+		return this.isMx51 && (response === null || response === void 0 ? void 0 : response.external_unified_status) === require_types.EPaymentStatus.Processing && !(response === null || response === void 0 ? void 0 : response.transaction) && (response === null || response === void 0 ? void 0 : response.external_unified_retry) === true;
+	}
 	/**
 	* 判断请求是否需要等待轮询结果
 	* 1. 有明确错误code且不是超时和支付超时，则直接失败
 	* @param code 错误码
 	*/
 	isBusinessFailed(res) {
-		var _res$data;
-		const { external_unified_status, response_code } = (res === null || res === void 0 || (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.external_unified_response) || {};
+		var _res$data3;
+		const { external_unified_status, response_code } = (res === null || res === void 0 || (_res$data3 = res.data) === null || _res$data3 === void 0 ? void 0 : _res$data3.external_unified_response) || {};
 		return `${res === null || res === void 0 ? void 0 : res.code}` === "200" && external_unified_status === require_types.EPaymentStatus.Failed && response_code !== require_const.PayStatus.Timeout && response_code !== require_const.PayStatus.PayTimeout;
 	}
 	/**
 	* 判断业务是否成功
 	*/
 	isBusinessSuccess(res) {
-		var _res$data2;
-		const { external_unified_status } = (res === null || res === void 0 || (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.external_unified_response) || {};
+		var _res$data4;
+		const { external_unified_status } = (res === null || res === void 0 || (_res$data4 = res.data) === null || _res$data4 === void 0 ? void 0 : _res$data4.external_unified_response) || {};
 		return `${res === null || res === void 0 ? void 0 : res.code}` === "200" && external_unified_status === require_types.EPaymentStatus.Success;
 	}
 	/**
@@ -244,10 +260,10 @@ var PaymentMethod = class {
 	* 处理接口响应
 	*/
 	handleResponse(res) {
-		var _res$data3;
+		var _res$data5;
 		if (!this.currentActionType) return;
 		let needContinue = true;
-		const { external_unified_status } = (res === null || res === void 0 || (_res$data3 = res.data) === null || _res$data3 === void 0 ? void 0 : _res$data3.external_unified_response) || {};
+		const { external_unified_status } = (res === null || res === void 0 || (_res$data5 = res.data) === null || _res$data5 === void 0 ? void 0 : _res$data5.external_unified_response) || {};
 		switch (external_unified_status) {
 			case require_types.EPaymentStatus.Success:
 				this.handleOperationSuccess(res);
@@ -303,16 +319,21 @@ var PaymentMethod = class {
 			_this.currentQueryId = queryId;
 			_this.queryController = new AbortController();
 			const { signal } = _this.queryController;
+			let _extraParams = {};
+			if (_this.isMx51) {
+				var _this$mx51Transaction;
+				_extraParams.min_version = ((_this$mx51Transaction = _this.mx51TransactionVersion) !== null && _this$mx51Transaction !== void 0 ? _this$mx51Transaction : 0) + 1;
+			}
 			paymentLog.addLog({ title: "查询轮询：开始单次查询" });
 			try {
-				var _this$initOptions, _res$data4;
-				const res = yield Promise.race([_this.currentQueryApi({
+				var _this$initOptions, _res$data6;
+				const res = yield Promise.race([_this.currentQueryApi(require_objectSpread2._objectSpread2({
 					order_id: _this.orderId,
 					unique_payment_number: _this.paymentNum,
 					payment_code: (_this$initOptions = _this.initOptions) === null || _this$initOptions === void 0 ? void 0 : _this$initOptions.paymentCode,
 					request_version: queryId,
 					is_force_request_api: 1
-				}, { signal }), _this.createTimeoutPromise(require_types.REQUEST_TIMEOUT)]);
+				}, _extraParams), { signal }), _this.createTimeoutPromise(_this.config.singleQueryTimeout || 1e4)]);
 				paymentLog.addLog({
 					title: "查询轮询：单次查询返回",
 					content: {
@@ -324,7 +345,7 @@ var PaymentMethod = class {
 					clearTimeout(_this.requestTimeoutTimer);
 					_this.requestTimeoutTimer = null;
 				}
-				if ((res === null || res === void 0 || (_res$data4 = res.data) === null || _res$data4 === void 0 ? void 0 : _res$data4.request_version) !== _this.currentQueryId) {
+				if ((res === null || res === void 0 || (_res$data6 = res.data) === null || _res$data6 === void 0 ? void 0 : _res$data6.request_version) !== _this.currentQueryId) {
 					paymentLog.addLog({ title: "查询轮询结果：过期的查询响应，忽略" });
 					return;
 				}
@@ -337,6 +358,12 @@ var PaymentMethod = class {
 					_this.handleOperationError(res);
 					return;
 				}
+				if (_this.isMx51QueryRetry(res)) {
+					paymentLog.addLog({ title: "查询轮询：MX51等待新版本，保持当前渲染并重试" });
+					_this.scheduleNextQuery(actionType);
+					return;
+				}
+				_this.updateMx51TransactionVersion(res);
 				if (_this.isBusinessSuccess(res)) {
 					paymentLog.addLog({ title: "查询轮询结果：查询成功" });
 					if (_this.handleResponse(res)) _this.scheduleNextQuery(actionType);
@@ -532,7 +559,7 @@ var PaymentMethod = class {
 				_this3.startQuery(actionType);
 			};
 			try {
-				var _res$data5;
+				var _res$data7;
 				paymentLog.addLog({
 					title: `发起${actionType}请求`,
 					content: {
@@ -549,7 +576,7 @@ var PaymentMethod = class {
 						res
 					}
 				});
-				if (runId != (res === null || res === void 0 || (_res$data5 = res.data) === null || _res$data5 === void 0 ? void 0 : _res$data5.request_version)) {
+				if ((res === null || res === void 0 || (_res$data7 = res.data) === null || _res$data7 === void 0 ? void 0 : _res$data7.request_version) !== _this3.currentRunId) {
 					paymentLog.addLog({
 						title: "响应过期，忽略",
 						content: { actionType }
@@ -568,6 +595,7 @@ var PaymentMethod = class {
 					_this3.handleOperationError(res);
 					return;
 				}
+				_this3.updateMx51TransactionVersion(res);
 				if (_this3.isBusinessSuccess(res)) {
 					paymentLog.addLog({
 						title: `${actionType}接口成功`,
@@ -590,7 +618,7 @@ var PaymentMethod = class {
 					_this3.handleOperationError(res);
 				} else {
 					_this3.handleOperationProcess(res);
-					_query("failed", `${actionType}超时或无明确错误，开始轮询`, {
+					_query("processing", `${actionType}接口未返回最终结果，开始轮询`, {
 						actionType,
 						res
 					});
@@ -643,7 +671,7 @@ var PaymentMethod = class {
 			_this4.controller = new AbortController();
 			const { signal } = _this4.controller;
 			try {
-				var _res$data6;
+				var _res$data8;
 				const res = yield actionApi(require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, params || {}), {}, { request_version: runActionId }), { signal });
 				if (_this4.isFinished || !_this4.shouldContinue()) {
 					paymentLog.addLog({
@@ -652,13 +680,14 @@ var PaymentMethod = class {
 					});
 					return;
 				}
-				if (runActionId !== (res === null || res === void 0 || (_res$data6 = res.data) === null || _res$data6 === void 0 ? void 0 : _res$data6.request_version)) {
+				if ((res === null || res === void 0 || (_res$data8 = res.data) === null || _res$data8 === void 0 ? void 0 : _res$data8.request_version) !== _this4.currentRunId) {
 					paymentLog.addLog({
 						title: "Action响应过期，忽略",
 						content: { actionType }
 					});
 					return;
 				}
+				_this4.updateMx51TransactionVersion(res);
 				if (config === null || config === void 0 ? void 0 : config.needResponse) {
 					_this4.handleResponse(res);
 					return;
@@ -767,6 +796,7 @@ var PaymentMethod = class {
 	destroy() {
 		paymentLog.addLog({ title: "支付步骤结束，销毁实例" });
 		this.clean(true);
+		this.mx51TransactionVersion = void 0;
 	}
 };
 //#endregion

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

@@ -43,7 +43,6 @@ const AggregatePayment = ({ onChange }) => {
 	const [cancelDisabled, setCancelDisabled] = (0, react.useState)(false);
 	const clickLockedRef = (0, react.useRef)(false);
 	const clickUnlockTimerRef = (0, react.useRef)(null);
-	const actionTimeoutRef = (0, react.useRef)(null);
 	const clearRef = (0, react.useRef)(null);
 	(0, react.useEffect)(() => {
 		failRef.current = fail;
@@ -64,7 +63,8 @@ const AggregatePayment = ({ onChange }) => {
 		config: {
 			hasQueryInterval: false,
 			globalQueryTimeout: 1e3 * 60 * 2,
-			requestDelaySeconds: 130
+			requestDelaySeconds: 130,
+			singleQueryTimeout: 1e3 * 30
 		},
 		callback: (_instance, response) => {
 			var _data$data;
@@ -74,7 +74,6 @@ const AggregatePayment = ({ onChange }) => {
 			const transformedData = require_utils.parseMX51Params(transaction, status, data);
 			console.log("event_transformedData =>>>>>> ", transformedData);
 			dispatch(require_index$1.updateCustom({ customAction: transformedData }));
-			let needClearActionTimeout = true;
 			if (status === require_types.EPaymentStatus.Processing) if (action === "signature") {
 				var _transformedData$auto;
 				dispatch(require_index$1.updateStatus(require_const.StatusEnum.Question));
@@ -84,22 +83,12 @@ const AggregatePayment = ({ onChange }) => {
 					const merchantReceipt = (transformedData === null || transformedData === void 0 ? void 0 : transformedData.merchantReceipt) || "";
 					onChange("print", merchantReceipt ? [merchantReceipt] : []);
 				}
-			} else {
-				needClearActionTimeout = false;
-				updateToLoading();
-			}
+			} else updateToLoading();
 			else if (status === require_types.EPaymentStatus.Success) handleSuccess(data);
 			else if (status === require_types.EPaymentStatus.Failed) if (transformedData) {
 				dispatch(require_index$1.updateStatus("fail"));
 				dispatch(require_index$1.updateState({ title: (transformedData === null || transformedData === void 0 ? void 0 : transformedData.message) || "" }));
 			} else handleFail(data);
-			if (needClearActionTimeout) {
-				if (actionTimeoutRef.current) {
-					require_payLog.default.log("清除操作行为超时定时器");
-					clearTimeout(actionTimeoutRef.current);
-					actionTimeoutRef.current = null;
-				}
-			}
 		}
 	});
 	(0, react.useEffect)(() => {
@@ -118,10 +107,6 @@ const AggregatePayment = ({ onChange }) => {
 		return () => {
 			console.log("页面卸载");
 			unloadRef.current = true;
-			if (actionTimeoutRef.current) {
-				clearTimeout(actionTimeoutRef.current);
-				actionTimeoutRef.current = null;
-			}
 			if (clearRef.current) {
 				clearTimeout(clearRef.current);
 				clearRef.current = null;
@@ -190,12 +175,6 @@ const AggregatePayment = ({ onChange }) => {
 		console.log("onCancel", element);
 		setCancelDisabled(true);
 		payment.action({ submit_url: element === null || element === void 0 ? void 0 : element.submitUrl });
-		actionTimeoutRef.current = setTimeout(() => {
-			var _payment$_instance, _payment$_instance$st, _failRef$current2;
-			require_payLog.default.log("取消操作超时，前往标记支付");
-			payment === null || payment === void 0 || (_payment$_instance = payment._instance) === null || _payment$_instance === void 0 || (_payment$_instance$st = _payment$_instance.stop) === null || _payment$_instance$st === void 0 || _payment$_instance$st.call(_payment$_instance);
-			(_failRef$current2 = failRef.current) === null || _failRef$current2 === void 0 || _failRef$current2.call(failRef, { code: require_const.PayStatus.Timeout }, true);
-		}, require_types$1.CANCEL_ACTION_TIMEOUT);
 	};
 	const onDecline = (element) => {
 		payment.action({ submit_url: element === null || element === void 0 ? void 0 : element.submitUrl });

package/lib/components/eftposPay/mx51/types.js

@@ -20,10 +20,5 @@ let EButtonKeyType = /* @__PURE__ */ function(EButtonKeyType) {
 	EButtonKeyType["CallTestFunction"] = "call_test_function";
 	return EButtonKeyType;
 }({});
-/**
-* 操作行为超时时间
-*/
-const CANCEL_ACTION_TIMEOUT = 1e3 * 20;
 //#endregion
-exports.CANCEL_ACTION_TIMEOUT = CANCEL_ACTION_TIMEOUT;
 exports.EButtonKeyType = EButtonKeyType;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.3.215",
+  "version": "6.3.216",
   "scripts": {
     "dev": "father dev",
     "build": "father build",