资金账号信息添加账号信息

Author: wukan1986

QuantBox_CTP_Trade/TraderApi.cpp

@@ -1051,6 +1051,7 @@ void CTraderApi::OnRspQryTradingAccount(CThostFtdcTradingAccountField *pTradingA
 		{
 			AccountField* pField = (AccountField*)m_msgQueue->new_block(sizeof(AccountField));
 
+			strcpy(pField->Account, pTradingAccount->AccountID);
 			pField->PreBalance = pTradingAccount->PreBalance;
 			pField->CurrMargin = pTradingAccount->CurrMargin;
 			pField->Commission = pTradingAccount->Commission;

QuantBox_Femas_Trade/TraderApi.cpp

@@ -1028,6 +1028,7 @@ void CTraderApi::OnRspQryInvestorAccount(CUstpFtdcRspInvestorAccountField *pRspI
 		{
 			AccountField* pField = (AccountField*)m_msgQueue->new_block(sizeof(AccountField));
 
+			strcpy(pField->Account, pRspInvestorAccount->AccountID);
 			pField->PreBalance = pRspInvestorAccount->PreBalance;
 			pField->CurrMargin = pRspInvestorAccount->Margin;
 			pField->Commission = pRspInvestorAccount->Fee;

QuantBox_Kingstar_Trade/TraderApi.cpp

@@ -1176,6 +1176,7 @@ void CTraderApi::OnRspQryInstrument(CThostFtdcInstrumentField *pInstrument, CTho
 			pField->ExpireDate = GetDate(pInstrument->ExpireDate);
 			pField->OptionsType = TThostFtdcOptionsTypeType_2_PutCall(pInstrument->OptionsType);
 			pField->StrikePrice = (pInstrument->StrikePrice < DBL_EPSILON || pInstrument->StrikePrice == DBL_MAX) ? 0 : pInstrument->StrikePrice;
+			strcpy(pField->UnderlyingInstrID, pInstrument->UnderlyingInstrID);
 
 			m_msgQueue->Input_NoCopy(ResponeType::OnRspQryInstrument, m_msgQueue, m_pClass, bIsLast, 0, pField, sizeof(InstrumentField), nullptr, 0, nullptr, 0);
 		}

QuantBox_LTS_Trade/TraderApi.cpp

@@ -682,6 +682,7 @@ void CTraderApi::OnRspQryTradingAccount(CSecurityFtdcTradingAccountField *pTradi
 		{
 			AccountField* pField = (AccountField*)m_msgQueue->new_block(sizeof(AccountField));
 
+			strcpy(pField->Account, pTradingAccount->AccountID);
 			pField->PreBalance = pTradingAccount->PreBalance;
 			pField->CurrMargin = pTradingAccount->CurrMargin;
 			//pField->CloseProfit = pTradingAccount->CloseProfit;

QuantBox_XSpeed_Trade/TraderApi.cpp

@@ -845,6 +845,7 @@ void CTraderApi::OnRspCustomerCapital(struct DFITCCapitalInfoRtnField * pCapital
 		{
 			AccountField* pField = (AccountField*)m_msgQueue->new_block(sizeof(AccountField));
 
+			strcpy(pField->Account, pCapitalInfoRtn->accountID);
 			pField->PreBalance = pCapitalInfoRtn->preEquity;
 			pField->CurrMargin = pCapitalInfoRtn->margin;
 			pField->Commission = pCapitalInfoRtn->fee;

csharp/QuantBox.XAPI/Struct.cs

@@ -564,6 +564,8 @@ public struct InstrumentField
     [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)]
     public struct AccountField
     {
+        [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 32)]
+        public string Account;
         /// <summary>
         /// 上次结算准备金
         /// </summary>

include/ApiEnum.h

@@ -150,6 +150,21 @@ enum InstrumentType :char
 	Synthetic,
 };
 
+
+/*
+发现融资融券的只有部分功能加入，还有一些功能缺失
+这下回到XAPI的定位问题，到底是一个只服务自动套利交易的API,还是全功能的API
+*/
+enum SecurityType :char
+{
+	CS, // Common Stock
+	CB, // Convertible Bond，标记后，深圳卖出当前可转债表示转股
+	ETF, // 标记后，买入表示申购，卖出表示赎回
+	LOF, // 标记后，买入表示申购，卖出表示赎回
+	SF, // 标记后，买入表示合并，卖出表示分拆
+	CashMargin, // 标记后，开仓表示"融"，平仓表示"还"
+};
+
 enum BarType :char
 {
 	Time,
@@ -209,4 +224,5 @@ enum ExchangeType :char
 	HKEx,
 };
 
+
 #endif

include/ApiStruct.h

@@ -411,6 +411,7 @@ struct InstrumentField
 ///账号
 struct AccountField
 {
+	AccountIDType Account;
 	///上次结算准备金
 	MoneyType	PreBalance;
 	///当前保证金总额