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
d9785a10
Commit
d9785a10
authored
Feb 16, 2022
by
Aeolus
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update
parent
7e57fee7
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
17 deletions
+10
-17
myapps/pc_management/api/admin_portal.py
+1
-1
myapps/pc_management/api/business_portal.py
+3
-9
service/admin_service.py
+6
-7
No files found.
myapps/pc_management/api/admin_portal.py
View file @
d9785a10
...
...
@@ -141,7 +141,7 @@ def add_user():
db
.
session
.
add
(
account
)
db
.
session
.
commit
()
AdminService
.
add_or_edit_admin_business
(
account
,
[
business_id
,
]
)
AdminService
.
add_or_edit_admin_business
(
account
,
business_id
)
return
BaseResponse
()
...
...
myapps/pc_management/api/business_portal.py
View file @
d9785a10
...
...
@@ -198,7 +198,7 @@ def run_add_admin_account():
"""
json_data
=
request
.
get_json
()
business_id
=
json_data
[
"business_id"
]
phone
=
json_data
[
"phone
"
]
user_id
=
json_data
[
"user_id
"
]
rate
=
int
(
json_data
[
"rate"
])
admin
=
g
.
user
...
...
@@ -209,7 +209,7 @@ def run_add_admin_account():
if
not
result
:
return
jsonify
(
ADMIN_BUSINESS_NOT_EXIST
)
result
=
AdminService
.
get_admin_account_list
(
phone
=
phone
)
result
=
AdminService
.
get_admin_account_list
(
user_id
=
user_id
)
if
result
[
"total_count"
]
!=
1
:
return
BaseResponse
(
**
ACCOUNT_NOT_EXISTS_ERROR
)
user_info
=
json2obj
(
result
[
"list"
][
0
])
...
...
@@ -221,13 +221,7 @@ def run_add_admin_account():
if
(
total_rate
+
rate
)
>
100
:
return
jsonify
(
RATE_INVALID_ERROR
)
admin_business
=
AdminBusiness
()
admin_business
.
user_id
=
user_info
.
id
admin_business
.
user_no
=
user_info
.
user_no
admin_business
.
business_id
=
business_id
admin_business
.
rate
=
rate
db
.
session
.
add
(
admin_business
)
db
.
session
.
commit
()
AdminService
.
add_or_edit_admin_business
(
user_info
,
business_id
,
rate
)
return
BaseResponse
()
...
...
service/admin_service.py
View file @
d9785a10
...
...
@@ -39,20 +39,19 @@ class AdminService(object):
return
business_id_list
@staticmethod
def
add_or_edit_admin_business
(
admin_account
,
business_id
s
):
def
add_or_edit_admin_business
(
admin_account
,
business_id
,
rate
=
0
):
"""
:param business_ids:
:return:
"""
my_business_id_list
=
AdminService
.
get_business_id_list
()
right_busines_ids
=
list
(
set
(
business_ids
)
.
intersection
(
set
(
my_business_id_list
)))
insert_sql
=
" insert into admin_business (user_id, user_no, business_id) values "
for
i
in
right_busines_ids
:
insert_sql
+=
"('{}','{}','{}'),"
.
format
(
admin_account
.
id
,
admin_account
.
user_no
,
i
)
if
int
(
business_id
)
not
in
my_business_id_list
:
return
insert_sql
=
" insert into admin_business (user_id, user_no, business_id, rate) values "
insert_sql
+=
"('{}','{}','{}','{}'),"
.
format
(
admin_account
.
id
,
admin_account
.
user_no
,
business_id
,
rate
)
insert_sql
=
insert_sql
[:
-
1
]
insert_sql
+=
" ON DUPLICATE KEY UPDATE status = 1
"
insert_sql
+=
" ON DUPLICATE KEY UPDATE status = 1
, rate = '{}'"
.
format
(
rate
)
db
.
session
.
execute
(
insert_sql
)
db
.
session
.
commit
()
...
...
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