senset/vnpy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复bug：tdx重连时，不能重新选择最优服务器

Browse Source 
修复bug：获取持仓时，position为zero异常
This commit is contained in:
msincenselee 2019-06-06 09:26:16 +08:00
parent 3cd1ccc479
commit 86b1d8f4ee
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
vnpy/trader/gateway/ctpGateway/ctpGateway.py
View File

@ -1069,7 +1069,7 @@ class CtpTdApi(TdApi):
pre_settlement_price = data['PreSettlementPrice'] pre_settlement_price = data['PreSettlementPrice']
# 当前一笔的开仓均价 # 当前一笔的开仓均价
open_cost_price = data['OpenCost'] / (data['Position'] * size) open_cost_price = (data['OpenCost'] / (data['Position'] * size)) if data['Position'] > 0 else 0.0
pre_profit = 0 pre_profit = 0
# 上-交易日收益 = (上一交易日结算价 - 开仓价)* 昨仓持仓数量 * 杠杆 # 上-交易日收益 = (上一交易日结算价 - 开仓价)* 昨仓持仓数量 * 杠杆
@ -2004,6 +2004,7 @@ class TdxMdApi():
except Exception as ex: except Exception as ex:
self.writeError(u'连接服务器tdx[{}]异常:{},{}'.format(i,str(ex),traceback.format_exc())) self.writeError(u'连接服务器tdx[{}]异常:{},{}'.format(i,str(ex),traceback.format_exc()))
self.best_ip = {'ip': None, 'port': None}
return return
# 更新 symbol_exchange_dict , symbol_market_dict # 更新 symbol_exchange_dict , symbol_market_dict

3
vnpy/trader/gateway/ctpseGateway/ctpseGateway.py
View File

@ -1085,7 +1085,7 @@ class CtpTdApi(TdApi):
pre_settlement_price = data['PreSettlementPrice'] pre_settlement_price = data['PreSettlementPrice']
# 当前一笔的开仓均价 # 当前一笔的开仓均价
open_cost_price = data['OpenCost'] / (data['Position'] * size) open_cost_price = (data['OpenCost'] / (data['Position'] * size)) if data['Position'] > 0 else 0.0
pre_profit = 0 pre_profit = 0
# 上-交易日收益 = (上一交易日结算价 - 开仓价)* 昨仓持仓数量 * 杠杆 # 上-交易日收益 = (上一交易日结算价 - 开仓价)* 昨仓持仓数量 * 杠杆
@ -2025,6 +2025,7 @@ class TdxMdApi():
except Exception as ex: except Exception as ex:
self.writeError(u'连接服务器tdx[{}]异常:{},{}'.format(i,str(ex),traceback.format_exc())) self.writeError(u'连接服务器tdx[{}]异常:{},{}'.format(i,str(ex),traceback.format_exc()))
self.best_ip = {'ip': None, 'port': None}
return return
# 更新 symbol_exchange_dict , symbol_market_dict # 更新 symbol_exchange_dict , symbol_market_dict