Browse Source

Z991239-6492 #comment feat:卡机功能集编译问题

oilyang 1 month ago
parent
commit
72811ad0d7
1 changed files with 14 additions and 12 deletions
  1. 14 12
      Module/mod_CardReadAdapter/CardReadAdapterFSM.cpp

+ 14 - 12
Module/mod_CardReadAdapter/CardReadAdapterFSM.cpp

@@ -810,12 +810,13 @@ int CCardReadAdapterFSM::CardIssuerRead(SpReqAnsContext<CardReadAdapterService_R
 			}
 			}
 			if (bHasCard)
 			if (bHasCard)
 			{
 			{
-				if (bCardMismatch)
-				{
-					//oiltmp@20221202 todo Error_DevNotAvailable should be changed if we have negotiated with hangzhou vtm developer
-					ctx->Answer(Error_DevNotAvailable, CardIssuer_UserErrorCode_Account_EAC_Mismatch, csRetStr);
-				}
-				else
+				//oiltmp@20250909
+				//if (bCardMismatch)
+				//{
+				//	//oiltmp@20221202 todo Error_DevNotAvailable should be changed if we have negotiated with hangzhou vtm developer
+				//	ctx->Answer(Error_DevNotAvailable, CardIssuer_UserErrorCode_Account_EAC_Mismatch, csRetStr);
+				//}
+				//else
 				{
 				{
 					DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("ReadCard, the final errCode:%d,status:%d,dwUsrErrCode:%d", eErr, ctx->Ans.status, dwUsrErrCode);
 					DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("ReadCard, the final errCode:%d,status:%d,dwUsrErrCode:%d", eErr, ctx->Ans.status, dwUsrErrCode);
 					Sleep(300);//oilyang@20230202 for hardware entity to trans FSM state
 					Sleep(300);//oilyang@20230202 for hardware entity to trans FSM state
@@ -963,12 +964,13 @@ int CCardReadAdapterFSM::CardIssuerRead(SpReqAnsContext<CardReadAdapterService_R
 			}
 			}
 			if (bHasCard)
 			if (bHasCard)
 			{
 			{
-				if (bCardMismatch)
-				{
-					//oiltmp@20221202 todo Error_DevNotAvailable should be changed if we have negotiated with hangzhou vtm developer
-					ctx->Answer(Error_DevNotAvailable, CardIssuer_UserErrorCode_Account_EAC_Mismatch, csRetStr);
-				}
-				else
+				//oiltmp@20250909
+				//if (bCardMismatch)
+				//{
+				//	//oiltmp@20221202 todo Error_DevNotAvailable should be changed if we have negotiated with hangzhou vtm developer
+				//	ctx->Answer(Error_DevNotAvailable, CardIssuer_UserErrorCode_Account_EAC_Mismatch, csRetStr);
+				//}
+				//else
 				{
 				{
 					DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("ReadCard, the final errCode:%d,status:%d,dwUsrErrCode:%d", eErr, ctx->Ans.status, dwUsrErrCode);
 					DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("ReadCard, the final errCode:%d,status:%d,dwUsrErrCode:%d", eErr, ctx->Ans.status, dwUsrErrCode);
 					Sleep(300);//oilyang@20230202 for hardware entity to trans FSM state
 					Sleep(300);//oilyang@20230202 for hardware entity to trans FSM state