Skip to content

F
financial-system
Commit 5d5f98a3 authored by xianyang's avatar xianyang
Browse files
Options

Merge remote-tracking branch 'remotes/origin/develop/xp' into development 

# Conflicts:
#	app/api/statement/crud.py
#	app/api/statement/guild.py
#	app/api/statement/views.py
parents e5fbe536 2de2d5e4
Expand all Show whitespace changes
Inline Side-by-side
Showing with 152 additions and 55 deletions
.idea/financial-system.iml
View file @ 5d5f98a3
......@@ -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/statement/crud.py
View file @ 5d5f98a3
This diff is collapsed.
app/api/statement/guild.py
View file @ 5d5f98a3
......@@ -75,10 +75,27 @@ class GuildSet(object):
# return guild_info[(int(param.page) - 1) * param.size:param.size * param.page], len(guild_info)
# return [], 0
def get_guild_data(self, page, size):
def get_guild_data(self, page, size,status,start_time,end_time,guild_id):
query = []
if start_time:
query.append(f" create_time >= {time_str_to_timestamp(start_time + ' 00:00:00')} ")
if end_time:
query.append(f" update_time < {time_str_to_timestamp(end_time + ' 23:59:59')} ")
if guild_id:
query.append(f"guild_id={guild_id} ")
if status:
query.append(f"status={status} ")
if query==[]:
count_sql = f'SELECT count(*) FROM `guild_settlement_log` as t inner join guild as g on g.id=t.guild_id'
count = self.linkmysql.query_mysql(count_sql)[0].get("count(*)") # 总条数
sql = f'SELECT t.guild_id,b.card_no as account,t.guild_name,IFNULL(t.balance,0) +IFNULL(t.pearl,0) as all_money,FROM_UNIXTIME(t.create_time,"%Y-%c-%d %h:%i:%s") as create_time,t.`status`,b.bank_of_deposit_name as bank_name FROM `guild_settlement_log` as t inner join guild as g on g.id=t.guild_id LEFT JOIN bind_bank as b on b.guild_id=t.guild_id ORDER BY t.id limit {page},{(size)}'
sql = f'SELECT t.guild_id,b.card_no as account,t.guild_name,IFNULL(t.balance,0) +IFNULL(t.pearl,0) as all_money,FROM_UNIXTIME(t.create_time,"%Y-%c-%d %h:%i:%s") as create_time,t.`status`,b.bank_of_deposit_name as bank_name FROM `guild_settlement_log` as t inner join guild as g on g.id=t.guild_id LEFT JOIN bind_bank as b on b.guild_id=t.guild_id ORDER BY t.id limit {(int(page) - 1) * page},{size} '
statement_list = self.linkmysql.query_mysql(sql) # 提现总数
else:
query = ' and '.join(query).replace('create_time','t.create_time').replace('update_time','t.update_time').replace('status','t.status').replace('guild_id','t.guild_id')
print(query)
count_sql = f'SELECT count(*) FROM `guild_settlement_log` as t inner join guild as g on g.id=t.guild_id where {query}'
count = self.linkmysql.query_mysql(count_sql)[0].get("count(*)") # 总条数
sql = f'SELECT t.guild_id,b.card_no as account,t.guild_name,IFNULL(t.balance,0) +IFNULL(t.pearl,0) as all_money,FROM_UNIXTIME(t.create_time,"%Y-%c-%d %h:%i:%s") as create_time,t.`status`,b.bank_of_deposit_name as bank_name FROM `guild_settlement_log` as t inner join guild as g on g.id=t.guild_id LEFT JOIN bind_bank as b on b.guild_id=t.guild_id where {query} ORDER BY t.id limit {(int(page) - 1) * page},{size} '
statement_list = self.linkmysql.query_mysql(sql) # 提现总数
return statement_list, count
......@@ -93,11 +110,20 @@ class GuildSet(object):
self.linkmysql.excete_mysql(guild_sql)
def paymentset_guild_data(page, size):
def paymentset_guild_data(page, size,start_time,end_time):
query = []
if start_time:
query.append(f"create_time >= {time_str_to_timestamp(start_time + ' 00:00:00')} ")
if end_time:
query.append(f" create_time < {time_str_to_timestamp(end_time + ' 23:59:59')} ")
if query!=[]:
count_sql = f"SELECT count(*) FROM `payment_log` where {' and '.join(query)}"
list_sql = f"SELECT money,cont,url,FROM_UNIXTIME(create_time,'%Y-%c-%d %h:%i:%s') as create_time FROM `payment_log` where {' and '.join(query)} ORDER BY id desc limit {(int(page) - 1) * page},{size} "
else:
count_sql = f"SELECT count(*) FROM `payment_log`"
list_sql = f"SELECT money,cont,url,FROM_UNIXTIME(create_time,'%Y-%c-%d %h:%i:%s') as create_time FROM `payment_log` ORDER BY id desc limit {(int(page) - 1) * page},{size} "
paymentset_sql = LinkMysql(env.DB_3YV2).query_mysql(count_sql)
total = paymentset_sql[0].get("count(*)")
list_sql = f"SELECT money,cont,url,FROM_UNIXTIME(create_time,'%Y-%c-%d %h:%i:%s') as create_time FROM `payment_log` ORDER BY id desc limit {page},{(size)} "
payment_list = LinkMysql(env.DB_3YV2).query_mysql(list_sql)
list = []
for item in range(len(payment_list)):
......@@ -399,7 +425,8 @@ def transfer_query(data):
print(data.cont)
payment_sql = f"insert into payment_log(cont,money,url,uuid) values({data.cont},{data.money},{data.url},{data.uuid})"
print(payment_sql)
LinkMysql(env.MysqlDB).excete_mysql(payment_sql)
payment_sql=f"insert into payment_log(cont,money,url,uuid) values('{data.cont}','{data.money}','{data.url}','{data.uuid}')"
LinkMysql(env.DB_3YV2).excete_mysql(payment_sql)
params = {}
if data.money > 0:
method = 'Server.BaseExecute.Increase'
......@@ -414,5 +441,14 @@ def transfer_query(data):
params['timestamp'] = 0
else:
method = 'Server.BaseExecute.Reduce'
response = search(params=data, method=method)
print(response)
params['dst_uuid'] = data.uuid
params['ip'] = get_ip()
params['dst_amount_type'] = 'Payment'
params['amount'] = 'consumable'
params['fee'] = data.money * -1
params['reference_number'] = get_order()
params['reference_type'] = 'finance_admin_fix'
params['reference_info'] = []
params['timestamp'] = 0
response =search(params=params,method=method)
print(response.text)
app/api/statement/views.py
View file @ 5d5f98a3
......@@ -21,18 +21,10 @@ router = APIRouter()
@router.get("/recharge/list")
def statement_recharge_list(page: Optional[int] = 1, size: Optional[int] = 10, 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]="",token=Depends(login_required)):
"""充值报表列表"""
# page: Optional[int] = None
# size: Optional[int] = None
# start_time: Optional[str] = ""
# end_time: Optional[str] = ""
# order_number: Optional[str] = ""
# user_id: Optional[str] = ""
# sid: Optional[str] = ""
# pay_channel: Optional[str] = ""
total, statement_list, money = RechargeStatement().query_data(page, size)
return HttpResultResponse(total=total, count=float(money), data=statement_list)
total,statement_list,money= RechargeStatement().query_data(page,size,order_number,user_id,sid,start_time,end_time)
return HttpResultResponse(total=total,count=float(money),data=statement_list)
@router.post("/derive/excel")
......@@ -44,31 +36,30 @@ 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, 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]="",token=Depends(login_required)):
"""用户提现列表"""
statement_list, total, money, final_money = WithdrawStatement().get_user_withdraw_cash(page, size)
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)
# 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] = 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_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)
@router.get("/guild/settlement")
def guild_settlement_list(page: Optional[int] = 1, size: Optional[int] = 10, 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)
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, 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)
payment_list, total = paymentset_guild_data(page,size,start_time,end_time)
return HttpResultResponse(total=total, data=payment_list)
......
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