Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
Automat
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
冯佳佳
Automat
Commits
ce3f2625
Commit
ce3f2625
authored
Feb 16, 2022
by
Aeolus
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update
parent
d9785a10
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
59 additions
and
72 deletions
+59
-72
myapps/pc_management/api/business_portal.py
+59
-72
utils/error_code.py
+0
-0
No files found.
myapps/pc_management/api/business_portal.py
View file @
ce3f2625
...
@@ -152,54 +152,53 @@ def get_business_account_list():
...
@@ -152,54 +152,53 @@ def get_business_account_list():
select_sql
=
"""select admin_account.id, admin_account.user_no,admin_account.user_name, admin_account.phone,
select_sql
=
"""select admin_account.id, admin_account.user_no,admin_account.user_name, admin_account.phone,
admin_account.level, admin_business.rate """
admin_account.level, admin_business.rate """
count_sql
=
"select count(admin_account.id) as total_count"
count_sql
=
"select count(admin_account.id) as total_count"
from_sql
=
""" from admin_account left join admin_business on admin_account.id = admin_business.user_id """
from_sql
=
""" from admin_account left join admin_business on admin_account.id = admin_business.user_id """
where_sql
=
""" where admin_business.business_id = '{}' and admin_business.status = '1'
where_sql
=
""" where admin_business.business_id = {} and admin_business.status = 1
and admin_account.level >= '{}'
and admin_account.status = 1
"""
.
format
(
business_id
,
admin
.
level
)
"""
.
format
(
business_id
)
if
keyword
:
if
keyword
:
where_sql
+=
""" and CONCAT(admin_account.user_name, admin_account.phone) LIKE '
%
{keyword}
%
'
where_sql
+=
""" and CONCAT(admin_account.user_name, admin_account.phone) LIKE '
%
{keyword}
%
'
"""
.
format
(
keyword
=
keyword
)
"""
.
format
(
keyword
=
keyword
)
order_sql
=
" ORDER BY admin_account.id ASC"
order_sql
=
" ORDER BY admin_account.id ASC"
limit_sql
=
" LIMIT {offset} , {page_size} "
.
format
(
offset
=
(
page
-
1
)
*
page_size
,
page_size
=
page_size
)
limit_sql
=
" LIMIT {offset} , {page_size} "
.
format
(
offset
=
(
page
-
1
)
*
page_size
,
page_size
=
page_size
)
count_result
=
db
.
session
.
execute
(
count_sql
+
from_sql
+
where_sql
)
.
fetchone
()
count_result
=
db
.
session
.
execute
(
count_sql
+
from_sql
+
where_sql
)
.
fetchone
()
if
not
count_result
:
if
not
count_result
:
return
BaseResponse
(
data
=
{
"list"
:
[],
"page"
:
page
,
"pageSize"
:
page_size
,
"total_count"
:
0
})
return
BaseResponse
(
data
=
{
"list"
:
[],
"page"
:
page
,
"pageSize"
:
page_size
,
"total_count"
:
0
})
else
:
else
:
total_count
=
count_result
.
total_count
total_count
=
count_result
.
total_count
result
=
db
.
session
.
execute
(
select_sql
+
from_sql
+
where_sql
+
order_sql
+
limit_sql
)
.
fetchall
()
result
=
db
.
session
.
execute
(
select_sql
+
from_sql
+
where_sql
+
order_sql
+
limit_sql
)
.
fetchall
()
return_data
=
[]
return_data
=
[]
# super_admin = {"user_name": "咻咻公司", "user_id": 0, "user_no": "0",
# "phone": "0", "level": 1, "rate": 0}
for
info
in
result
:
for
info
in
result
:
# if info.level == 1 or info.level == 4:
# super_admin["rate"] += info.rate
# else:
return_data
.
append
({
"user_name"
:
info
.
user_name
,
"user_id"
:
info
.
id
,
"user_no"
:
info
.
user_no
,
return_data
.
append
({
"user_name"
:
info
.
user_name
,
"user_id"
:
info
.
id
,
"user_no"
:
info
.
user_no
,
"phone"
:
info
.
phone
,
"level"
:
info
.
level
,
"rate"
:
info
.
rate
"phone"
:
info
.
phone
,
"level"
:
info
.
level
,
"rate"
:
info
.
rate
})
})
# return_data.append(super_admin)
super_sql
=
""" where admin_business.business_id = '{}' and admin_business.status = '1'
return
BaseResponse
({
"list"
:
return_data
,
"page"
:
page
,
"pageSize"
:
page_size
,
"total_count"
:
total_count
})
and admin_account.status = '1' and admin_account.level < '{}'
"""
.
format
(
business_id
,
admin
.
level
)
super_result
=
db
.
session
.
execute
(
select_sql
+
from_sql
+
super_sql
)
.
fetchall
()
super_data
=
[{
"user_name"
:
"咻咻科技"
,
"user_id"
:
0
,
"user_no"
:
'0'
,
"phone"
:
"0"
,
"level"
:
1
,
"rate"
:
0
}]
for
info
in
super_result
:
if
info
.
level
in
(
1
,
3
):
super_data
[
0
][
"rate"
]
+=
info
.
rate
else
:
super_data
.
append
({
"user_name"
:
info
.
user_name
,
"user_id"
:
info
.
id
,
"user_no"
:
info
.
user_no
,
"phone"
:
info
.
phone
,
"level"
:
info
.
level
,
"rate"
:
info
.
rate
})
return
BaseResponse
({
"super_list"
:
super_data
,
"list"
:
return_data
,
"page"
:
page
,
"pageSize"
:
page_size
,
"total_count"
:
total_count
})
@business_route.route
(
"
add
_admin_account"
,
methods
=
[
"POST"
])
@business_route.route
(
"
edit
_admin_account"
,
methods
=
[
"POST"
])
def
run_
add
_admin_account
():
def
run_
edit
_admin_account
():
"""
"""
:return:
:return:
"""
"""
json_data
=
request
.
get_json
()
json_data
=
request
.
get_json
()
business_id
=
json_data
[
"business_id"
]
business_id
=
json_data
[
"business_id"
]
user_id
=
json_data
[
"user_id"
]
user_data
=
json_data
[
"user_data"
]
rate
=
int
(
json_data
[
"rate"
])
admin
=
g
.
user
admin
=
g
.
user
if
admin
.
level
not
in
(
1
,
2
,
4
,
5
):
if
admin
.
level
not
in
(
1
,
2
,
4
,
5
):
...
@@ -209,63 +208,51 @@ def run_add_admin_account():
...
@@ -209,63 +208,51 @@ def run_add_admin_account():
if
not
result
:
if
not
result
:
return
jsonify
(
ADMIN_BUSINESS_NOT_EXIST
)
return
jsonify
(
ADMIN_BUSINESS_NOT_EXIST
)
select_sql
=
"""select sum(rate) as total_rate """
from_sql
=
""" from admin_account left join admin_business on admin_account.id = admin_business.user_id """
super_sql
=
""" where admin_business.business_id = '{}' and admin_business.status = '1'
and admin_account.level < '{}'
"""
.
format
(
business_id
,
admin
.
level
)
super_rate
=
db
.
session
.
execute
(
select_sql
+
from_sql
+
super_sql
)
.
fetchone
()[
"total_rate"
]
total_rate
=
100
-
super_rate
for
i
in
user_data
:
rate
=
int
(
i
[
"rate"
])
total_rate
=
total_rate
-
rate
if
total_rate
<
0
:
return
jsonify
(
RATE_INVALID_ERROR
)
select_sql
=
"""select admin_account.id as user_id"""
from_sql
=
""" from admin_account left join admin_business on admin_account.id = admin_business.user_id """
where_sql
=
""" where admin_business.business_id = '{}' and admin_business.status = '1'
and admin_account.level >= '{}'
"""
.
format
(
business_id
,
admin
.
level
)
user_id_list
=
[
x
[
"user_id"
]
for
x
in
(
db
.
session
.
execute
(
select_sql
+
from_sql
+
where_sql
)
.
fetchall
())]
AdminBusiness
.
query
.
filter
(
AdminBusiness
.
business_id
==
business_id
,
AdminBusiness
.
user_id
.
in_
(
user_id_list
))
.
update
({
"status"
:
-
1
})
for
i
in
user_data
:
user_id
=
i
[
"user_id"
]
rate
=
int
(
i
[
"rate"
])
if
user_id
==
admin
.
id
:
user_info
=
admin
else
:
result
=
AdminService
.
get_admin_account_list
(
user_id
=
user_id
)
result
=
AdminService
.
get_admin_account_list
(
user_id
=
user_id
)
if
result
[
"total_count"
]
!=
1
:
if
result
[
"total_count"
]
!=
1
:
return
BaseResponse
(
**
ACCOUNT_NOT_EXISTS_ERROR
)
return
BaseResponse
(
**
ACCOUNT_NOT_EXISTS_ERROR
)
user_info
=
json2obj
(
result
[
"list"
][
0
])
user_info
=
json2obj
(
result
[
"list"
][
0
])
result
=
AdminBusiness
.
query
.
filter_by
(
business_id
=
business_id
,
status
=
1
)
.
all
()
total_rate
=
0
for
i
in
result
:
total_rate
+=
i
.
rate
if
(
total_rate
+
rate
)
>
100
:
return
jsonify
(
RATE_INVALID_ERROR
)
AdminService
.
add_or_edit_admin_business
(
user_info
,
business_id
,
rate
)
return
BaseResponse
()
@business_route.route
(
"edit_admin_account"
,
methods
=
[
"POST"
])
def
run_edit_admin_account
():
"""
:return:
"""
json_data
=
request
.
get_json
()
business_id
=
json_data
[
"business_id"
]
user_id
=
json_data
[
"user_id"
]
rate
=
json_data
.
get
(
"rate"
,
None
)
status
=
json_data
.
get
(
"status"
,
None
)
admin
=
g
.
user
if
admin
.
level
not
in
(
1
,
2
,
4
,
5
):
return
jsonify
(
OPERATE_LEVEL_ERROR
)
if
admin
.
level
!=
1
:
result
=
AdminBusiness
.
query
.
filter_by
(
business_id
=
business_id
,
user_id
=
admin
.
id
,
status
=
1
)
.
first
()
if
not
result
:
return
jsonify
(
OPERATE_LEVEL_ERROR
)
user_info
=
AdminAccount
.
query
.
filter_by
(
id
=
user_id
)
.
first
()
if
not
user_info
:
return
jsonify
(
ACCOUNT_NOT_EXISTS_ERROR
)
if
user_info
.
level
<=
admin
.
level
:
return
jsonify
(
OPERATE_LEVEL_ERROR
)
admin_business
=
AdminBusiness
.
query
.
filter_by
(
business_id
=
business_id
,
user_id
=
user_id
)
.
first
()
admin_business
=
AdminBusiness
.
query
.
filter_by
(
business_id
=
business_id
,
user_id
=
user_id
)
.
first
()
if
not
admin_business
:
if
admin_business
:
return
jsonify
(
ADMIN_BUSINESS_NOT_EXIST
)
if
rate
:
result
=
AdminBusiness
.
query
.
filter_by
(
business_id
=
business_id
,
status
=
1
)
.
all
()
total_rate
=
0
for
i
in
result
:
if
i
.
user_id
!=
int
(
user_id
):
total_rate
+=
i
.
rate
if
(
total_rate
+
int
(
rate
))
>
100
:
return
jsonify
(
RATE_INVALID_ERROR
)
admin_business
.
rate
=
rate
admin_business
.
rate
=
rate
admin_business
.
status
=
1
if
status
:
else
:
admin_business
.
status
=
int
(
status
)
admin_business
=
AdminBusiness
()
admin_business
.
user_id
=
user_id
admin_business
.
user_no
=
user_info
.
user_no
admin_business
.
business_id
=
business_id
admin_business
.
rate
=
rate
admin_business
.
status
=
1
db
.
session
.
add
(
admin_business
)
db
.
session
.
add
(
admin_business
)
db
.
session
.
commit
()
db
.
session
.
commit
()
return
BaseResponse
()
return
BaseResponse
()
utils/error_code.py
View file @
ce3f2625
This diff is collapsed.
Click to expand it.
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