Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Sign in
Toggle navigation
T
tamp_course_order
Project
Project
Details
Activity
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
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
彭熊
tamp_course_order
Commits
82e26e1a
Commit
82e26e1a
authored
Nov 30, 2020
by
pengxiong@wealthgrow.cn
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
积分金额显示,全局500错误捕获
parent
5736769a
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
1050 additions
and
8 deletions
+1050
-8
errorhandler.py
app/controller/errorhandler.py
+10
-0
order.py
app/controller/order.py
+8
-5
order_service.py
app/service/order_service.py
+4
-3
tamp_course_order.log
logs/tamp_course_order.log
+1028
-0
No files found.
app/controller/errorhandler.py
View file @
82e26e1a
...
@@ -49,6 +49,16 @@ def add_errorhandler(app):
...
@@ -49,6 +49,16 @@ def add_errorhandler(app):
return
response
return
response
@
app
.
errorhandler
(
500
)
def
handle_flask_error
(
error
):
# response 的 json 内容为自定义错误代码和错误信息
response
=
jsonify
({
'statusCode'
:
'9999'
,
'message'
:
'服务器错误'
})
# response 返回 error 发生时定义的标准错误代码
response
.
status_code
=
200
return
response
@
app
.
before_request
@
app
.
before_request
def
before_request
():
def
before_request
():
...
...
app/controller/order.py
View file @
82e26e1a
...
@@ -32,10 +32,11 @@ class TopUpOrder(Resource):
...
@@ -32,10 +32,11 @@ class TopUpOrder(Resource):
args
=
self
.
parser
.
parse_args
()
args
=
self
.
parser
.
parse_args
()
args
[
'user_id'
]
=
request
.
user_id
args
[
'user_id'
]
=
request
.
user_id
data
=
order_service
.
TopUpOrderService
()
.
get_order
(
args
)
data
=
order_service
.
TopUpOrderService
()
.
get_order
(
args
)
if
not
data
.
get
(
'content'
,
None
):
raise
CustomFlaskErr
(
Errors
.
NO_ORDERS
)
resp
=
request
.
return_success
resp
=
request
.
return_success
resp
[
'attributes'
]
=
data
if
not
data
.
get
(
'content'
,
None
):
resp
[
'attributes'
]
=
[]
else
:
resp
[
'attributes'
]
=
data
return
resp
return
resp
def
post
(
self
):
def
post
(
self
):
...
@@ -77,10 +78,12 @@ class ConsumeOrder(Resource):
...
@@ -77,10 +78,12 @@ class ConsumeOrder(Resource):
user_id
=
request
.
user_id
user_id
=
request
.
user_id
args
[
'user_id'
]
=
request
.
user_id
args
[
'user_id'
]
=
request
.
user_id
data
=
order_service
.
CurriculumOrderService
()
.
get_order
(
args
)
data
=
order_service
.
CurriculumOrderService
()
.
get_order
(
args
)
if
not
data
.
get
(
'content'
,
None
):
raise
CustomFlaskErr
(
Errors
.
NO_ORDERS
)
resp
=
request
.
return_success
resp
=
request
.
return_success
resp
[
'attributes'
]
=
data
resp
[
'attributes'
]
=
data
if
not
data
.
get
(
'content'
,
None
):
resp
[
'attributes'
]
=
[]
else
:
resp
[
'attributes'
]
=
data
return
resp
return
resp
def
post
(
self
):
def
post
(
self
):
...
...
app/service/order_service.py
View file @
82e26e1a
...
@@ -150,7 +150,7 @@ class CurriculumOrderService:
...
@@ -150,7 +150,7 @@ class CurriculumOrderService:
order
=
{
**
order
,
**
curriculum_res
.
get
(
prod_id
,
None
)}
order
=
{
**
order
,
**
curriculum_res
.
get
(
prod_id
,
None
)}
temp_orders
.
append
(
order
)
temp_orders
.
append
(
order
)
temp_orders
=
temp_orders
[
offset
:
offset
+
pageSize
]
temp_orders
=
temp_orders
[
offset
:
offset
+
pageSize
]
allowed
=
{
'id'
,
'title'
,
'cover'
,
'info'
,
'ab_type'
,
'ab_payment'
,
'ab_pay_mode'
,
'ab_ordernum'
,
'transaction_serial_no'
,
'pay_method'
,
'createtime'
,
'pay_time'
,
'complete_time'
,
allowed
=
{
'id'
,
'title'
,
'cover'
,
'info'
,
'ab_type'
,
'ab_payment'
,
'ab_
score'
,
'ab_
pay_mode'
,
'ab_ordernum'
,
'transaction_serial_no'
,
'pay_method'
,
'createtime'
,
'pay_time'
,
'complete_time'
,
'ab_status'
}
'ab_status'
}
for
r
in
temp_orders
:
for
r
in
temp_orders
:
keys
=
set
(
r
.
keys
())
-
allowed
keys
=
set
(
r
.
keys
())
-
allowed
...
@@ -169,9 +169,10 @@ class CurriculumOrderService:
...
@@ -169,9 +169,10 @@ class CurriculumOrderService:
with
TAMP_SQL
(
tamp_user_engine
)
as
tamp_user
,
TAMP_SQL
(
tamp_pay_engine
)
as
tamp_pay
:
with
TAMP_SQL
(
tamp_user_engine
)
as
tamp_user
,
TAMP_SQL
(
tamp_pay_engine
)
as
tamp_pay
:
tamp_user_session
,
tamp_pay_session
=
tamp_user
.
session
,
tamp_pay
.
session
tamp_user_session
,
tamp_pay_session
=
tamp_user
.
session
,
tamp_pay
.
session
args
[
'ab_ordernum'
]
=
time
.
strftime
(
'
%
Y
%
m
%
d'
,
time
.
localtime
(
time
.
time
()))
+
str
(
int
(
time
.
time
()
*
100000
))
args
[
'ab_ordernum'
]
=
time
.
strftime
(
'
%
Y
%
m
%
d'
,
time
.
localtime
(
time
.
time
()))
+
str
(
int
(
time
.
time
()
*
100000
))
amount
=
tamp_user_session
.
query
(
CurriculumPrice
.
price
)
.
filter
(
CurriculumPrice
.
rel_id
==
args
[
'ab_proid'
])
.
first
()
[
0
]
amount
=
tamp_user_session
.
query
(
CurriculumPrice
.
price
)
.
filter
(
CurriculumPrice
.
rel_id
==
args
[
'ab_proid'
])
.
first
()
if
not
amount
:
if
not
amount
:
raise
CustomFlaskErr
(
Errors
.
PROD_NOPRICE
)
raise
CustomFlaskErr
(
Errors
.
PROD_NOPRICE
)
amount
=
amount
[
0
]
args
[
'id'
]
=
OrderFlow
.
__tablename__
+
str
(
int
(
time
.
time
()
*
100000
))
args
[
'id'
]
=
OrderFlow
.
__tablename__
+
str
(
int
(
time
.
time
()
*
100000
))
args
[
'ab_payment'
]
=
amount
args
[
'ab_payment'
]
=
amount
args
[
'ab_status'
]
=
'WAIT'
args
[
'ab_status'
]
=
'WAIT'
...
@@ -381,7 +382,7 @@ def getAllOrders(args):
...
@@ -381,7 +382,7 @@ def getAllOrders(args):
temp_orders
.
append
(
order
)
temp_orders
.
append
(
order
)
else
:
else
:
temp_orders
.
append
(
order
)
temp_orders
.
append
(
order
)
allowed
=
{
'id'
,
'title'
,
'cover'
,
'info'
,
'ab_type'
,
'ab_payment'
,
'ab_pay_mode'
,
'ab_ordernum'
,
allowed
=
{
'id'
,
'title'
,
'cover'
,
'info'
,
'ab_type'
,
'ab_payment'
,
'ab_
score'
,
'ab_
pay_mode'
,
'ab_ordernum'
,
'transaction_serial_no'
,
'pay_method'
,
'createtime'
,
'pay_time'
,
'complete_time'
,
'transaction_serial_no'
,
'pay_method'
,
'createtime'
,
'pay_time'
,
'complete_time'
,
'ab_status'
}
'ab_status'
}
for
r
in
temp_orders
:
for
r
in
temp_orders
:
...
...
logs/tamp_course_order.log
View file @
82e26e1a
This source diff could not be displayed because it is too large. You can
view the blob
instead.
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