Commit d9785a10 by Aeolus

update

parent 7e57fee7
...@@ -141,7 +141,7 @@ def add_user(): ...@@ -141,7 +141,7 @@ def add_user():
db.session.add(account) db.session.add(account)
db.session.commit() db.session.commit()
AdminService.add_or_edit_admin_business(account, [business_id, ]) AdminService.add_or_edit_admin_business(account, business_id)
return BaseResponse() return BaseResponse()
......
...@@ -198,7 +198,7 @@ def run_add_admin_account(): ...@@ -198,7 +198,7 @@ def run_add_admin_account():
""" """
json_data = request.get_json() json_data = request.get_json()
business_id = json_data["business_id"] business_id = json_data["business_id"]
phone = json_data["phone"] user_id = json_data["user_id"]
rate = int(json_data["rate"]) rate = int(json_data["rate"])
admin = g.user admin = g.user
...@@ -209,7 +209,7 @@ def run_add_admin_account(): ...@@ -209,7 +209,7 @@ def run_add_admin_account():
if not result: if not result:
return jsonify(ADMIN_BUSINESS_NOT_EXIST) 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: 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])
...@@ -221,13 +221,7 @@ def run_add_admin_account(): ...@@ -221,13 +221,7 @@ def run_add_admin_account():
if (total_rate + rate) > 100: if (total_rate + rate) > 100:
return jsonify(RATE_INVALID_ERROR) return jsonify(RATE_INVALID_ERROR)
admin_business = AdminBusiness() AdminService.add_or_edit_admin_business(user_info, business_id, rate)
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()
return BaseResponse() return BaseResponse()
......
...@@ -39,20 +39,19 @@ class AdminService(object): ...@@ -39,20 +39,19 @@ class AdminService(object):
return business_id_list return business_id_list
@staticmethod @staticmethod
def add_or_edit_admin_business(admin_account, business_ids): def add_or_edit_admin_business(admin_account, business_id, rate=0):
""" """
:param business_ids: :param business_ids:
:return: :return:
""" """
my_business_id_list = AdminService.get_business_id_list() my_business_id_list = AdminService.get_business_id_list()
right_busines_ids = list(set(business_ids).intersection(set(my_business_id_list))) if int(business_id) not in my_business_id_list:
return
insert_sql = " insert into admin_business (user_id, user_no, business_id) values " insert_sql = " insert into admin_business (user_id, user_no, business_id, rate) values "
for i in right_busines_ids: insert_sql += "('{}','{}','{}','{}'),".format(admin_account.id, admin_account.user_no, business_id, rate)
insert_sql += "('{}','{}','{}'),".format(admin_account.id, admin_account.user_no, i)
insert_sql = insert_sql[:-1] 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.execute(insert_sql)
db.session.commit() db.session.commit()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment