Z991239-5308 #comment 修改卡库告警码为新的告警码

Signed-Off-By: commit-hook

Module/mod_cardissuerstore/CardIssuerFSM.h

@@ -142,7 +142,7 @@ public:
 		if (ctx != NULL)
 		{
 			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("Operate CardStore unhandled");
-			ctx->Answer(Error_InvalidState, CardIssuer_UserErrorCode_EntityInStateCannotProcess);
+			ctx->Answer(Error_InvalidState, CardIssuerStore_UserErrorCode_EntityInStateCannotProcess);
 		}
 	}
 };
@@ -158,7 +158,7 @@ public:
 		if (ctx != NULL)
 		{
 			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("card read unhandled");
-			ctx->Answer(Error_InvalidState, CardIssuer_UserErrorCode_EntityInStateCannotProcess);
+			ctx->Answer(Error_InvalidState, CardIssuerStore_UserErrorCode_EntityInStateCannotProcess);
 		}
 	}
 protected:
@@ -205,7 +205,7 @@ public:
 	virtual void OnUnhandled() 
 	{
 		if (ctx != NULL)
-			ctx->Answer(Error_InvalidState, CardIssuer_UserErrorCode_EntityInStateCannotProcess);
+			ctx->Answer(Error_InvalidState, CardIssuerStore_UserErrorCode_EntityInStateCannotProcess);
 	}
 protected:
 private:
@@ -219,7 +219,7 @@ public:
 	virtual void OnUnhandled() 
 	{
 		if (ctx != NULL)
-			ctx->Answer(Error_InvalidState, CardIssuer_UserErrorCode_EntityInStateCannotProcess);
+			ctx->Answer(Error_InvalidState, CardIssuerStore_UserErrorCode_EntityInStateCannotProcess);
 	}
 protected:
 private:
@@ -233,7 +233,7 @@ public:
 	virtual void OnUnhandled() 
 	{
 		if (ctx != NULL)
-			ctx->Answer(Error_InvalidState, CardIssuer_UserErrorCode_EntityInStateCannotProcess);
+			ctx->Answer(Error_InvalidState, CardIssuerStore_UserErrorCode_EntityInStateCannotProcess);
 	}
 
 protected:
@@ -248,7 +248,7 @@ public:
 	virtual void OnUnhandled() 
 	{
 		if (ctx != NULL)
-			ctx->Answer(Error_InvalidState, CardIssuer_UserErrorCode_EntityInStateCannotProcess);
+			ctx->Answer(Error_InvalidState, CardIssuerStore_UserErrorCode_EntityInStateCannotProcess);
 	}
 protected:
 private:
@@ -264,7 +264,7 @@ public:
 		if (ctx != NULL)
 		{
 			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("card read unhandled");
-			ctx->Answer(Error_InvalidState, CardIssuer_UserErrorCode_EntityInStateCannotProcess);
+			ctx->Answer(Error_InvalidState, CardIssuerStore_UserErrorCode_EntityInStateCannotProcess);
 		}
 	}
 protected:
@@ -295,7 +295,7 @@ public:
 	virtual void OnUnhandled()
 	{
 		if (ctx != NULL)
-			ctx->Answer(Error_InvalidState, CardIssuer_UserErrorCode_EntityInStateCannotProcess);
+			ctx->Answer(Error_InvalidState, CardIssuerStore_UserErrorCode_EntityInStateCannotProcess);
 	}
 protected:
 private:
@@ -309,7 +309,7 @@ public:
 	virtual void OnUnhandled()
 	{
 		if (ctx != NULL)
-			ctx->Answer(Error_InvalidState, CardIssuer_UserErrorCode_EntityInStateCannotProcess);
+			ctx->Answer(Error_InvalidState, CardIssuerStore_UserErrorCode_EntityInStateCannotProcess);
 	}
 protected:
 private:
@@ -325,7 +325,7 @@ public:
 		if (ctx != NULL)
 		{
 			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("card issue ex unhandled");
-			ctx->Answer(Error_InvalidState, CardIssuer_UserErrorCode_EntityInStateCannotProcess);
+			ctx->Answer(Error_InvalidState, CardIssuerStore_UserErrorCode_EntityInStateCannotProcess);
 		}
 	}
 };
@@ -340,7 +340,7 @@ public:
 		if (ctx != NULL)
 		{
 			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("sam/ic unhandled");
-			ctx->Answer(Error_InvalidState, CardIssuer_UserErrorCode_EntityInStateCannotProcess);
+			ctx->Answer(Error_InvalidState, CardIssuerStore_UserErrorCode_EntityInStateCannotProcess);
 		}
 	}
 };
@@ -354,7 +354,7 @@ public:
 	{
 		if (ctx != NULL){
 			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("PrintCardIm unhandled");
-			ctx->Answer(Error_InvalidState, CardIssuer_UserErrorCode_EntityInStateCannotProcess);
+			ctx->Answer(Error_InvalidState, CardIssuerStore_UserErrorCode_EntityInStateCannotProcess);
 		}
 	}
 };
@@ -367,7 +367,7 @@ public:
 	virtual void OnUnhandled()
 	{
 		if (ctx != NULL)
-			ctx->Answer(Error_InvalidState, CardIssuer_UserErrorCode_EntityInStateCannotProcess);
+			ctx->Answer(Error_InvalidState, CardIssuerStore_UserErrorCode_EntityInStateCannotProcess);
 	}
 };
 typedef struct EacQueryByEac_X1 {
@@ -1031,29 +1031,29 @@ private:
 		switch (eErr)
 		{
 		case Error_Dev_HopperHasNoCard:
-			return CardIssuer_UserErrorCode_Dev_HopperHasNoCard;
+			return CardIssuerStore_UserErrorCode_Dev_HopperHasNoCard;
 		case Error_Dev_HopperMissing:
-			return CardIssuer_UserErrorCode_Dev_HopperMissing;
+			return CardIssuerStore_UserErrorCode_Dev_HopperMissing;
 		case Error_Dev_TransCarJammed:
-			return CardIssuer_UserErrorCode_Dev_TransCarJammed;
+			return CardIssuerStore_UserErrorCode_Dev_TransCarJammed;
 		case Error_Dev_RetainBinFull:
-			return CardIssuer_UserErrorCode_Dev_RetainBinFull;
+			return CardIssuerStore_UserErrorCode_Dev_RetainBinFull;
 		case Error_Dev_RetainBinMissing:
-			return CardIssuer_UserErrorCode_Dev_RetainBinMissing;
+			return CardIssuerStore_UserErrorCode_Dev_RetainBinMissing;
 		case Error_Dev_CardInReader:
-			return CardIssuer_UserErrorCode_Dev_CardInReader;
+			return CardIssuerStore_UserErrorCode_Dev_CardInReader;
 		case Error_Dev_SlotHasNoCard:
-			return CardIssuer_UserErrorCode_Dev_SlotHasNoCard;
+			return CardIssuerStore_UserErrorCode_Dev_SlotHasNoCard;
 		case Error_Dev_CardInSlot:
-			return CardIssuer_UserErrorCode_Dev_CardInSlot;
+			return CardIssuerStore_UserErrorCode_Dev_CardInSlot;
 		case Error_Dev_NoCardInReader:
-			return CardIssuer_UserErrorCode_Dev_NoCardInReader;
+			return CardIssuerStore_UserErrorCode_Dev_NoCardInReader;
 		case Error_Dev_CardJammed:
-			return CardIssuer_UserErrorCode_Dev_CardJammed;
+			return CardIssuerStore_UserErrorCode_Dev_CardJammed;
 		case Error_Dev_SlotJammed:
-			return CardIssuer_UserErrorCode_Dev_SlotJammed;
+			return CardIssuerStore_UserErrorCode_Dev_SlotJammed;
 		case Error_Dev_SlotInvalid:
-			return CardIssuer_UserErrorCode_Dev_SlotInvalid;
+			return CardIssuerStore_UserErrorCode_Dev_SlotInvalid;
 		default:
 			bTrans = false;
 			return dwApiCode;

Module/mod_cardissuerstore/mod_cardissuer.h

@@ -113,7 +113,7 @@ public:
 	{
 		LOG_FUNCTION();
 		if (!m_fsm.GetDevInitFlag()) {
-			ctx->Answer(Error_DevNotAvailable, CardIssuer_UserErrorCode_DevOpen_Failed);
+			ctx->Answer(Error_DevNotAvailable, CardIssuerStore_UserErrorCode_DevOpen_Failed);
 		}
 		else {
 			if (ctx->Req.reserved1.GetLength() > 0 && strnicmp("kaku#", (const char*)ctx->Req.reserved1, 5) == 0)
@@ -121,12 +121,12 @@ public:
 				int state = m_fsm.GetFSMState();
 				if (state == 9)
 				{
-					ctx->Answer(Error_DevNotAvailable, CardIssuer_UserErrorCode_EntityInFailState);
+					ctx->Answer(Error_DevNotAvailable, CardIssuerStore_UserErrorCode_EntityInFailState);
 					return;
 				}
 				else if (state != 2 || m_fsm.CheckIsCrossPreOnline())//借用跨机标识来识别是否跨机中
 				{
-					ctx->Answer(Error_InvalidState, CardIssuer_UserErrorCode_CardActive_CardStore_Issuing);
+					ctx->Answer(Error_InvalidState, CardIssuerStore_UserErrorCode_CardActive_CardStore_Issuing);
 					return;
 				}
 			}
@@ -223,7 +223,7 @@ public:
 	{
 		LOG_FUNCTION();
 		if (!m_fsm.GetDevInitFlag()) {
-			ctx->Answer(Error_DevNotAvailable, CardIssuer_UserErrorCode_DevOpen_Failed);
+			ctx->Answer(Error_DevNotAvailable, CardIssuerStore_UserErrorCode_DevOpen_Failed);
 		}
 		else {
 			m_bNewSessionInit = false;
@@ -242,7 +242,7 @@ public:
 	void QueryCardInfoOnStore(SpReqAnsContext<CardIssuerStoreService_QueryCardInfoOnStore_Req, CardIssuerStoreService_QueryCardInfoOnStore_Ans>::Pointer ctx)
 	{
 		if (!m_fsm.GetDevInitFlag()) {
-			ctx->Answer(Error_DevNotAvailable, CardIssuer_UserErrorCode_DevOpen_Failed);
+			ctx->Answer(Error_DevNotAvailable, CardIssuerStore_UserErrorCode_DevOpen_Failed);
 		}
 		else
 		{
@@ -254,7 +254,7 @@ public:
 	void GetAddCardInfo(SpReqAnsContext<CardIssuerStoreService_GetAddCardInfo_Req, CardIssuerStoreService_GetAddCardInfo_Ans>::Pointer ctx)
 	{
 		if (!m_fsm.GetDevInitFlag()) {
-			ctx->Answer(Error_DevNotAvailable, CardIssuer_UserErrorCode_DevOpen_Failed);
+			ctx->Answer(Error_DevNotAvailable, CardIssuerStore_UserErrorCode_DevOpen_Failed);
 		}
 		else
 		{