合并

app/api/statement/views.py

@@ -21,14 +21,19 @@ router = APIRouter()
 
 
 @router.get("/recharge/list")
-def statement_recharge_list(page: Optional[int] = 0, size: Optional[int] = 10,order_number: Optional[str] = "",uuid: Optional[int] = "",sid: Optional[str]="",start_time:Optional[str]='',end_time:Optional[str]="",types:Optional[str]="",reference_type:Optional[str]="",month_type:Optional[int]="",token=Depends(login_required)):
+def statement_recharge_list(page: Optional[int] = 0, size: Optional[int] = 10, order_number: Optional[str] = "",
+                            uuid: Optional[int] = "", sid: Optional[str] = "", start_time: Optional[str] = '',
+                            end_time: Optional[str] = "", types: Optional[str] = "", reference_type: Optional[str] = "",
+                            month_type: Optional[int] = "", token=Depends(login_required)):
     """充值报表列表"""
-    total,statement_list,money= RechargeStatement().query_data(page,size,order_number,uuid,sid,start_time,end_time,types,reference_type,month_type)
-    return HttpResultResponse(total=total,count=float(money),data=statement_list)
+    total, statement_list, money = RechargeStatement().query_data(page, size, order_number, uuid, sid, start_time,
+                                                                  end_time, types, reference_type, month_type)
+    return HttpResultResponse(total=total, count=float(money), data=statement_list)
 
 
 @router.post("/derive/excel")
-def statement_derive_excel(data: schemas.StatementList, request: Request, db: Session = Depends(get_db),token=Depends(login_required)):
+def statement_derive_excel(data: schemas.StatementList, request: Request, db: Session = Depends(get_db),
+                           token=Depends(login_required)):
     """充值报表导出  需要修改"""
     header_list = request.get("headers")
     statement_list = RechargeStatement().get_statements(data)
@@ -36,30 +41,39 @@ def statement_derive_excel(data: schemas.StatementList, request: Request, db: Se
 
 
 @router.get("/userWithdrawal/list")
-def user_withdrawal_list(page: Optional[int] = 0, size: Optional[int] = 10,uuid:Optional[int]='',status:Optional[int]='',start_time:Optional[str]='',end_time:Optional[str]="",month_type:Optional[int]="",token=Depends(login_required)):
+def user_withdrawal_list(page: Optional[int] = 0, size: Optional[int] = 10, uuid: Optional[int] = '',
+                         status: Optional[int] = '', start_time: Optional[str] = '', end_time: Optional[str] = "",
+                         month_type: Optional[int] = "", token=Depends(login_required)):
     """用户提现列表"""
-    total,statement_list,money = WithdrawStatement(). get_user_withdraw_cash(page,size,uuid,status,start_time,end_time,month_type)
+    total, statement_list, money = WithdrawStatement().get_user_withdraw_cash(page, size, uuid, status, start_time,
+                                                                              end_time, month_type)
     return HttpResultResponse(total=total, count=float(money), data=statement_list)
 
 
 @router.get("/guildWithdrawal/list")
-def guild_withdrawal_list(page: Optional[int] = 0, size: Optional[int] = 10,guild_id:Optional[int]='',status:Optional[int]='',start_time:Optional[str]='',end_time:Optional[str]="", month_type:Optional[int]="",token=Depends(login_required)):
+def guild_withdrawal_list(page: Optional[int] = 0, size: Optional[int] = 10, guild_id: Optional[int] = '',
+                          status: Optional[int] = '', start_time: Optional[str] = '', end_time: Optional[str] = "",
+                          month_type: Optional[int] = "", token=Depends(login_required)):
     """公会提现列表  暂无"""
-    total,statement_list,money= WithdrawStatement(). get_guild_withdraw_cash(page,size,guild_id,status,start_time,end_time,month_type)
+    total, statement_list, money = WithdrawStatement().get_guild_withdraw_cash(page, size, guild_id, status, start_time,
+                                                                               end_time, month_type)
     return HttpResultResponse(total=total, count=float(money), data=statement_list)
 
 
 @router.get("/guild/settlement")
-def guild_settlement_list(page: Optional[int] = 0, size: Optional[int] = 10,status:Optional[int]='',start_time:Optional[str]='',end_time:Optional[str]="",guild_id:Optional[str]="",token=Depends(login_required)):
+def guild_settlement_list(page: Optional[int] = 0, size: Optional[int] = 10, status: Optional[int] = '',
+                          start_time: Optional[str] = '', end_time: Optional[str] = "", guild_id: Optional[str] = "",
+                          token=Depends(login_required)):
     """公会结算"""
-    guild_list, total = GuildSet().get_guild_data(page, size,status,start_time,end_time,guild_id)
+    guild_list, total = GuildSet().get_guild_data(page, size, status, start_time, end_time, guild_id)
     return HttpResultResponse(total=total, data=guild_list)
 
 
 @router.get("/guild/payment")
-def guild_payment_list(page: Optional[int] = 1, size: Optional[int] = 10,start_time:Optional[str]='',end_time:Optional[str]="",token=Depends(login_required)):
+def guild_payment_list(page: Optional[int] = 1, size: Optional[int] = 10, start_time: Optional[str] = '',
+                       end_time: Optional[str] = "", token=Depends(login_required)):
     """打款记录"""
-    payment_list, total = paymentset_guild_data(page,size,start_time,end_time)
+    payment_list, total = paymentset_guild_data(page, size, start_time, end_time)
     return HttpResultResponse(total=total, data=payment_list)
 
 
@@ -77,7 +91,7 @@ async def uploadFile(a_file: bytes = File(...), token=Depends(login_required), )
 def guild_payment_list(data: PaymentAdd, db: Session = Depends(get_db)):
     """提交打款"""
     transfer_query(data)
-    return HttpResultResponse(code=200,data='')
+    return HttpResultResponse(code=200, data='')
 
 
 @router.get("/onaccount")