Преглед изворни кода

Z991239-5550 #comment feat: 卡库发卡JS接口实现

Signed-Off-By: commit-hook
刘文涛80174520 пре 1 година
родитељ
комит
843e7dd045

+ 4 - 0
Module/mod_cardissuerstore/CardIssuerFSM.cpp

@@ -1140,6 +1140,10 @@ unsigned int CCardIssuerFSM::s10_on_event(FSMEvent* pEvt)
 		pEvt->SetHandled();
 		ret = pEvt->param1;
 		break;
+	case USER_EVT_JS_ISSUE_FROM_BOX_FINISHED:
+		pEvt->SetHandled();
+		ret = pEvt->param1;
+		break;
 	case USER_EVT_ISSUE_EX_FINISHED:
 		pEvt->SetHandled();
 		ret = pEvt->param1;

+ 9 - 0
Module/mod_cardissuerstore/mod_cardissuer.cpp

@@ -269,6 +269,15 @@ void CardIssuerStoreServerSession::Handle_IssueFromBoxJS(SpReqAnsContext<CardIss
 	m_pEntity->IssueFromBoxJS(ctx);
 }
 
+//跨机激活
+void CardIssuerStoreServerSession::Handle_PreOnlineCrossJS(SpReqAnsContext<CardIssuerStoreService_PreOnlineCrossJS_Req, CardIssuerStoreService_PreOnlineCrossJS_Ans>::Pointer ctx)
+{
+	LOG_FUNCTION();
+	DbgToBeidou(ctx->link, __FUNCTION__)();
+	DbgWithLink(LOG_LEVEL_INFO, ctx->link.checkEmpty() ? LOG_TYPE_SYSTEM : LOG_TYPE_USER).setAPI(__FUNCTION__)("Invoke PreOnlineCrossJS");
+	//m_pEntity->IssueFromBoxJS(ctx);
+}
+
 #pragma endregion JS接口实现
 void CCardIssuerEntity::OnSysVarEvent(const char* pszKey, const char* pszValue, const char* pszOldValue, const char* pszEntityName)
 {

+ 1 - 1
Module/mod_cardissuerstore/mod_cardissuer.h

@@ -41,7 +41,7 @@ public:
 	virtual void Handle_SAMICCommandJS(SpReqAnsContext<CardIssuerStoreService_SAMICCommandJS_Req, CardIssuerStoreService_SAMICCommandJS_Ans>::Pointer ctx);
 	virtual void Handle_WriteTrackJS(SpReqAnsContext<CardIssuerStoreService_WriteTrackJS_Req, CardIssuerStoreService_WriteTrackJS_Ans>::Pointer ctx);
 	virtual void Handle_PrintCardImmediatelyJS(SpReqAnsContext<CardIssuerStoreService_PrintCardImmediatelyJS_Req, CardIssuerStoreService_PrintCardImmediatelyJS_Ans>::Pointer ctx);
-//	virtual void Handle_PreOnlineCrossJS(SpReqAnsContext<CardIssuerStoreService_PreOnlineCrossJS_Req, CardIssuerStoreService_PreOnlineCrossJS_Ans>::Pointer ctx);
+	virtual void Handle_PreOnlineCrossJS(SpReqAnsContext<CardIssuerStoreService_PreOnlineCrossJS_Req, CardIssuerStoreService_PreOnlineCrossJS_Ans>::Pointer ctx);
 	virtual void Handle_ReadBatchCardInfoInRangeJS(SpReqAnsContext<CardIssuerStoreService_ReadBatchCardInfoInRangeJS_Req, CardIssuerStoreService_ReadBatchCardInfoInRangeJS_Ans>::Pointer ctx);
 	virtual void Handle_GetCardInStoreJS(SpReqAnsContext<CardIssuerStoreService_GetCardInStoreJS_Req, CardIssuerStoreService_GetCardInStoreJS_Ans>::Pointer ctx);
 	virtual void Handle_AddAndReadCardFromBoxJS(SpReqAnsContext<CardIssuerStoreService_AddAndReadCardFromBoxJS_Req, CardIssuerStoreService_AddAndReadCardFromBoxJS_Ans>::Pointer ctx);