优化账户消费类型显示2

app/api/account/crud.py

@@ -118,26 +118,37 @@ class HDUd():
 
 def get_gift_type(unique_tag):
     """礼物类型"""
-    fi_income_id = []
-    fi_out_id = []
-    fi_sql = f"select income,output from fi_account where unique_tag='{unique_tag}'"
-    gift_sql = "select id,keyName,keyValue,type from fi_account_type"
-    with ThreadPoolExecutor(max_workers=2) as pool:
-        future1 = pool.submit(LinkMysql(env.DB_3YV2).query_mysql, fi_sql)
-        future2 = pool.submit(LinkMysql(env.DB_3YV2).query_mysql, gift_sql)
-    account = future1.result()
-    output = future2.result()
-    if account[0].get('output'):
-        fi_out_id = [int(i) for i in account[0].get('output').split(',')]
-    if account[0].get('income'):
-        fi_income_id = [int(i) for i in account[0].get('income').split(',')]
-    out_list = []
-    income_list = []
-    for info in output:
-        if info.get("type") == 1 and info.get("id") in fi_income_id:
-            income_list.append(info)
-        if info.get("type") == 0 and info.get("id") in fi_out_id:
-            out_list.append(info)
+    if unique_tag:
+        fi_income_id = []
+        fi_out_id = []
+        fi_sql = f"select income,output from fi_account where unique_tag='{unique_tag}'"
+        gift_sql = "select id,keyName,keyValue,type from fi_account_type"
+        with ThreadPoolExecutor(max_workers=2) as pool:
+            future1 = pool.submit(LinkMysql(env.DB_3YV2).query_mysql, fi_sql)
+            future2 = pool.submit(LinkMysql(env.DB_3YV2).query_mysql, gift_sql)
+        account = future1.result()
+        output = future2.result()
+        if account[0].get('output'):
+            fi_out_id = [int(i) for i in account[0].get('output').split(',')]
+        if account[0].get('income'):
+            fi_income_id = [int(i) for i in account[0].get('income').split(',')]
+        out_list = []
+        income_list = []
+        for info in output:
+            if info.get("type") == 1 and info.get("id") in fi_income_id:
+                income_list.append(info)
+            if info.get("type") == 0 and info.get("id") in fi_out_id:
+                out_list.append(info)
+    else:
+        out_list = []
+        income_list = []
+        gift_sql = "select id,keyName,keyValue,type from fi_account_type"
+        output = LinkMysql(env.DB_3YV2).query_mysql(gift_sql)
+        for info in output:
+            if info.get("type") == 1:
+                income_list.append(info)
+            else:
+                out_list.append(info)
     return {"income": income_list, "output": out_list}