Commit b6241737 authored by 陈涛's avatar 陈涛

修改重新计算净值

parent d6fec63d
......@@ -212,7 +212,7 @@ async def create_staking_api(
else:
assets[create_staking_bill.currency] += create_staking_bill.volume - create_staking_bill.fee
# 检查pending_assets里面的值
for key, value in pending_assets.item():
for key, value in pending_assets.items():
assets.setdefault(key, 0)
assets[key] += value
pending_assets[key] -= value
......
......@@ -69,9 +69,6 @@ async def calculate_nav(fund_id, calc_time: datetime.datetime = None, beach_serv
income = beach_service.get_rewards(key)
node_income_assets.setdefault("ETH", 0)
node_income_assets["ETH"] += income.total_rewards.total if income else 0
fund_data["node_income_assets"] = node_income_assets
else:
fund_data["node_income_assets"] = node_income_assets
for key, value in fund_data["node_income_assets"].items():
amount.setdefault(key, 0)
amount[key] += value
......@@ -120,6 +117,7 @@ async def calculate_nav(fund_id, calc_time: datetime.datetime = None, beach_serv
fund_nav.update({"record_date": record_date, "fund_share": total_fund_share, "nav": net_value, "update_time": int(time.time())})
else:
fund_nav = build_fund_nav(fund_record, record_date, total_fund_share, net_value)
fund_nav.update({"node_income_assets": node_income_assets})
update_record = await nav_collect.find_one_and_update(
{"fund_id": fund_id, "record_date": record_date},
{"$set": fund_nav},
......
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