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
5a523d5f
Commit
5a523d5f
authored
Jul 06, 2023
by
xianyang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
充值报表增加充值总数字段
parent
a274517c
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
4 deletions
+15
-4
crud.py
app/api/statement/crud.py
+12
-1
views.py
app/api/statement/views.py
+3
-3
No files found.
app/api/statement/crud.py
View file @
5a523d5f
...
...
@@ -160,6 +160,16 @@ class RechargeStatement(object):
Logger
()
.
logger
.
info
(
f
"拼接的数据:{query_data[0]}"
)
return
query_data
def
query_sum_money
(
self
,
start_time
,
end_time
):
start_stamp
=
time_str_to_timestamp
(
start_time
+
' 00:00:00'
)
end_stamp
=
time_str_to_timestamp
(
end_time
+
' 23:59:59'
)
order_sql
=
f
"SELECT sum(money) as money FROM orders WHERE lastupdate>={start_stamp} and lastupdate<{end_stamp}"
order_res
=
LinkMysql
(
env
.
DB_3YV2
)
.
query_mysql
(
order_sql
)
if
order_res
:
sum_money
=
order_res
[
0
][
'money'
]
return
sum_money
if
sum_money
else
0
return
0
def
query_data
(
self
,
db
,
page
,
size
,
order_number
,
uuid
,
sid
,
start_time
,
end_time
,
type
,
menu_id
,
month_type
,
export_status
):
"""列表"""
query
=
[]
...
...
@@ -201,8 +211,9 @@ class RechargeStatement(object):
else
:
query_data
=
self
.
query_add_time
(
start_time
,
end_time
,
query
)
count
,
once_res
,
moeny_data
=
self
.
thread_data
(
month_type
,
query_data
,
page
,
size
,
start_time
,
end_time
,
export_status
)
incone_sum_money
=
self
.
query_sum_money
(
start_time
,
end_time
)
result
=
self
.
user_order_data
(
once_res
)
return
count
,
result
,
moeny_data
return
count
,
result
,
moeny_data
,
incone_sum_money
def
query_add_time
(
self
,
start_time
,
end_time
,
old_query
):
data
=
[]
...
...
app/api/statement/views.py
View file @
5a523d5f
...
...
@@ -28,8 +28,8 @@ def statement_recharge_list(request: Request,db: Session = Depends(get_db),page:
return
HttpResultResponse
(
code
=
500
,
msg
=
'时间为必传参数'
)
query_params
=
request
.
query_params
menu_id
=
query_params
.
getlist
(
"menu_id[]"
)
total
,
statement_list
,
money
=
RechargeStatement
()
.
query_data
(
db
,
page
,
size
,
order_number
,
uuid
,
sid
,
start_time
,
end_time
,
types
,
menu_id
,
month_type
,
''
)
return
HttpResultResponse
(
total
=
total
,
count
=
float
(
money
),
data
=
statement_list
)
total
,
statement_list
,
money
,
sun_m
=
RechargeStatement
()
.
query_data
(
db
,
page
,
size
,
order_number
,
uuid
,
sid
,
start_time
,
end_time
,
types
,
menu_id
,
month_type
,
''
)
return
HttpResultResponse
(
total
=
total
,
count
=
float
(
money
),
data
=
statement_list
,
sum_money
=
sun_m
)
@
router
.
post
(
"/derive/excel"
)
...
...
@@ -37,7 +37,7 @@ def statement_derive_excel(request:Request,data: schemas.StatementList,db: Sessi
"""充值报表导出"""
header_list
=
request
.
get
(
"headers"
)
export_status
=
1
total
,
statement_list
,
money
=
RechargeStatement
()
.
query_data
(
db
,
data
.
page
,
data
.
size
,
data
.
order_number
,
data
.
uuid
,
total
,
statement_list
,
money
,
sun_m
=
RechargeStatement
()
.
query_data
(
db
,
data
.
page
,
99999999
,
data
.
order_number
,
data
.
uuid
,
data
.
sid
,
data
.
start_time
,
data
.
end_time
,
data
.
types
,
data
.
menu_id
,
data
.
month_type
,
export_status
)
field_list
=
[
"uuid"
,
"充值金额(元)"
,
"支付时间"
,
"业务类型"
,
"订单号"
,
"昵称"
,
"充值状态"
,
"到账金额(元)"
,
"用户Id"
,
"渠道"
,
"商户订单号"
]
...
...
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