Merge branch 'develop/xp' into development

# Conflicts:
#	app/api/statement/crud.py
#	app/api/statement/guild.py

app/api/statement/schemas.py

+from fastapi import HTTPException
 from typing import Optional
 from pydantic import BaseModel, validator
 
@@ -24,6 +25,7 @@ class StatementList(BaseModel):
     user_id: Optional[str] = ""
     sid: Optional[str] = ""
     pay_channel: Optional[str] = ""
+    month_type :Optional[int] =None
 
 
 class Statement(StatementBase):
@@ -108,6 +110,8 @@ class UserNumber(BaseModel):
     type: Optional[int] = None
 
 
+
+
 class CreateBill(BaseModel):
     dst_id: Optional[str] = ""
     dst_name: Optional[str] = ""

app/api/statement/views.py

@@ -21,14 +21,14 @@ router = APIRouter()
 
 
 @router.get("/recharge/list")
-def statement_recharge_list(page: Optional[int] = 0, size: Optional[int] = 10,order_number: Optional[str] = "",user_id: Optional[int] = "",sid: Optional[str]="",start_time:Optional[str]='',end_time:Optional[str]="",token=Depends(login_required)):
+def statement_recharge_list(page: Optional[int] = 0, size: Optional[int] = 10,order_number: Optional[str] = "",user_id: 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,user_id,sid,start_time,end_time)
+    total,statement_list,money= RechargeStatement().query_data(page,size,order_number,user_id,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)):
+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,17 +36,17 @@ 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,name:Optional[str]='',status:Optional[int]='',start_time:Optional[str]='',end_time:Optional[str]="",token=Depends(login_required)):
+def user_withdrawal_list(page: Optional[int] = 0, size: Optional[int] = 10,name:Optional[str]='',status:Optional[int]='',start_time:Optional[str]='',end_time:Optional[str]="",month_type:Optional[int]="",token=Depends(login_required)):
     """用户提现列表"""
-    statement_list, total, money, final_money = WithdrawStatement().get_user_withdraw_cash(page,size,name,status,start_time,end_time)
-    return HttpResultResponse(total=total, count=float(money), actual_count=final_money, data=statement_list)
+    total,statement_list,money = WithdrawStatement(). get_user_withdraw_cash(page,size,name,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]="", token=Depends(login_required)):
-    """公会提现列表"""
-    guild_list, total, money, final_money = WithdrawStatement().get_guild_withdraw_cash(page,size,guild_id,status,start_time,end_time)
-    return HttpResultResponse(total=total, count=float(money), actual_count=final_money, data=guild_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)):
+    """公会提现列表  暂无"""
+    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")

libs/functions.py

@@ -5,7 +5,8 @@ import time
 import random
 import uuid as u
 from datetime import datetime, timedelta
-
+from datetime import datetime
+from dateutil.relativedelta import relativedelta
 import requests
 
 from core.config.env import env
@@ -110,4 +111,14 @@ def search(params, method):
 
 def get_ip():
     res = socket.gethostbyname(socket.gethostname())
-    return res
+    return res
\ No newline at end of file
+
+
+
+def get_month_last_month(month_type):
+    last_month=0
+    if month_type==2:
+       month_date = datetime.now().date() - relativedelta(months=1)
+       last_month = month_date.strftime("%Y%m")
+    now_month =datetime.now().strftime("%Y%m")
+    return last_month,now_month
\ No newline at end of file