Commit c21d8011 authored by xupeng's avatar xupeng

更新导出修改代码提交

parent b4e8e5c7
...@@ -303,7 +303,7 @@ class WithdrawStatement(object): ...@@ -303,7 +303,7 @@ class WithdrawStatement(object):
def get_guild_withdraw_cash(self, db, page, size, name, status, start_time, end_time, month_type, menu_id): def get_guild_withdraw_cash(self, db, page, size, name, status, start_time, end_time, month_type, menu_id):
"""公会提现""" """公会提现"""
query = [] query =[]
if name: if name:
query.append(f" nickname like '%{name}%' ") query.append(f" nickname like '%{name}%' ")
if status: if status:
...@@ -337,7 +337,7 @@ class WithdrawStatement(object): ...@@ -337,7 +337,7 @@ class WithdrawStatement(object):
query.append(f" create_time < {time_str_to_timestamp(end_time + ' 23:59:59')} ") query.append(f" create_time < {time_str_to_timestamp(end_time + ' 23:59:59')} ")
query = ' and '.join(query) query = ' and '.join(query)
now_month = get_month_last_month(month_type,start_time,end_time) now_month = get_month_last_month(month_type,start_time,end_time)
count, once_res, moeny_data,reality_moeny = self.dispose_user(month_type, query, page, size, now_month[1]) count, once_res, moeny_data,reality_moeny = self.dispose_user(month_type, query, page, size, now_month[1])
else: else:
query_data = self.query_add_time(query,start_time, end_time) query_data = self.query_add_time(query,start_time, end_time)
now_month = get_month_last_month(month_type,start_time,end_time) now_month = get_month_last_month(month_type,start_time,end_time)
......
...@@ -501,6 +501,7 @@ def transfer_query(data): ...@@ -501,6 +501,7 @@ def transfer_query(data):
params = {} params = {}
referNum=f'platomOutMoney_{platform}' referNum=f'platomOutMoney_{platform}'
reference_type='Payment' reference_type='Payment'
uuid =data.uuid uuid =data.uuid
ip=get_ip() ip=get_ip()
money=data.money * -1 if data.money < 0 else data.money money=data.money * -1 if data.money < 0 else data.money
......
...@@ -57,7 +57,7 @@ def guild_withdrawal_list(request:Request,db: Session = Depends(get_db),page: Op ...@@ -57,7 +57,7 @@ def guild_withdrawal_list(request:Request,db: Session = Depends(get_db),page: Op
"""公会提现列表 暂无""" """公会提现列表 暂无"""
query_params=request.query_params query_params=request.query_params
menu_id=query_params.getlist("menu_id[]") menu_id=query_params.getlist("menu_id[]")
total,statement_list,money,reality_moeny= WithdrawStatement(). get_guild_withdraw_cash(db,page,size,guild_id,status,start_time,end_time,month_type,menu_id) total,statement_list,money,reality_moeny= WithdrawStatement().get_guild_withdraw_cash(db,page,size,guild_id,status,start_time,end_time,month_type,menu_id)
return HttpResultResponse(total=total, count=float(money), data=statement_list,reality_moeny=reality_moeny) return HttpResultResponse(total=total, count=float(money), data=statement_list,reality_moeny=reality_moeny)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment