修改重新计算净值

api/nav.py

@@ -100,14 +100,14 @@ async def recalculate_nav(
         start: datetime.datetime = Query(..., title="开始时间"),
         end: datetime.datetime = Query(None, title="结束时间"),
         fund_collect: AgnosticCollection = Depends(get_fund_collect),
-        # user: User = Depends(get_current_user),
-        # permission_user_collect: AgnosticCollection = Depends(get_permission_user_collect),
-        # permission_role_collect: AgnosticCollection = Depends(get_permission_role_collect)
+        user: User = Depends(get_current_user),
+        permission_user_collect: AgnosticCollection = Depends(get_permission_user_collect),
+        permission_role_collect: AgnosticCollection = Depends(get_permission_role_collect)
 ):
-    # await check_permission(['data_permission.nav.recalculate'],
-    #                        fund_id,
-    #                        user.email, permission_user_collect,
-    #                        permission_role_collect)
+    await check_permission(['data_permission.nav.recalculate'],
+                           fund_id,
+                           user.email, permission_user_collect,
+                           permission_role_collect)
     fund_data = await fund_collect.find_one({"id": fund_id})
     assert fund_data, "没有数据"
     end = end or datetime.datetime.utcnow()

service/nav.py

@@ -69,7 +69,7 @@ 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
-    for key, value in fund_data["node_income_assets"].items():
+    for key, value in node_income_assets.items():
         amount.setdefault(key, 0)
         amount[key] += value