Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
P
PyFund
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
陈涛
PyFund
Commits
b6241737
Commit
b6241737
authored
Jun 21, 2023
by
陈涛
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改重新计算净值
parent
d6fec63d
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
4 deletions
+2
-4
bill.py
api/bill.py
+1
-1
nav.py
service/nav.py
+1
-3
No files found.
api/bill.py
View file @
b6241737
...
@@ -212,7 +212,7 @@ async def create_staking_api(
...
@@ -212,7 +212,7 @@ async def create_staking_api(
else
:
else
:
assets
[
create_staking_bill
.
currency
]
+=
create_staking_bill
.
volume
-
create_staking_bill
.
fee
assets
[
create_staking_bill
.
currency
]
+=
create_staking_bill
.
volume
-
create_staking_bill
.
fee
# 检查pending_assets里面的值
# 检查pending_assets里面的值
for
key
,
value
in
pending_assets
.
item
():
for
key
,
value
in
pending_assets
.
item
s
():
assets
.
setdefault
(
key
,
0
)
assets
.
setdefault
(
key
,
0
)
assets
[
key
]
+=
value
assets
[
key
]
+=
value
pending_assets
[
key
]
-=
value
pending_assets
[
key
]
-=
value
...
...
service/nav.py
View file @
b6241737
...
@@ -69,9 +69,6 @@ async def calculate_nav(fund_id, calc_time: datetime.datetime = None, beach_serv
...
@@ -69,9 +69,6 @@ async def calculate_nav(fund_id, calc_time: datetime.datetime = None, beach_serv
income
=
beach_service
.
get_rewards
(
key
)
income
=
beach_service
.
get_rewards
(
key
)
node_income_assets
.
setdefault
(
"ETH"
,
0
)
node_income_assets
.
setdefault
(
"ETH"
,
0
)
node_income_assets
[
"ETH"
]
+=
income
.
total_rewards
.
total
if
income
else
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
():
for
key
,
value
in
fund_data
[
"node_income_assets"
]
.
items
():
amount
.
setdefault
(
key
,
0
)
amount
.
setdefault
(
key
,
0
)
amount
[
key
]
+=
value
amount
[
key
]
+=
value
...
@@ -120,6 +117,7 @@ async def calculate_nav(fund_id, calc_time: datetime.datetime = None, beach_serv
...
@@ -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
())})
fund_nav
.
update
({
"record_date"
:
record_date
,
"fund_share"
:
total_fund_share
,
"nav"
:
net_value
,
"update_time"
:
int
(
time
.
time
())})
else
:
else
:
fund_nav
=
build_fund_nav
(
fund_record
,
record_date
,
total_fund_share
,
net_value
)
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
(
update_record
=
await
nav_collect
.
find_one_and_update
(
{
"fund_id"
:
fund_id
,
"record_date"
:
record_date
},
{
"fund_id"
:
fund_id
,
"record_date"
:
record_date
},
{
"$set"
:
fund_nav
},
{
"$set"
:
fund_nav
},
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment