新增主播余额

app/api/account/crud.py

@@ -81,22 +81,22 @@ class HDUd():
     def get_account_list(self, name, page, size):
         """账户列表，查询"""
         if name:
-            count_sql = f"select count(id) as num from fi_account where name like '%{name}%' and unique_tag!='anchor_account' order by create_time"
+            count_sql = f"select count(id) as num from fi_account where name like '%{name}%' order by create_time"
             number = LinkMysql(env.DB_3YV2).query_mysql(count_sql)
             if number:
                 count = number[0].get("num")
             else:
                 count = 0
-            data_sql = f"select id,name,unique_tag,uuid,config_key,beneficiary,description,create_time, income, output from fi_account where name like '%{name}%' and unique_tag!='anchor_account' ORDER BY create_time LIMIT {(int(page) - 1) * size},{size}"
+            data_sql = f"select id,name,unique_tag,uuid,config_key,beneficiary,description,create_time, income, output from fi_account where name like '%{name}%'  ORDER BY create_time LIMIT {(int(page) - 1) * size},{size}"
             query_res = LinkMysql(env.DB_3YV2).query_mysql(data_sql)
         else:
-            count_sql = f"select count(id) as num from fi_account where unique_tag!='anchor_account'"
+            count_sql = f"select count(id) as num from fi_account"
             number = LinkMysql(env.DB_3YV2).query_mysql(count_sql)
             if number:
                 count = number[0].get("num")
             else:
                 count = 0
-            data_sql = f"select id,name,unique_tag,uuid,config_key,beneficiary,description,create_time, income, output from fi_account where unique_tag!='anchor_account' ORDER BY create_time LIMIT {(int(page) - 1) * size},{size}"
+            data_sql = f"select id,name,unique_tag,uuid,config_key,beneficiary,description,create_time, income, output from fi_account  ORDER BY create_time LIMIT {(int(page) - 1) * size},{size}"
             query_res = LinkMysql(env.DB_3YV2).query_mysql(data_sql)
         if not query_res:
             return [], 0
@@ -207,7 +207,7 @@ def get_finance_info(unique_tag, id, page, size, start_time, end_time, is_list=N
         finance_condition.append(f"create_time >= {time_str_to_timestamp(start_time + ' 00:00:00')} ")
     if end_time:
         finance_condition.append(f"create_time < {time_str_to_timestamp(end_time + ' 23:59:59')} ")
-    if unique_tag in ['guild_account', 'user_account', 'knapsack_account', 'pledgeDeduction']:
+    if unique_tag in ['guild_account', 'user_account', 'knapsack_account', 'pledgeDeduction', 'anchor_account']:
         if unique_tag == 'guild_account':
             if finance_condition:
                 count_sql = f"select create_time from v3_guild_account_statistics_copy where  {' and '.join(finance_condition)} GROUP BY create_time"
@@ -215,6 +215,13 @@ def get_finance_info(unique_tag, id, page, size, start_time, end_time, is_list=N
             else:
                 count_sql = f"select create_time from v3_guild_account_statistics_copy GROUP BY create_time"
                 data_sql = f"select id,initial_money as balance,income,outcome,create_time from v3_guild_account_statistics_copy GROUP BY create_time order by create_time DESC limit {(int(page) - 1) * size},{size}"
+        if unique_tag == 'anchor_account':
+            if finance_condition:
+                count_sql = f"select date as create_time from v3_user_account_statistics where  {' and '.join(finance_condition)} GROUP BY date"
+                data_sql = f"select id,initial_money as balance,income,outcome,date as create_time from v3_user_account_statistics where  {' and '.join(finance_condition)} GROUP BY date order by date limit {(int(page) - 1) * size},{size}"
+            else:
+                count_sql = f"select date as create_time from v3_user_account_statistics GROUP BY date"
+                data_sql = f"select id,initial_money as balance,income,pay as outcome,date as create_time from v3_user_account_statistics GROUP BY date order by date limit {(int(page) - 1) * size},{size}"
         if unique_tag == 'user_account':
             if finance_condition:
                 condition = [i.replace('create_time', 'calculation_time') for i in finance_condition]