列表代码提交

app/api/statement/guild.py

@@ -323,11 +323,11 @@ def recovery_fix_data(**params):
     if params.get("end_time"):
         recovery_list.append(f"e.create_time < '{params.get('end_time')}'")
     if recovery_list:
-        sum_sql = f"select count(e.id) as num from finance_error_transverse_log as e inner join  fi_account as f on e.uuid=f.uuid where {' and '.join(recovery_list)}"
-        query_sql = f"select e.id,f.name,e.cont,e.out_money,e.entry_money,e.uuid,e.type,e.create_time,e.from_time from finance_error_transverse_log as e inner join  fi_account as f on e.uuid=f.uuid where {' and '.join(recovery_list)} order by e.id DESC limit {(int(params.get('page')) - 1) * params.get('size')},{params.get('size')}"
+        sum_sql = f"select count(e.id) as num from finance_error_transverse_log as e left join  fi_account as f on e.uuid=f.uuid where {' and '.join(recovery_list)}"
+        query_sql = f"select e.id,f.name,e.cont,e.out_money,e.entry_money,e.uuid,e.type,e.create_time,e.from_time from finance_error_transverse_log as e left join  fi_account as f on e.uuid=f.uuid where {' and '.join(recovery_list)} order by e.id DESC limit {(int(params.get('page')) - 1) * params.get('size')},{params.get('size')}"
     else:
-        query_sql = f"select e.id,f.name,e.cont,e.out_money,e.entry_money,e.uuid,e.type,e.create_time,e.from_time from finance_error_transverse_log as e inner join  fi_account as f on e.uuid=f.uuid order by e.id DESC limit {(int(params.get('page')) - 1) * params.get('size')},{params.get('size')}"
-        sum_sql = f"select count(e.id) as num from finance_error_transverse_log as e inner join  fi_account as f on e.uuid=f.uuid "
+        query_sql = f"select e.id,f.name,e.cont,e.out_money,e.entry_money,e.uuid,e.type,e.create_time,e.from_time from finance_error_transverse_log as e left join  fi_account as f on e.uuid=f.uuid order by e.id DESC limit {(int(params.get('page')) - 1) * params.get('size')},{params.get('size')}"
+        sum_sql = f"select count(e.id) as num from finance_error_transverse_log as e left join  fi_account as f on e.uuid=f.uuid "
     result = LinkMysql(env.DB_3YV2).query_mysql(query_sql)
     sum = LinkMysql(env.DB_3YV2).query_mysql(sum_sql)
     if result:

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):
@@ -107,6 +109,8 @@ class UserNumber(BaseModel):
     user_number: Optional[int] = None
 
 
+
+
 class CreateBill(BaseModel):
     dst_id: Optional[str] = ""
     dst_name: str = ""

app/api/statement/views.py

@@ -21,9 +21,9 @@ 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]=""):
     """充值报表列表"""
-    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)
 
 
@@ -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]=""):
     """用户提现列表"""
-    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")
@@ -105,7 +105,9 @@ def query_account_money(data: UserNumber,token=Depends(login_required),db: Sessi
 def query_uuid_account(data: UserNumber, token=Depends(login_required), db: Session = Depends(get_db)):
     """uuid user_number查询"""
     user_info = query_uuid_or_user_number(db, data)
-    return HttpResultResponse(data=user_info)
+    if user_info=={}:
+        return HttpResultResponse(code=500,data=user_info,msg="未查询到")
+    return HttpResultResponse(code=200,data=user_info)
 
 
 @router.post("/transfer/money")
@@ -171,10 +173,3 @@ def finance_fix(data: acc_schemas.RecoveryTable, token=Depends(login_required),
     return HttpResultResponse()
 
 
-@router.post("/recovery/fix")
-def recovery_fix(data: acc_schemas.RecoveryupdateTable, token=Depends(login_required)):
-    """修改异常数据"""
-    res = guild.update_recovery_table(data)
-    if res:
-        return HttpResultResponse(code=500, msg=res)
-    return HttpResultResponse()

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
@@ -104,4 +105,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