浏览代码

Z991239-6292 #comment feat: 精简卡库加卡日志

Signed-Off-By: commit-hook
刘文涛80174520 4 月之前
父节点
当前提交
e7a963ffde
共有 1 个文件被更改,包括 13 次插入11 次删除
  1. 13 11
      Module/mod_cardissuerstore/CardIssuerStoreFSM.cpp

+ 13 - 11
Module/mod_cardissuerstore/CardIssuerStoreFSM.cpp

@@ -6037,15 +6037,13 @@ int CCardIssuerFSM::AddCardToStoreStepFirst(SpReqAnsContext<CardIssuerStoreServi
 	eErr = m_hDevHelper->MoveCard(CI_MOVECARD_FROM_HOPPER,99);
 	l_endTime = GetTickCountRVC();
 
-	DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("AddCardToStoreStepFirst::MoveCard, CI_MOVECARD_FROM_HOPPER,99");
-
 	ctx->Ans.reserved1.Init(4);
 	ctx->Ans.reserved2.Init(2);
 	
 	if (eErr == Error_Succeed)
 	{
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("DevAdapter::MoveCard").setCostTime(l_endTime - l_beginTime)("AddCardToStoreStepFirst::MoveCard");
-		LogWarn(Severity_Low, Error_Succeed, CardIssuerStore_UserErrorCode_MoveCard_FromHopper, "MoveCard from hopper suc.");
+		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("DevAdapter::MoveCard").setCostTime(l_endTime - l_beginTime)("AddCardToStoreStepFirst::MoveCard CI_MOVECARD_FROM_HOPPER,99");
+		//LogWarn(Severity_Low, Error_Succeed, CardIssuerStore_UserErrorCode_MoveCard_FromHopper, "MoveCard from hopper suc.");
 		CardNo card;
 		memset(&card, 0, sizeof(card));
 		ctx->Ans.reserved2[0] = "";
@@ -6056,15 +6054,16 @@ int CCardIssuerFSM::AddCardToStoreStepFirst(SpReqAnsContext<CardIssuerStoreServi
 		
 		if (eErr == Error_Succeed)
 		{
-			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("DevAdapter::ReadAccount").setCostTime(l_endTime - l_beginTime)("AddCardToStoreStepFirst::ReadAccount");
+			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("DevAdapter::ReadAccount").setCostTime(l_endTime - l_beginTime)("AddCardToStoreStepFirst::ReadAccount dwSize:%d, t2dwSize:%d, t3dwSize:%d",
+				card.dwSize, card.dwTrack2Size, card.dwTrack3Size);
 		}
 		else {
 			SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_ReadAccount, "DevAdapter::ReadAccount", __FUNCTION__, false, l_endTime - l_beginTime, "", "");
 		}
 
-		LogWarn(Severity_Low, Error_Unexpect, CardIssuerStore_UserErrorCode_ReadAccount_Cost_Time, CSimpleStringA::Format("{\"cost\":%d}", l_endTime - l_beginTime));
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("AddCardToStoreStepFirst, dwSize:%d, t2dwSize:%d, t3dwSize:%d",
-										card.dwSize, card.dwTrack2Size, card.dwTrack3Size);
+		//LogWarn(Severity_Low, Error_Unexpect, CardIssuerStore_UserErrorCode_ReadAccount_Cost_Time, CSimpleStringA::Format("{\"cost\":%d}", l_endTime - l_beginTime));
+		//DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("AddCardToStoreStepFirst, dwSize:%d, t2dwSize:%d, t3dwSize:%d",
+		//								card.dwSize, card.dwTrack2Size, card.dwTrack3Size);
 
 		bool bDataOK = false;//oilyang@20171213 是否读卡失败,是否解析出卡序号,否则吞卡 @宋锐
 		if (eErr == Error_Succeed && card.dwSize > 0 && card.dwSize < 64)
@@ -6110,10 +6109,13 @@ int CCardIssuerFSM::AddCardToStoreStepFirst(SpReqAnsContext<CardIssuerStoreServi
 			if (card.dwSize > 6)
 			{
 				string xTestStr(card.account);
-				LogWarn(Severity_Low, Error_Succeed, CardIssuerStore_UserErrorCode_CardBin, CSimpleStringA::Format("cardBin:%s****%s", xTestStr.substr(0, 6).c_str(), xTestStr.substr(card.dwSize - 4, 4).c_str()));
+				CSimpleStringA cardInfo(true);
+				cardInfo = CSimpleStringA::Format("cardBin:%s****%s , len:%d", xTestStr.substr(0, 6).c_str(), xTestStr.substr(card.dwSize - 4, 4).c_str(), xTestStr.length());
+
+				LogWarn(Severity_Low, Error_Succeed, CardIssuerStore_UserErrorCode_CardBin, cardInfo.GetData());
 			}
 
-			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("<AddCardToStoreStepFirst>,cardAccount len:%d, CardSerial:%s", m_currCardNo.GetLength(), m_addCardSerial.GetData());
+			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("<AddCardToStoreStepFirst>,cardAccount len:%d, CardSerial:%s", m_currCardNo.GetLength(), m_addCardSerial.GetData());
 			if (m_addCardSerial.GetLength() > 0)
 			{
 				bDataOK = true;
@@ -6173,7 +6175,7 @@ int CCardIssuerFSM::AddCardToStoreStepFirst(SpReqAnsContext<CardIssuerStoreServi
 		}
 		else
 		{
-			SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_MoveCard, "DevAdapter::MoveCard", __FUNCTION__, false, l_endTime - l_beginTime, "", "");
+			SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_MoveCard, "DevAdapter::MoveCard", __FUNCTION__, false, l_endTime - l_beginTime, "", "AddCardToStoreStepFirst::MoveCard fail");
 		}
 			
 		if (!bTrans)//兼容未做卡库api返回故障码细化改造的卡库厂商