第二版提交优化

.idea/financial-system.iml

@@ -6,7 +6,7 @@
       <excludeFolder url="file://$MODULE_DIR$/fs-env" />
       <excludeFolder url="file://$MODULE_DIR$/venv" />
     </content>
-    <orderEntry type="jdk" jdkName="Python 3.8 (financial_system)" jdkType="Python SDK" />
+    <orderEntry type="jdk" jdkName="Python 3.8 (financial-system)" jdkType="Python SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
   <component name="PyDocumentationSettings">

app/api/account/views.py

 from typing import Optional
-
 from fastapi import Depends, APIRouter, Request, Query
 from sqlalchemy.orm import Session
 from app import get_db
@@ -64,7 +63,7 @@ def finance_info_excel(data: schemas.FinanceInfo, request: Request,
                        token=Depends(login_required), db: Session = Depends(get_db)):
     """账户财务信息导出"""
     headers = request.get("headers")
-    statement_list = crud.get_finance_info(data)
+    statement_list = crud.get_finance_info(data.unique_tag, data.page, data.size, data.start_time, data.end_time)
     return statement_crud.data_to_file(db, statement_list, "财务信息", headers)
 
 
@@ -87,7 +86,7 @@ def finance_info_excel(data: schemas.FinanceDetails, request: Request,
                        token=Depends(login_required), db: Session = Depends(get_db)):
     """账户财务详情导出"""
     headers = request.get("headers")
-    statement_list = crud.get_finance_details(db, data)
+    statement_list = crud.get_finance_details(data.page, data.size, data.uuid, data.start_time, data.end_time, data.type, data.gift_type)
     return statement_crud.data_to_file(db, statement_list, "财务明细", headers)
 
 

app/api/statement/views.py

@@ -11,12 +11,10 @@ from app.api.statement.crud import RechargeStatement, WithdrawStatement
 from app.api.statement.guild import GuildSet, paymentset_guild_data, outon_account_data, accout_list_data, \
     query_uuid_or_user_number, account_money, transfer_money, transfer_query
 from app.api.statement.schemas import PaymentWithdrawalList, PaymentAdd, PaymentAccountlList, UserNumber, CreateBill
-from core.config.env import env
-from libs.functions import search
 from libs.img_code import new_upload_file, random_number
 from libs.result_format import HttpResultResponse
 from libs.token_verify import login_required
-from models.recharge import Paymentlog, Fitransferlog, Account_log
+from models.recharge import Fitransferlog
 from models.account import Account
 
 router = APIRouter()
@@ -51,9 +49,10 @@ def user_withdrawal_list(page: Optional[int] = 0, size: Optional[int] = 10,token
     statement_list, total, money, final_money = WithdrawStatement().get_user_withdraw_cash(page,size)
     return HttpResultResponse(total=total, count=float(money), actual_count=final_money, data=statement_list)
 
+
 #http://fiance-rys.3yakj.com/Guild/settlement
 @router.get("/guildWithdrawal/list")
-def guild_withdrawal_list(page: Optional[int] = 1, size: Optional[int] = 10,token=Depends(login_required)):
+def guild_withdrawal_list(page: Optional[int] = 1, size: Optional[int] = 10, token=Depends(login_required)):
     """公会提现列表"""
     guild_list, total, money, final_money = WithdrawStatement().get_guild_withdraw_cash(page,size)
     return HttpResultResponse(total=total, count=float(money), actual_count=final_money, data=guild_list)
@@ -62,7 +61,7 @@ def guild_withdrawal_list(page: Optional[int] = 1, size: Optional[int] = 10,toke
 @router.get("/guild/settlement")
 def guild_settlement_list(page: Optional[int] = 1, size: Optional[int] = 10,token=Depends(login_required)):
     """公会结算"""
-    guild_list, total = GuildSet().get_guild_data(page,size)
+    guild_list, total = GuildSet().get_guild_data(page, size)
     return HttpResultResponse(total=total, data=guild_list)