修改创建 调整账目，置换币账目 接口

main.py

@@ -94,8 +94,8 @@ async def startup():
         misfire_grace_time=20
     )
 
-    if settings.env == 'LOCAL':
-        return
+    # if settings.env == 'LOCAL':
+    #     return
     app.state.scheduler.start()
 
     app.state.scheduler.print_jobs()

model/fund.py

@@ -6,6 +6,7 @@ from pydantic import Field
 from model import MyBaseModel
 from model.node import BaseNode
 from schema.fund import FundType, FundStatus
+from tools.time_helper import utc_now_timestamp
 
 
 class BaseFundItem(MyBaseModel):
@@ -29,6 +30,7 @@ class NormalFund(BaseFundItem):
     adjust_assets: Dict[str, float] = Field(default={}, description='调整账户持仓')
     pending_assets: Dict[str, float] = Field(default={}, description='pending资产')
     staking_assets: Dict[str, float] = Field(default={}, description='质押资产')
+    assets_update: float = Field(default_factory=utc_now_timestamp, description='余额更新时间')
 
 
 class StakingFund(BaseFundItem):
@@ -40,3 +42,4 @@ class StakingFund(BaseFundItem):
     adjust_assets: Dict[str, float] = Field(default={}, description='调整账户持仓')
     pending_assets: Dict[str, float] = Field(default={}, description='pending资产')
     staking_assets: Dict[str, float] = Field(default={}, description='质押资产')
+    assets_update: float = Field(default_factory=utc_now_timestamp, description='余额更新时间')

service/fund.py

@@ -2,6 +2,7 @@ from typing import Tuple
 
 from exception.db import NotFundError
 from schema.fund import FundStatus
+from tools.time_helper import utc_now_timestamp
 
 
 async def query_fund_assets(fund_collect, fund_id, user_id=None, fund_status=None) -> Tuple[dict, dict, dict, dict]:
@@ -17,10 +18,10 @@ async def query_fund_assets(fund_collect, fund_id, user_id=None, fund_status=Non
 
 
 # 修改资产
-async def update_assets(fund_collect, fund_id, assets=None, adjust_assets=None, pending_assets=None,
+async def update_assets(fund_collect, fund_id, *, assets=None, adjust_assets=None, pending_assets=None,
                         staking_assets=None):
     query = {'id': fund_id}
-    update_data = {}
+    update_data = {"assets_update": utc_now_timestamp()}
     if assets:
         update_data.update({"assets": assets})
     if adjust_assets:

service/scheduler.py

@@ -13,7 +13,7 @@ from dependencies import get_bill_collect, get_fund_collect
 from exception.http import RequestInvalidParamsError
 from schema.bill import StakingBillStatus, AllBillType
 from service.beacon import BeaconChaService
-from tools.time_helper import utc_now
+from tools.time_helper import utc_now_timestamp
 
 
 async def delete_task(job_id, scheduler):
@@ -67,7 +67,7 @@ async def update_staking_bill_status_task(beacon_service: BeaconChaService, mong
         if status:
             await bill_collect.find_one_and_update(
                 {'id': bill_item.id},
-                {'$set': {"status": status, "update_time": utc_now()}},
+                {'$set': {"status": status, "update_time": utc_now_timestamp()}},
                 return_document=ReturnDocument.AFTER)
             if status == StakingBillStatus.finish:
                 fund_collect = get_fund_collect(mongodb_manager)