Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
financial-system
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
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
xianyang
financial-system
Commits
b328b7f9
Commit
b328b7f9
authored
Aug 16, 2023
by
xianyang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优化财务详情查询
parent
e0702899
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
crud.py
app/api/account/crud.py
+2
-2
No files found.
app/api/account/crud.py
View file @
b328b7f9
...
...
@@ -410,7 +410,7 @@ class AccountStatistics(object):
"""处理可消费,可提现数据"""
bk
=
pd
.
DataFrame
(
special_data
)
for
old
in
old_data
:
df
=
bk
[(
bk
[
"guild_id"
]
==
old
[
'guild_id'
])
&
(
bk
[
"amount_type"
]
==
2
)]
# 可消费
df
=
bk
[(
bk
[
"guild_id"
]
==
old
[
'guild_id'
])
&
(
bk
[
"
create_time"
]
==
old
[
'create_time'
])
&
(
bk
[
"
amount_type"
]
==
2
)]
# 可消费
serializer_info
=
df
.
to_dict
(
orient
=
'records'
)
if
serializer_info
:
old
[
'con_income'
]
=
serializer_info
[
0
][
'income'
]
...
...
@@ -418,7 +418,7 @@ class AccountStatistics(object):
else
:
old
[
'con_income'
]
=
0
old
[
'con_outcome'
]
=
0
df
=
bk
[(
bk
[
"guild_id"
]
==
old
[
'guild_id'
])
&
(
bk
[
"amount_type"
]
==
3
)]
# 可提现
df
=
bk
[(
bk
[
"guild_id"
]
==
old
[
'guild_id'
])
&
(
bk
[
"
create_time"
]
==
old
[
'create_time'
])
&
(
bk
[
"
amount_type"
]
==
3
)]
# 可提现
serializer_info
=
df
.
to_dict
(
orient
=
'records'
)
if
serializer_info
:
old
[
'with_income'
]
=
serializer_info
[
0
][
'income'
]
...
...
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