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

wukan1986 · wukan1986 · commit 30e46a0d5824 · 2015-06-02T16:50:13.000+08:00
diff --git a/QuantBox_CTP_Trade/TraderApi.cpp b/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;
diff --git a/QuantBox_Femas_Trade/TraderApi.cpp b/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;
diff --git a/QuantBox_Kingstar_Trade/TraderApi.cpp b/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);
 		}
diff --git a/QuantBox_LTS_Trade/TraderApi.cpp b/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;
diff --git a/QuantBox_XSpeed_Trade/TraderApi.cpp b/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;
diff --git a/csharp/QuantBox.XAPI/Struct.cs b/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>
diff --git a/include/ApiEnum.h b/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
diff --git a/include/ApiStruct.h b/include/ApiStruct.h
@@ -411,6 +411,7 @@ struct InstrumentField
 ///账号
 struct AccountField
 {
+	AccountIDType Account;
 	///上次结算准备金
 	MoneyType	PreBalance;
 	///当前保证金总额

Original file line number	Diff line number	Diff line change
`@@ -1051,6 +1051,7 @@ void CTraderApi::OnRspQryTradingAccount(CThostFtdcTradingAccountField *pTradingA`
`1051`	`1051`	`{`
`1052`	`1052`	`AccountField* pField = (AccountField*)m_msgQueue->new_block(sizeof(AccountField));`
`1053`	`1053`
	`1054`	`+ strcpy(pField->Account, pTradingAccount->AccountID);`
`1054`	`1055`	`pField->PreBalance = pTradingAccount->PreBalance;`
`1055`	`1056`	`pField->CurrMargin = pTradingAccount->CurrMargin;`
`1056`	`1057`	`pField->Commission = pTradingAccount->Commission;`
Original file line number	Diff line number	Diff line change
`@@ -1028,6 +1028,7 @@ void CTraderApi::OnRspQryInvestorAccount(CUstpFtdcRspInvestorAccountField *pRspI`
`1028`	`1028`	`{`
`1029`	`1029`	`AccountField* pField = (AccountField*)m_msgQueue->new_block(sizeof(AccountField));`
`1030`	`1030`
	`1031`	`+ strcpy(pField->Account, pRspInvestorAccount->AccountID);`
`1031`	`1032`	`pField->PreBalance = pRspInvestorAccount->PreBalance;`
`1032`	`1033`	`pField->CurrMargin = pRspInvestorAccount->Margin;`
`1033`	`1034`	`pField->Commission = pRspInvestorAccount->Fee;`
Original file line number	Diff line number	Diff line change
`@@ -1176,6 +1176,7 @@ void CTraderApi::OnRspQryInstrument(CThostFtdcInstrumentField *pInstrument, CTho`
`1176`	`1176`	`pField->ExpireDate = GetDate(pInstrument->ExpireDate);`
`1177`	`1177`	`pField->OptionsType = TThostFtdcOptionsTypeType_2_PutCall(pInstrument->OptionsType);`
`1178`	`1178`	`pField->StrikePrice = (pInstrument->StrikePrice < DBL_EPSILON \|\| pInstrument->StrikePrice == DBL_MAX) ? 0 : pInstrument->StrikePrice;`
	`1179`	`+ strcpy(pField->UnderlyingInstrID, pInstrument->UnderlyingInstrID);`
`1179`	`1180`
`1180`	`1181`	`m_msgQueue->Input_NoCopy(ResponeType::OnRspQryInstrument, m_msgQueue, m_pClass, bIsLast, 0, pField, sizeof(InstrumentField), nullptr, 0, nullptr, 0);`
`1181`	`1182`	`}`
Original file line number	Diff line number	Diff line change
`@@ -682,6 +682,7 @@ void CTraderApi::OnRspQryTradingAccount(CSecurityFtdcTradingAccountField *pTradi`
`682`	`682`	`{`
`683`	`683`	`AccountField* pField = (AccountField*)m_msgQueue->new_block(sizeof(AccountField));`
`684`	`684`
	`685`	`+ strcpy(pField->Account, pTradingAccount->AccountID);`
`685`	`686`	`pField->PreBalance = pTradingAccount->PreBalance;`
`686`	`687`	`pField->CurrMargin = pTradingAccount->CurrMargin;`
`687`	`688`	`//pField->CloseProfit = pTradingAccount->CloseProfit;`
Original file line number	Diff line number	Diff line change
`@@ -845,6 +845,7 @@ void CTraderApi::OnRspCustomerCapital(struct DFITCCapitalInfoRtnField * pCapital`
`845`	`845`	`{`
`846`	`846`	`AccountField* pField = (AccountField*)m_msgQueue->new_block(sizeof(AccountField));`
`847`	`847`
	`848`	`+ strcpy(pField->Account, pCapitalInfoRtn->accountID);`
`848`	`849`	`pField->PreBalance = pCapitalInfoRtn->preEquity;`
`849`	`850`	`pField->CurrMargin = pCapitalInfoRtn->margin;`
`850`	`851`	`pField->Commission = pCapitalInfoRtn->fee;`
Original file line number	Diff line number	Diff line change
`@@ -564,6 +564,8 @@ public struct InstrumentField`
`564`	`564`	`[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)]`
`565`	`565`	`public struct AccountField`
`566`	`566`	`{`
	`567`	`+ [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 32)]`
	`568`	`+ public string Account;`
`567`	`569`	`/// <summary>`
`568`	`570`	`/// 上次结算准备金`
`569`	`571`	`/// </summary>`
Original file line number	Diff line number	Diff line change
`@@ -411,6 +411,7 @@ struct InstrumentField`
`411`	`411`	`///账号`
`412`	`412`	`struct AccountField`
`413`	`413`	`{`
	`414`	`+ AccountIDType Account;`
`414`	`415`	`///上次结算准备金`
`415`	`416`	`MoneyType PreBalance;`
`416`	`417`	`///当前保证金总额`