Z991239-5267 #comment 卡集跨机调用故障码转换增加新卡库故障码

Signed-Off-By: commit-hook

Module/mod_CardReadAdapter/CardReadAdapterFSM.cpp

@@ -2619,7 +2619,8 @@ int CCardReadAdapterFSM::NotifyPreonline(SpReqAnsContext<CardReadAdapterService_
 			//oilyang@20230629
 			//compare with the "ctx->Req.errCode" or "ctx->Req.reserved1[0]" which is stand for UserErrorCode from CardStore
 			if (ctx->Req.errCode == Error_Duplication || ctx->Req.reserved1[0] == CardReadAdapter_UserErrorCode_CardIssuer_Is_Working
-				|| ctx->Req.reserved1[0] == CardIssuer_UserErrorCode_CardActive_CardStore_Issuing)
+				|| ctx->Req.reserved1[0] == CardIssuer_UserErrorCode_CardActive_CardStore_Issuing 
+				|| ctx->Req.reserved1[0] == CardIssuerStore_UserErrorCode_CardActive_CardStore_Issuing)
 			{
 				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode("QLR040220327").setResultCode("RTA230Q")("卡库正在使用中");
 				LogWarn(Severity_Low, Error_Unexpect, CardReadAdapter_UserErrorCode_CardIssuer_Is_Working, "卡库正在使用中");
@@ -2637,7 +2638,7 @@ int CCardReadAdapterFSM::NotifyPreonline(SpReqAnsContext<CardReadAdapterService_
 				LogWarn(Severity_Middle, Error_Unexpect, CardIssuer_UserErrorCode_CardActive_CardStore_OffLine, "跨机时卡库不在线");
 				m_crossCtx->Answer(Error_DevNotAvailable, CardIssuer_UserErrorCode_CardActive_CardStore_OffLine);
 			}
-			else if (ctx->Req.reserved1[0] == CardIssuer_UserErrorCode_DevOpen_Failed)
+			else if (ctx->Req.reserved1[0] == CardIssuer_UserErrorCode_DevOpen_Failed || ctx->Req.reserved1[0] == CardIssuerStore_UserErrorCode_DevOpen_Failed)
 			{
 				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode("QLR040220327").setResultCode("RTA2311")("卡库卡机未成功打开");
 				LogWarn(Severity_Middle, Error_Unexpect, CardIssuer_UserErrorCode_DevOpen_Failed, "卡库卡机未成功打开");

Module/mod_CardReadAdapter/CardReadAdapterFSM.h

@@ -9,6 +9,7 @@
 #include "CardIssuerClass.h"
 //#include "CardAssist.h"
 #include "CardIssuer_UserErrorCode.h"
+#include "CardIssuerStore_UserErrorCode.h"
 //#include "ICDataElement.h"
 using namespace CardReadAdapter;
 #include "CardIssuer_client_g.h"
@@ -926,17 +927,24 @@ private:
 		switch (eErrCode)
 		{
 		case 0x20300240:
+		case 0x22000240:
 			return 0x203002E0;
 		case 0x20300242:
+		case 0x22000242:
 			return 0x203002E1;
 		case 0x20300243:
+		case 0x22000243:
 		case 0x203002a1:
+		case 0x220002a1:
 			return 0x203002E2;
 		case 0x20300244:
+		case 0x22000244:
 			return 0x203002E3;
 		case 0x20300246:
+		case 0x22000246:
 			return 0x203002E4;
 		case 0x2030000D:
+		case 0x2200000D:
 			return 0x203002E5;
 		default:
 			return eErrCode;