调仓日当天忽略配息

portfolios/holder.py

@@ -67,22 +67,16 @@ class DividendPortfoliosHolder(PortfoliosHolder):
             share = {int(x): y for x, y in json.loads(last_nav['portfolios'])['share'].items()}
             fund_div_tuple = self.get_navs_and_div(fund_ids=tuple(set(weight) | set(share)), day=day)
             navs = fund_div_tuple[0]
-            # todo 如果建仓是遇到基金配息，则忽略
-            fund_dividend = fund_div_tuple[1]
             dividend_acc = last_nav['div_acc']
             nav = round(sum([navs[x] * y for x, y in share.items()]), 4) + last_nav['fund_div']
         else:
             nav = self.init_nav
             fund_div_tuple = self.get_navs_and_div(fund_ids=tuple(weight), day=day)
             navs = fund_div_tuple[0]
-            # todo 如果建仓是遇到基金配息，则忽略
-            fund_dividend = fund_div_tuple[1]
         dividend = nav * self.month_dividend
         nav = nav - dividend
         share = {x: nav * w / navs[x] for x, w in weight.items()}
-        # todo 如果建仓是遇到基金配息，则忽略
-        fund_dividend = sum(
-            map(lambda k: share[k] * fund_dividend[k], filter(lambda k: k in fund_dividend, share.keys())))
+        fund_dividend = 0
         dividend_acc = dividend + dividend_acc
         asset_nav = nav + fund_dividend + dividend
         rhp.insert({