update

config/app_config.py

@@ -24,6 +24,7 @@ class Config:
     JWT_SECRET = SECRET_KEY
     JWT_SECRET = SECRET_KEY
     TENCENT_REDIS_URL = os.getenv("TENCENT_REDIS_URL")
     TENCENT_REDIS_URL = os.getenv("TENCENT_REDIS_URL")
     MAX_CONTENT_LENGTH = 16 * 1024 * 1024
     MAX_CONTENT_LENGTH = 16 * 1024 * 1024
+    # SQLALCHEMY_ECHO = True
 
 
     @staticmethod
     @staticmethod
     def init_app(app):
     def init_app(app):

models/models.py

@@ -200,6 +200,7 @@ class Machine(Base):
     updated_at = Column(TIMESTAMP, nullable=False, server_default=text("CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP"))
     updated_at = Column(TIMESTAMP, nullable=False, server_default=text("CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP"))
     command_time = Column(INTEGER(1), nullable=False, server_default=text("'1'"))
     command_time = Column(INTEGER(1), nullable=False, server_default=text("'1'"))
     discounts_id = Column(INTEGER(11), nullable=False, server_default=text("'0'"), comment="折扣活动")
     discounts_id = Column(INTEGER(11), nullable=False, server_default=text("'0'"), comment="折扣活动")
+    business_id = Column(INTEGER(11), nullable=False, server_default=text("'0'"), comment="商户号")
 
 
 
 
 class MachineProduction(Base):
 class MachineProduction(Base):

myapps/pc_management/api/admin_portal.py

@@ -183,6 +183,13 @@ def get_account_detail():
         "comment": admin_info.comment
         "comment": admin_info.comment
     }
     }
 
 
+    business_list = db.session.query(Business).join(AdminBusiness, Business.id == AdminBusiness.business_id,
+                                                    ).filter(Business.status == 1,
+                                                             AdminBusiness.user_id == admin_info.id,
+                                                             AdminBusiness.status == 1).all()
+    user_info["business_list"] = []
+    for i in business_list:
+        user_info["business_list"].append({"business_id": i.id, "business_name": i.business_name})
     return BaseResponse(data=user_info)
     return BaseResponse(data=user_info)
 
 
 
 

myapps/pc_management/api/machine_portal.py

@@ -14,8 +14,8 @@ from flask import Blueprint, g, request, jsonify
 
 
 from config.commen_config import DISCOUNTS_TYPES
 from config.commen_config import DISCOUNTS_TYPES
 from models.base_model import db
 from models.base_model import db
-from models.models import AdminMachine, Machine, AdminAccount
-from utils.error_code import MACHINE_NOT_EXIST_ERROR, ACCOUNT_NOT_EXISTS_ERROR
+from models.models import AdminMachine, Machine, AdminAccount, AdminBusiness
+from utils.error_code import MACHINE_NOT_EXIST_ERROR, ACCOUNT_NOT_EXISTS_ERROR, ADMIN_BUSINESS_NOT_EXIST
 from utils.my_response import BaseResponse
 from utils.my_response import BaseResponse
 
 
 logger = logging.getLogger(__name__)
 logger = logging.getLogger(__name__)
@@ -197,8 +197,7 @@ def get_machine_detail():
                               "mac": info.mac, "power": info.power, "hatch_number": info.hatch_number,
                               "mac": info.mac, "power": info.power, "hatch_number": info.hatch_number,
                               "type": info.type, "status": info.status, "place_id": info.place_id,
                               "type": info.type, "status": info.status, "place_id": info.place_id,
                               "discounts_id": info.discounts_id,
                               "discounts_id": info.discounts_id,
-                              "discounts_name": DISCOUNTS_TYPES.get(int(info.discounts_id), "无此优惠"),
-
+                              "discounts_name": DISCOUNTS_TYPES.get(int(info.discounts_id), "无此优惠")
                               })
                               })
 
 
 
 
@@ -211,26 +210,30 @@ def run_distribute_machine():
     json_data = request.get_json()
     json_data = request.get_json()
     machine_nos = json_data["machine_nos"]
     machine_nos = json_data["machine_nos"]
     user_id = json_data["user_id"]
     user_id = json_data["user_id"]
+    business_id = json_data["business_id"]
 
 
     user = AdminAccount.query.filter_by(id=user_id, parent_id=g.user.id, status=1).first()
     user = AdminAccount.query.filter_by(id=user_id, parent_id=g.user.id, status=1).first()
     if not user:
     if not user:
         return jsonify(ACCOUNT_NOT_EXISTS_ERROR)
         return jsonify(ACCOUNT_NOT_EXISTS_ERROR)
 
 
-    admin_machines = AdminMachine.query.filter_by(user_id=g.user.id, status=1).all()
-    if not admin_machines:
-        return jsonify(MACHINE_NOT_EXIST_ERROR)
-
-    admin_machine_nos = [x.machine_no for x in admin_machines]
-
-    right_machine_nos = list(set(machine_nos).intersection(set(admin_machine_nos)))
-    if not right_machine_nos:
-        return jsonify(MACHINE_NOT_EXIST_ERROR)
-    insert_sql = " insert into admin_machine (user_id, user_no, machine_no) values "
-    for i in right_machine_nos:
-        insert_sql += "('{}','{}','{}'),".format(user.id, user.user_no, i)
-    insert_sql = insert_sql[:-1]
-    insert_sql += "  ON DUPLICATE KEY UPDATE status = 1"
-    print(insert_sql)
-    db.session.execute(insert_sql)
-    db.session.commit()
-    return BaseResponse(data={"add_machine_nos": right_machine_nos})
+    admin_business = AdminBusiness.query.filter_by(user_id=g.user.id, business_id=business_id, status=1).first()
+    if not admin_business:
+        return jsonify(ADMIN_BUSINESS_NOT_EXIST)
+
+    for i in machine_nos:
+        admin_machines = AdminMachine.query.filter_by(user_id=g.user.id, machine_no=i, status=1).first()
+        if not admin_machines:
+            continue
+        machine = Machine.query.filter_by(machine_no=i).first()
+        if not machine:
+            continue
+        insert_sql = " insert into admin_machine (user_id, user_no, machine_no) values "
+        for i in machine_nos:
+            insert_sql += "('{}','{}','{}'),".format(user.id, user.user_no, i)
+        insert_sql = insert_sql[:-1]
+        insert_sql += "  ON DUPLICATE KEY UPDATE status = 1"
+        db.session.execute(insert_sql)
+        machine.business_id = business_id
+        db.session.commit()
+
+    return BaseResponse(data={"add_machine_nos": machine_nos})