Commit 22ebf8c5 authored by brody's avatar brody

bugfix

parent 2542f49b
...@@ -244,10 +244,10 @@ class InvTrustPortfoliosHolder(DividendPortfoliosHolder): ...@@ -244,10 +244,10 @@ class InvTrustPortfoliosHolder(DividendPortfoliosHolder):
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 = sum(
map(lambda k: share[k] * fund_dividend[k], filter(lambda k: k in fund_dividend, share.keys())))
fund_dividend_nav = sum( fund_dividend_nav = sum(
map(lambda k: share_nav[k] * fund_dividend[k], filter(lambda k: k in fund_dividend, share_nav.keys()))) map(lambda k: share_nav[k] * fund_dividend[k], filter(lambda k: k in fund_dividend, share_nav.keys())))
fund_dividend = sum(
map(lambda k: share[k] * fund_dividend[k], filter(lambda k: k in fund_dividend, share.keys())))
dividend_acc = last_nav['div_acc'] + fund_dividend dividend_acc = last_nav['div_acc'] + fund_dividend
fund_av = round(sum([navs[x] * y for x, y in share.items()]), 4) fund_av = round(sum([navs[x] * y for x, y in share.items()]), 4)
fund_nav = round(sum([navs[x] * y for x, y in share_nav.items()]), 4) fund_nav = round(sum([navs[x] * y for x, y in share_nav.items()]), 4)
...@@ -312,7 +312,7 @@ class InvTrustPortfoliosHolder(DividendPortfoliosHolder): ...@@ -312,7 +312,7 @@ class InvTrustPortfoliosHolder(DividendPortfoliosHolder):
# 配息当天配股 # 配息当天配股
for k in share_nav.keys(): for k in share_nav.keys():
if k in fund_dividend: if k in fund_dividend:
share_nav[k] = (share_nav[k] * fund_dividend[k]) /navs[k] + share_nav[k] share_nav[k] = (share_nav[k] * fund_dividend[k]) / navs[k] + share_nav[k]
# 配息日当天取得调仓日计算的应调仓金额,做实际份额赎回,这里的金额(即月初计算的赎回金额)用于转换成“赎回目标的份额” # 配息日当天取得调仓日计算的应调仓金额,做实际份额赎回,这里的金额(即月初计算的赎回金额)用于转换成“赎回目标的份额”
need_div = last_nav['div_forecast'] need_div = last_nav['div_forecast']
if self.is_dividend_date(day) and need_div > 0: if self.is_dividend_date(day) and need_div > 0:
......
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