Z991239-5993 #comment feat: 优化加卡，移回卡槽，吞卡接口

Signed-Off-By: commit-hook

Module/mod_cardissuerstore/CardIssuerFSM.cpp

@@ -5169,9 +5169,6 @@ bool CCardIssuerFSM::RegistCardWhileCaptureCard(CSimpleStringA cardno)
 	DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("<RegistCardWhileCaptureCard>, 吞卡登记开始, SwallowDate:%s, SwallowTime:%s, cardNoLen:%d, m_currCardNo:%s, m_captureReason:%s",
 		csDate.GetData(), csTime.GetData(), cardno.GetLength(), maskCardno.GetData(), m_captureReason.GetData());
 
-	//DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("<RegistCardWhileCaptureCard>, 吞卡登记开始, SwallowDate:%s, SwallowTime:%s, cardNoLen:%d, m_currCardNo:%s****%s, m_captureReason:%s",
-	//	csDate.GetData(), csTime.GetData(), cardno.GetLength(), cardno.SubString(0, 6).GetData(), cardno.SubString(cardno.GetLength() - 4, 4).GetData(), m_captureReason.GetData());
-
 
 	long beg = GetTickCountRVC();
 	bool ret = client->Post(qRegistCardReq, qRegistCardRet);
@@ -5188,7 +5185,7 @@ bool CCardIssuerFSM::RegistCardWhileCaptureCard(CSimpleStringA cardno)
 				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER).setLogCode("QLR040222004")("吞卡登记成功");
 		}
 		else
-			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode("QLR040222004")("解析返回报文qRegistCardRet失败");
+			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode("QLR040222004")("解析返回报文qRegistCardRet失败,%s", qRegistCardRet.m_resultData.c_str());
 	}
 	else {
 		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode("QLR040222004").setResultCode("RTA2W40")("访问吞卡登记失败");
@@ -7737,8 +7734,6 @@ int CCardIssuerFSM::AddAndReadCardFromBoxJS(SpReqAnsContext<CardIssuerStoreServi
 	eErr = m_hDevHelper->MoveCard(CI_MOVECARD_FROM_HOPPER, 99);
 	l_endTime = GetTickCountRVC();
 
-	DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("AddAndReadCardFromBoxJS::MoveCard, CI_MOVECARD_FROM_HOPPER,99");
-
 	if (eErr == Error_Succeed)
 	{
 		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("DevAdapter::MoveCard").setCostTime(l_endTime - l_beginTime)("AddAndReadCardFromBoxJS::MoveCard");
@@ -7768,7 +7763,7 @@ int CCardIssuerFSM::AddAndReadCardFromBoxJS(SpReqAnsContext<CardIssuerStoreServi
 			ctx->Ans.track3Size = card.dwTrack3Size;
 			if (card.dwTrack3Size == 2)
 			{
-				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("maybe only IC card. cardSerial:%s",card.track3);
+				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("maybe only IC card. cardSerial:%s",card.track3);
 			}
 			m_currCardNo = m_addCardNo  = readCardNo = card.account;
 			CSimpleStringA maskCardno = MaskCardno(readCardNo.GetData());
@@ -8041,7 +8036,7 @@ int CCardIssuerFSM::MoveBacktoSlotJS(SpReqAnsContext<CardIssuerStoreService_Move
 	CSimpleStringA maskCardno = MaskCardno(m_currCardNo);//使用本地保存的卡号
 	if (!IsValidSlotNum(ctx->Req.slot))
 	{
-		errMsg = CSimpleStringA::Format("Invalid slot(%d), req.hopper=%d", slot);
+		errMsg = CSimpleStringA::Format("Invalid slot(%d)", slot);
 		LogWarn(Severity_Middle, Error_Unexpect, CardIssuerStore_UserErrorCode_Dev_SlotInvalid, errMsg.GetData());
 		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode("QLR040222064").setResultCode("RTA2W8B")(errMsg.GetData());
 		ctx->Answer(Error_Unexpect, CardIssuerStore_UserErrorCode_Dev_SlotInvalid);
@@ -8057,7 +8052,7 @@ int CCardIssuerFSM::MoveBacktoSlotJS(SpReqAnsContext<CardIssuerStoreService_Move
 
 		m_currCardNo = "";
 		m_addCardNo = "";
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("DevAdapter::MoveCardToSlot").setCostTime(l_endTime - l_beginTime)("MoveBacktoSlotJS::MoveCardToSlot, (slot:%d)", slot);
+		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("DevAdapter::MoveCardToSlot").setCostTime(l_endTime - l_beginTime)("MoveBacktoSlotJS::MoveCardToSlot succ, (slot:%d)", slot);
 		errMsg = CSimpleStringA::Format("MoveBacktoSlotJS MoveCardToSlot succ, slot:%d,account:%s", slot, maskCardno.GetData());
 		LogWarn(Severity_Low, Error_Unexpect, CardIssuerStore_UserErrorCode_MoveCardToSlot, errMsg.GetData());
 		ctx->Answer(Error_Succeed);
@@ -8065,7 +8060,7 @@ int CCardIssuerFSM::MoveBacktoSlotJS(SpReqAnsContext<CardIssuerStoreService_Move
 	}
 	else {
 		//移动失败
-		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("MoveBacktoSlotJS::MoveCardToSlot (slot:%d)", slot);
+		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("MoveBacktoSlotJS::MoveCardToSlot fail (slot:%d)", slot);
 		DWORD dwTmpUserErrCode = SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_MoveCardToSlot, "DevAdapter::MoveCardToSlot", __FUNCTION__, false, l_endTime - l_beginTime, "QLR040222064", "");
 		ctx->Answer(Error_Unexpect, dwTmpUserErrCode);
 		return 0;//跳到S4

Module/mod_cardissuerstore/CardIssuerFSM.h

@@ -625,7 +625,7 @@ typedef struct CRegistSwallowCardRet : CHTTPRet {
 	struct data {
 	}data;
 	bool Parse(string strData) {
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)(strData.c_str());
+		//DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)(strData.c_str());
 		Json::Value root, tmpZ1;
 		Json::Reader reader;
 		if (!reader.parse(strData, root, false))