Merge branch 'dev' of https://github.com/vnpy/vnpy into dev

This commit is contained in:
vn.py 2018-03-14 14:31:40 +08:00
commit bdb7c1e7b6

View File

@ -804,7 +804,7 @@ class SecTdApi(TdApi):
# 保存代码 # 保存代码
pos.symbol = data['securityID'] pos.symbol = data['securityID']
pos.exchange = exchangeMap.get(data['exchangeID'], EXCHANGE_UNKNOWN) pos.exchange = exchangeMapReverse.get(data['exchangeID'], EXCHANGE_UNKNOWN)
pos.vtSymbol = '.'.join([pos.symbol, pos.exchange]) pos.vtSymbol = '.'.join([pos.symbol, pos.exchange])
pos.direction = DIRECTION_LONG pos.direction = DIRECTION_LONG
pos.vtPositionName = '.'.join([pos.vtSymbol, pos.direction]) pos.vtPositionName = '.'.join([pos.vtSymbol, pos.direction])
@ -1152,7 +1152,7 @@ class SecTdApi(TdApi):
# 保存代码 # 保存代码
pos.symbol = data['securityOptionID'] pos.symbol = data['securityOptionID']
pos.exchange = exchangeMap.get(data['exchangeID'], EXCHANGE_UNKNOWN) pos.exchange = exchangeMapReverse.get(data['exchangeID'], EXCHANGE_UNKNOWN)
pos.vtSymbol = '.'.join([pos.symbol, pos.exchange]) pos.vtSymbol = '.'.join([pos.symbol, pos.exchange])
pos.direction = directionMapReverse.get(data['entrustDirection'], DIRECTION_UNKNOWN) pos.direction = directionMapReverse.get(data['entrustDirection'], DIRECTION_UNKNOWN)
pos.vtPositionName = '.'.join([pos.vtSymbol, pos.direction]) pos.vtPositionName = '.'.join([pos.vtSymbol, pos.direction])