优化uuid 个人公会查询

app/api/statement/guild.py

@@ -202,16 +202,25 @@ def accout_list_data(**params):
 def query_uuid_or_user_number(param):
     """查询uuid和user_number"""
     if param.uuid:
-        user_sql = f"select user_id,nick_name,uuid from v2_user where uuid='{param.uuid}' limit 0,1"
-        user = LinkMysql(env.DB_3YV2).query_mysql(user_sql)
-        if not user:
+        if param.type == 1:  # 公会查询
             guild_sql = f"select id,guild_name,uuid from guild where uuid='{param.uuid}' limit 0,1"
             guild = LinkMysql(env.DB_3YV2).query_mysql(guild_sql)
-            if not guild:
-                return {}
-            return {"nick_name": "(公会)" + guild[0]['guild_name'], "uuid": guild[0]['uuid'], "is_guild": 1,
-                    "id": guild[0]['id']}
-        return {"nick_name": user[0]['nick_name'], "uuid": user[0]['uuid'], "is_guild": 0, "id": user[0]['user_id']}
+            return {"nick_name": "(公会)" + guild[0]['guild_name'], "uuid": guild[0]['uuid'], "is_guild": 1, "id": guild[0]['id']} if guild else {}
+        elif param.type == 2:  # 用户查询
+            user_sql = f"select user_id,nick_name,uuid from v2_user where uuid='{param.uuid}' limit 0,1"
+            user = LinkMysql(env.DB_3YV2).query_mysql(user_sql)
+            return {"nick_name": user[0]['nick_name'], "uuid": user[0]['uuid'], "is_guild": 0, "id": user[0]['user_id']} if user else {}
+        else:
+            user_sql = f"select user_id,nick_name,uuid from v2_user where uuid='{param.uuid}' limit 0,1"
+            guild_sql = f"select id,guild_name,uuid from guild where uuid='{param.uuid}' limit 0,1"
+            with ThreadPoolExecutor(max_workers=2) as pool:
+                future1 = pool.submit(LinkMysql(env.DB_3YV2).query_mysql, user_sql)
+                future2 = pool.submit(LinkMysql(env.DB_3YV2).query_mysql, guild_sql)
+            user = future1.result()
+            guild = future2.result()
+            if not user:
+                return {"nick_name": "(公会)" + guild[0]['guild_name'], "uuid": guild[0]['uuid'], "is_guild": 1,"id": guild[0]['id']}
+            return {"nick_name": user[0]['nick_name'], "uuid": user[0]['uuid'], "is_guild": 0, "id": user[0]['user_id']}
     if param.user_number:
         account_sql = f"select id,name,uuid,unique_tag from fi_account where uuid='{param.uuid}' limit 0,1"
         account = LinkMysql(env.DB_3YV2).query_mysql(account_sql)

app/api/statement/schemas.py

@@ -105,6 +105,7 @@ class UserNumber(BaseModel):
     id: Optional[int] = None
     uuid: Optional[str] = ""
     user_number: Optional[int] = None
+    type: Optional[int] = None
 
 
 class CreateBill(BaseModel):

app/api/statement/views.py

@@ -114,6 +114,8 @@ def query_account_money(uuid: str, token=Depends(login_required)):
 def query_uuid_account(data: UserNumber, token=Depends(login_required)):
     """uuid user_number查询"""
     user_info = query_uuid_or_user_number(data)
+    if not user_info:
+        return HttpResultResponse(code=500, msg='没有查到数据')
     return HttpResultResponse(data=user_info)