账户增加用户，背包，公会第四层查询

app/api/account/crud.py

@@ -355,3 +355,53 @@ class AccountStatistics(object):
             return res, total, float(amount_total)
         else:
             return res
+
+
+class SpecificAccountQuery(object):
+    """账户用户，背包，公会第四层查询"""
+    def __init__(self, page, size, uuid, start_time, end_time, type, reference_type):
+        self.page = page
+        self.size = size
+        self.uuid = uuid
+        self.start_time = start_time
+        self.end_time = end_time
+        self.type = type
+        self.reference_type = reference_type
+        self.total_list = []
+
+    def condition_query(self, date, cond_list):
+
+        sql = f"select uuid,type,cast(amount as decimal(20,6))/1000 as amount,reference_type,create_time,amount_type from {date} WHERE {' and '.join(cond_list)} ORDER BY create_time DESC"
+        result = LinkMysql(env.DB_HISTORY).query_mysql(sql)
+        return result
+
+    def business_logic(self):
+        condition = []
+        condition.append(f" uuid='{self.uuid}'")
+        condition.append(f" create_time >= {time_str_to_timestamp(self.start_time + ' 00:00:00')}")
+        end_time = time_str_to_timestamp(self.end_time + ' 00:00:00') + 86400  # 结束时间那天包含在内，固小于第二天凌晨
+        condition.append(f" create_time < {end_time}")
+        month, last_month, before_last_month = get_last_month()
+        with ThreadPoolExecutor(max_workers=3) as pool:
+            future1 = pool.submit(self.condition_query, 'assets_log_' + month, condition)
+            future2 = pool.submit(self.condition_query, 'assets_log_' + last_month, condition)
+            future3 = pool.submit(self.condition_query, 'assets_log_' + before_last_month, condition)
+        month_data = future1.result()
+        last_data = future2.result()
+        before_last_data = future3.result()
+        if month_data:
+            self.total_list = self.total_list + month_data if month_data[0]['uuid'] else self.total_list
+        if last_data:
+            self.total_list = self.total_list + last_data if last_data[0]['uuid'] else self.total_list
+        if before_last_data:
+            self.total_list = self.total_list + before_last_data if before_last_data[0]['uuid'] else self.total_list
+        total = len(self.total_list)
+        res = self.total_list[int(self.page - 1) * self.size: self.page * self.size]
+        if not res:
+            return [], 0, 0
+        for i in res:
+            i['reference_name'] = TYPE_NAME[i['reference_type']] if TYPE_NAME.get(i['reference_type']) else i[
+                'reference_type']
+        data_pd = pd.DataFrame(self.total_list)
+        amount_total = data_pd['amount'].sum()
+        return res, total, float(amount_total)

app/api/account/views.py

@@ -3,7 +3,7 @@ from fastapi import Depends, APIRouter, Request, Query
 from sqlalchemy.orm import Session
 from app import get_db
 from app.api.account import schemas, crud
-from app.api.account.crud import AccountStatistics
+from app.api.account.crud import AccountStatistics, SpecificAccountQuery
 from app.api.statement import crud as statement_crud
 from libs.result_format import HttpResultResponse, HttpMessage
 from libs.token_verify import login_required
@@ -106,12 +106,14 @@ def finance_fourth_info(page: int,
                         start_time: Optional[str] = "",
                         end_time: Optional[str] = "",
                         type: Optional[int] = None,
-                        amount_type: Optional[str] = "",
+                        reference_type: Optional[str] = "",
                         token=Depends(login_required)):
-    """账户财务明细第四层"""
-    # res, total, count = AccountStatistics.get_finance_details(page, size, uuid, start_time, end_time, type,
-    #                                                           amount_type, l)
-    # return HttpResultResponse(total=total, data=res, count=count)
+    """账户财务明细  第四层"""
+    if not all([uuid, start_time, end_time]):
+        return HttpResultResponse(code=500, msg="缺少必传参数")
+    res, total, count = SpecificAccountQuery(page, size, uuid, start_time, end_time, type,
+                                             reference_type).business_logic()
+    return HttpResultResponse(total=total, data=res, count=count)
 
 
 @router.get("/type")

app/api/statement/views.py

@@ -242,7 +242,6 @@ def menu_delte(id: Optional[int] = '',db: Session = Depends(get_db),page: Option
     return HttpResultResponse(code=200, msg=HttpMessage.SUCCESS)
 
 
-
 @router.get("/menu/config")
 def menu_list(db: Session = Depends(get_db),menu_type: Optional[int] = ""):
     """菜单配置下拉"""