优化用户账户

app/api/account/crud.py

@@ -201,6 +201,8 @@ def get_finance_group_by(date, condition):
 
 def special_data_handle(old_data, special_data):
     """处理可消费，可提现数据"""
+    if not special_data:
+        return old_data
     bk = pd.DataFrame(special_data)
     for old in old_data:
         df = bk[(bk["create_time"] == old['create_time']) & (bk["amount_type"] == 2)]  # 可消费
@@ -246,11 +248,12 @@ def get_finance_info(unique_tag, id, page, size, start_time, end_time, is_list=N
                 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,balance as consumable,pearl as can_withdraw from v3_user_account_statistics GROUP BY date order by date limit {(int(page) - 1) * size},{size}"
         if unique_tag == 'user_account':
-            finance_condition.append('amount_type=1')
+            finance_condition.append('type=1')
             condition = [i.replace('create_time', 'calculation_time') for i in finance_condition]
-            count_sql = f"select calculation_time from finance_data_calculation_sum_copy where type=1 and {' and '.join(condition)} GROUP BY calculation_time"
-            data_sql = f"select id,initial_money as balance,income,outcome,calculation_time as create_time from finance_data_calculation_sum_copy where type=1 and {' and '.join(condition)} GROUP BY calculation_time order by calculation_time DESC limit {(int(page) - 1) * size},{size}"
-            other_sql = "select initial_money as balance,income,outcome,calculation_time as create_time,amount_type from finance_data_calculation_sum_copy where amount_type != 1"
+            other_sql = f"select initial_money as balance,income,outcome,calculation_time as create_time,amount_type from finance_data_calculation_sum_copy where {' and '.join(condition)} and amount_type != 1"
+            condition.append('amount_type=1')
+            count_sql = f"select calculation_time from finance_data_calculation_sum_copy where {' and '.join(condition)} GROUP BY calculation_time"
+            data_sql = f"select id,initial_money as balance,income,outcome,calculation_time as create_time from finance_data_calculation_sum_copy where  {' and '.join(condition)} GROUP BY calculation_time order by calculation_time DESC limit {(int(page) - 1) * size},{size}"
         if unique_tag == 'knapsack_account':
             finance_condition.append('amount_type=1')
             condition = [i.replace('create_time', 'calculation_time') for i in finance_condition]