Skip to content

Commit 75a858b

Browse files
authored
Update fmz.py
1 parent 5262d36 commit 75a858b

File tree

1 file changed

+18
-17
lines changed

1 file changed

+18
-17
lines changed

fmz.py

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -475,7 +475,9 @@ def __init__(self, name):
475475
self.__name = name
476476
sys.modules['talib'] = self
477477
def __getattr__(self, attr):
478-
raise Exception('Please install %s module for python' % self.__name)
478+
if attr == '__file__':
479+
return 'talib.py'
480+
raise Exception('Please install %s module for python (%s)' % (self.__name, attr))
479481

480482
class MyList(list):
481483
def __init__(self, data):
@@ -1729,23 +1731,22 @@ def data_clean(self):
17291731
holdSpot += (position[code]['Stocks'] + position[code]['FrozenStocks']) * position[code]['Last']
17301732
diffSpot += (position[code]['Stocks'] + position[code]['FrozenStocks'] - acc['Stocks']) * position[code]['Last']
17311733

1732-
if item['QuoteCurrency'] == 'CNY':
1733-
assets += item['Balance'] + item['FrozenBalance'] + profit + margin
1734-
moneyUse += margin / assets
1735-
dic['unit'] = '(CNY)'
1736-
elif 'Futures_' in item['Id']:
1737-
if item['QuoteCurrency'] == 'USDT':
1738-
assets += item['Balance'] + item['FrozenBalance'] + profit + margin
1739-
moneyUse += margin / assets
1740-
dic['unit'] = '(USDT)'
1734+
for asset in item['Assets']:
1735+
if item['QuoteCurrency'] == 'CNY':
1736+
assets += asset['Amount'] + asset['FrozenAmount'] + profit + margin
1737+
dic['unit'] = '(CNY)'
1738+
elif 'Futures_' in item['Id']:
1739+
if item['QuoteCurrency'] == 'USDT':
1740+
assets += asset['Amount'] + asset['FrozenAmount'] + profit + margin
1741+
dic['unit'] = '(USDT)'
1742+
else:
1743+
assets += asset['Amount'] + asset['FrozenAmount'] + profit + margin
1744+
dic['unit'] = '(%s)' % (item["BaseCurrency"], )
17411745
else:
1742-
assets += item['Stocks'] + item['FrozenStocks'] + profit + margin
1743-
moneyUse += margin / assets
1744-
dic['unit'] = '(%s)' % (item["BaseCurrency"], )
1745-
else:
1746-
assets += item['Balance'] + item['FrozenBalance'] + holdSpot
1747-
moneyUse += abs(diffSpot) / assets
1748-
dic['unit'] = '(USD)'
1746+
assets += asset['Amount'] + asset['FrozenAmount'] + holdSpot
1747+
margin = abs(diffSpot)
1748+
dic['unit'] = '(USD)'
1749+
moneyUse += margin / assets if assets != 0 else 0
17491750
dic['timeStamp'].append(datetime.datetime.fromtimestamp(i[0]/1000).date())
17501751
dic['assets'].append(assets)
17511752
dic['moneyUse'].append(moneyUse)

0 commit comments

Comments
 (0)