Z991239-6316 #comment feat: 卡机、卡库去除框架TransECWithRepeat方法的使用

Signed-Off-By: commit-hook

Module/mod_CardIssuerStand/CardIssuerStandFSM.cpp

@@ -2021,9 +2021,9 @@ int CCardIssuerFSM::IssueCard(SpReqAnsContext<CardIssuerStandService_Issue_Req,
 
 		LogWarn(Severity_Middle, Error_Unexpect, dwTmpErrCode, errMsg.GetData());
 		if (ctx != NULL)
-			ctx->Answer(TransECWithRepeat(Error_DevMedia), dwTmpErrCode);
+			ctx->Answer(Error_DevMedia, dwTmpErrCode);
 		else
-			ctxEx->Answer(TransECWithRepeat(Error_DevMedia), dwTmpErrCode);
+			ctxEx->Answer(Error_DevMedia, dwTmpErrCode);
 		return 2;
 	}
 	ErrorCodeEnum errCode;

Module/mod_ContactlessCard/ContactlessFSM.cpp

@@ -1479,7 +1479,7 @@ int CContactlessCardFSM::QueryCardInfo(SpReqAnsContext<ContactlessCardService_Qu
 	if (eErr != Error_Succeed)
 	{
 		SetErrorAndLog(eErr, MEC_DEVAPI_RF_GetDevStatus, "DevAdapter::GetDevStatus", __FUNCTION__, false, l_endTime - l_beginTime, "", "");
-		ctx->Answer(TransECWithRepeat(Error_Unexpect));
+		ctx->Answer(Error_Unexpect);
 		return 1;
 	}
 	int ret = 0;

Module/mod_cardissuerstore/CardIssuerStoreFSM.cpp

@@ -2173,7 +2173,7 @@ int CCardIssuerFSM::IssueCard(SpReqAnsContext<CardIssuerStoreService_IssueEx_Req
 			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode("QLR040222020").setResultCode("RTA2W0R")("卡箱1连续吞卡超限，请及时执行清机");
 
 		LogWarn(Severity_Middle, Error_Unexpect, dwTmpErrCode, errMsg.GetData());
-		ctxEx->Answer(TransECWithRepeat(Error_DevMedia), dwTmpErrCode);
+		ctxEx->Answer(Error_DevMedia, dwTmpErrCode);
 		return 2;
 	}
 	ErrorCodeEnum errCode;
@@ -6233,9 +6233,9 @@ int CCardIssuerFSM::AddCardToStoreStepLast(SpReqAnsContext<CardIssuerStoreServic
 			m_mapJsonErr["userCode"] = JsonElem(CardIssuerStore_UserErrorCode_KakuFindEmptySlot_Failed);
 			m_mapJsonErr["tips"] = JsonElem("[RTA2W0L] 卡库找不到空闲卡槽，请联系卡库厂商排查");
 			if (m_bNewAnsError)
-				ctx->Answer(TransECWithRepeat(Error_Unexpect), CardIssuerStore_UserErrorCode_KakuFindEmptySlot_Failed, generateJsonString(m_mapJsonErr));
+				ctx->Answer(Error_Unexpect, CardIssuerStore_UserErrorCode_KakuFindEmptySlot_Failed, generateJsonString(m_mapJsonErr));
 			else
-				ctx->Answer(TransECWithRepeat(Error_Unexpect), CardIssuerStore_UserErrorCode_KakuFindEmptySlot_Failed);
+				ctx->Answer(Error_Unexpect, CardIssuerStore_UserErrorCode_KakuFindEmptySlot_Failed);
 			return 0;
 		}
 		ctx->Ans.reserved1.Init(4);
@@ -6620,8 +6620,8 @@ int CCardIssuerFSM::QueryCardInfoOnStore(SpReqAnsContext<CardIssuerStoreService_
 			{
 				DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("QueryCardInfoOnStore::QuerySlotsStatus reserved1=1 fail");
 				DWORD dwTmpUserErrCode = SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_QuerySlotsStatus, "DevAdapter::QuerySlotsStatus", __FUNCTION__, false, l_endTime - l_beginTime, "", "");
-				ctx->Answer(TransECWithRepeat(Error_Unexpect), dwTmpUserErrCode);
-				//ctx->Answer(TransECWithRepeat(Error_Unexpect), GetAlarmDEC());
+				ctx->Answer(Error_Unexpect, dwTmpUserErrCode);
+				
 				return 2;
 			}
 			else {