!10876 解决大机卡机废弃接口时卡机功能集的编译问题

Merge pull request !10876 from 80174847/oilyang_fixed_everything

Module/mod_CardReadAdapter/CardReadAdapterFSM.cpp

@@ -1261,33 +1261,7 @@ int CCardReadAdapterFSM::WriteTrack(SpReqAnsContext<CardReadAdapterService_Write
 	LOG_FUNCTION();
 	if (IsCardIssuerSessionOK())
 	{
-		if (!IsCardIssuerStore()) {
-			CardIssuerStandService_WriteTrack_Req req;
-			CardIssuerStandService_WriteTrack_Ans ans;
-			req.co = ctx->Req.co;
-			req.mode = ctx->Req.mode;
-			req.track1 = ctx->Req.track1;
-			req.track2 = ctx->Req.track2;
-			req.track3 = ctx->Req.track3;
-			req.reserved = ctx->Req.reserved;
-			ErrorCodeEnum eErr = Error_Unexpect;
-			DWORD dwUsrErrCode = 0;
-			eErr = (*m_pCardIssuer)(EntityResource::getLink().upgradeLink())->WriteTrack(req, ans, 20000, dwUsrErrCode);
-			if (eErr != Error_Succeed)
-			{
-				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER)("WriteTrack failed.%d", eErr);
-				ctx->Answer(eErr, dwUsrErrCode);
-			}
-			else
-			{
-				ctx->Ans.result = ans.result;
-				ctx->Ans.reserved1 = ans.reserved1;
-				ctx->Ans.reserved2 = ans.reserved2;
-				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER)("Write tracks ok.");
-				ctx->Answer(Error_Succeed);
-			}
-		}
-		else {
+		if (IsCardIssuerStore()) {
 			CardIssuerStoreService_WriteTrack_Req req;
 			CardIssuerStoreService_WriteTrack_Ans ans;
 			req.co = ctx->Req.co;
@@ -2174,31 +2148,7 @@ int CCardReadAdapterFSM::SAMICCommand(SpReqAnsContext<CardReadAdapterService_SAM
 {
 	if (IsTheEntity(ctx->Req.module, Module_CardIssuer) && IsCardIssuerSessionOK())
 	{
-		if (!IsCardIssuerStore()) {
-			ErrorCodeEnum eErr = Error_Unexpect;
-			CardIssuerStandService_SAMICCommand_Req req;
-			CardIssuerStandService_SAMICCommand_Ans ans;
-			req.cmdType = ctx->Req.cmdType;
-			req.param1.Copy(ctx->Req.param1);
-			req.param2.Copy(ctx->Req.param2);
-			req.reserved1.Copy(ctx->Req.reserved1);
-			req.reserved2.Copy(ctx->Req.reserved2);
-			eErr = (*m_pCardIssuer)(EntityResource::getLink().upgradeLink())->SAMICCommand(req, ans, 50000);
-			if (eErr == Error_Succeed)
-			{
-				ctx->Ans.ret1.Copy(ans.ret1);
-				ctx->Ans.ret2.Copy(ans.ret2);
-				ctx->Ans.reserved1.Copy(ans.reserved1);
-				ctx->Ans.reserved2.Copy(ans.reserved2);
-			}
-			else {
-				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("SAMICCommand, CardIssuerStand SAMICCommand failed return:%d", eErr);
-
-			}
-			ctx->Answer(eErr);
-			return 0;
-		}
-		else {
+		if (IsCardIssuerStore()){
 			ErrorCodeEnum eErr = Error_Unexpect;
 			CardIssuerStoreService_SAMICCommand_Req req;
 			CardIssuerStoreService_SAMICCommand_Ans ans;