Commit 4c68be65 authored by wenwen.tang's avatar wenwen.tang 😕

update

parent 3aa4d189
...@@ -71,7 +71,7 @@ class DividendPortfoliosHolder(PortfoliosHolder): ...@@ -71,7 +71,7 @@ class DividendPortfoliosHolder(PortfoliosHolder):
fund_div_tuple = self.get_navs_and_div(fund_ids=tuple(set(weight) | set(share)), day=day) fund_div_tuple = self.get_navs_and_div(fund_ids=tuple(set(weight) | set(share)), day=day)
navs = fund_div_tuple[0] navs = fund_div_tuple[0]
fund_dividend = fund_div_tuple[1] fund_dividend = fund_div_tuple[1]
fund_dividend = last_nav['fund_div'] + sum( fund_dividend = sum(
map(lambda k: share[k] * fund_dividend[k], filter(lambda k: k in fund_dividend, share.keys()))) map(lambda k: share[k] * fund_dividend[k], filter(lambda k: k in fund_dividend, share.keys())))
dividend_acc = last_nav['div_acc'] dividend_acc = last_nav['div_acc']
fund_av = round(sum([navs[x] * y for x, y in share.items()]), 4) + last_nav['fund_div'] fund_av = round(sum([navs[x] * y for x, y in share.items()]), 4) + last_nav['fund_div']
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment