Skip to content

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

转账接口

parent 1f465932
Hide whitespace changes
Inline Side-by-side
Showing with 178 additions and 133 deletions
app/api/statement/crud.py
View file @ e5fbe536
...@@ -42,18 +42,19 @@ def data_to_file(db, data, name, header): ...@@ -42,18 +42,19 @@ def data_to_file(db, data, name, header):
class RechargeStatement(object): class RechargeStatement(object):
"""充值报表""" """充值报表"""
def __init__(self): def __init__(self):
self.linkmysql=LinkMysql(env.MysqlDB) self.linkmysql = LinkMysql(env.DB_3YV2)
self.derive_list = [] self.derive_list = []
def query_data(self,page,size): def query_data(self, page, size):
count_sql=f'SELECT count(*) FROM `orders` as d inner join v2_user as u on d.userid=u.user_id where status=1' count_sql = f'SELECT count(*) FROM `orders` as d inner join v2_user as u on d.userid=u.user_id where status=1'
count=self.linkmysql.query_mysql(count_sql)[0].get("count(*)") count = self.linkmysql.query_mysql(count_sql)[0].get("count(*)")
sql =f'SELECT d.id as order_number,d.userid as user_id,u.user_number,u.nick_name,d.money,d.paychannel as pay_channel,d.sid,d.current,FROM_UNIXTIME(d.payment_time,"%Y-%c-%d %h:%i:%s") as payment_time,FROM_UNIXTIME(d.lastupdate,"%Y-%c-%d %h:%i:%s") as last_update FROM `orders` as d inner join v2_user as u on d.userid=u.user_id where status=1 ORDER BY id desc limit {page},{(size)}' sql = f'SELECT d.id as order_number,d.userid as user_id,u.user_number,u.nick_name,d.money,d.paychannel as pay_channel,d.sid,d.current,FROM_UNIXTIME(d.payment_time,"%Y-%c-%d %h:%i:%s") as payment_time,FROM_UNIXTIME(d.lastupdate,"%Y-%c-%d %h:%i:%s") as last_update FROM `orders` as d inner join v2_user as u on d.userid=u.user_id where status=1 ORDER BY id desc limit {page},{(size)}'
once_res=self.linkmysql.query_mysql(sql) once_res = self.linkmysql.query_mysql(sql)
money_sql=f'SELECT sum(d.balanceadd) FROM `orders` as d inner join v2_user as u on d.userid=u.user_id where status=1' money_sql = f'SELECT sum(d.balanceadd) FROM `orders` as d inner join v2_user as u on d.userid=u.user_id where status=1'
moeny_data=self.linkmysql.query_mysql(money_sql)[0].get("sum(d.balanceadd)") moeny_data = self.linkmysql.query_mysql(money_sql)[0].get("sum(d.balanceadd)")
return count,once_res,moeny_data return count, once_res, moeny_data
# def query_all_data(self, db): # def query_all_data(self, db):
# #
...@@ -113,6 +114,7 @@ class RechargeStatement(object): ...@@ -113,6 +114,7 @@ class RechargeStatement(object):
class WithdrawStatement(object): class WithdrawStatement(object):
"""提现报表""" """提现报表"""
def __init__(self): def __init__(self):
self.linkmysql = LinkMysql(env.DB_3YV2) self.linkmysql = LinkMysql(env.DB_3YV2)
self.derive_user_list = [] self.derive_user_list = []
...@@ -172,18 +174,18 @@ class WithdrawStatement(object): ...@@ -172,18 +174,18 @@ class WithdrawStatement(object):
# final_count = df['final_money'].apply(lambda x: float(x)).sum() # final_count = df['final_money'].apply(lambda x: float(x)).sum()
# return user_info[(int(param.page) - 1) * param.size:param.size * param.page], total, count, final_count # return user_info[(int(param.page) - 1) * param.size:param.size * param.page], total, count, final_count
# return [], 0, 0, 0 # return [], 0, 0, 0
def get_user_withdraw_cash(self,page,size): def get_user_withdraw_cash(self, page, size):
choice=1 choice = 1
status=3 status = 3
count_sql = f'SELECT count(*) FROM `tixian_order` where choice=1 and `status`=3' count_sql = f'SELECT count(*) FROM `tixian_order` where choice=1 and `status`=3'
count = self.linkmysql.query_mysql(count_sql)[0].get("count(*)") #总条数 count = self.linkmysql.query_mysql(count_sql)[0].get("count(*)") # 总条数
sql = f'SELECT t.usernumber as user_number,t.status,t.id as bank_code,t.nickname as nick_name,t.truename as true_name ,t.money,t.current,t.final_money,t.idcard as id_card,t.account,t.platformServiceFee as platform_service_fee,t.thirdServiceFee as third_service_fee FROM `tixian_order` as t where choice={choice} and status={status} ORDER BY id desc limit {page},{(size)}' sql = f'SELECT t.usernumber as user_number,t.status,t.id as bank_code,t.nickname as nick_name,t.truename as true_name ,t.money,t.current,t.final_money,t.idcard as id_card,t.account,t.platformServiceFee as platform_service_fee,t.thirdServiceFee as third_service_fee FROM `tixian_order` as t where choice={choice} and status={status} ORDER BY id desc limit {page},{(size)}'
statement_list = self.linkmysql.query_mysql(sql) #提现总数 statement_list = self.linkmysql.query_mysql(sql) # 提现总数
money_sql = f'SELECT sum(money) FROM `tixian_order` where choice=1 and `status`=3' money_sql = f'SELECT sum(money) FROM `tixian_order` where choice=1 and `status`=3'
moeny_data = self.linkmysql.query_mysql(money_sql)[0].get("sum(money)") #提现金额 moeny_data = self.linkmysql.query_mysql(money_sql)[0].get("sum(money)") # 提现金额
final_data=f'SELECT sum(final_money) FROM `tixian_order` where choice=1 and `status`=3' final_data = f'SELECT sum(final_money) FROM `tixian_order` where choice=1 and `status`=3'
final_money=self.linkmysql.query_mysql(final_data)[0].get("sum(final_money)") # 实得金额 final_money = self.linkmysql.query_mysql(final_data)[0].get("sum(final_money)") # 实得金额
return statement_list, count, moeny_data,final_money return statement_list, count, moeny_data, final_money
# def dispose_guild_to_data(self, db, num): # def dispose_guild_to_data(self, db, num):
# user_list = [] # user_list = []
...@@ -240,7 +242,7 @@ class WithdrawStatement(object): ...@@ -240,7 +242,7 @@ class WithdrawStatement(object):
# return guild_info[(int(cond.page) - 1) * cond.size:cond.size * cond.page], total, count, final_count # return guild_info[(int(cond.page) - 1) * cond.size:cond.size * cond.page], total, count, final_count
# return [], 0, 0, 0 # return [], 0, 0, 0
def get_guild_withdraw_cash(self,page,size): def get_guild_withdraw_cash(self, page, size):
status = 2 status = 2
count_sql = f'SELECT count(*) FROM `guild_ti_xian` where `status`=2' count_sql = f'SELECT count(*) FROM `guild_ti_xian` where `status`=2'
count = self.linkmysql.query_mysql(count_sql)[0].get("count(*)") # 总条数 count = self.linkmysql.query_mysql(count_sql)[0].get("count(*)") # 总条数
......
app/api/statement/guild.py
View file @ e5fbe536
import json
import math import math
import socket import socket
import threading import threading
...@@ -7,7 +8,7 @@ from sqlalchemy import and_, func, engine ...@@ -7,7 +8,7 @@ from sqlalchemy import and_, func, engine
from sqlalchemy.orm import Session from sqlalchemy.orm import Session
from core.config.env import env from core.config.env import env
from libs.db_link import LinkMysql from libs.db_link import LinkMysql
from libs.functions import get_now_timestamp, get_now_datetime, search, get_order, get_ip from libs.functions import get_now_timestamp, get_now_datetime, search, get_order, get_ip, time_str_to_timestamp
from libs.orm import QueryAllData from libs.orm import QueryAllData
from libs.token_verify import get_current_user from libs.token_verify import get_current_user
from models.recharge import Settlement, Fitransferlog, FinanceFixLog, Account_log, Paymentlog from models.recharge import Settlement, Fitransferlog, FinanceFixLog, Account_log, Paymentlog
...@@ -22,7 +23,7 @@ locka = threading.Lock() ...@@ -22,7 +23,7 @@ locka = threading.Lock()
class GuildSet(object): class GuildSet(object):
def __init__(self): def __init__(self):
self.settlement_list = [] self.settlement_list = []
self.linkmysql = LinkMysql(env.MysqlDB) self.linkmysql = LinkMysql(env.DB_3YV2)
def dispose_guild_data(self, db, num): def dispose_guild_data(self, db, num):
guild_list = [] guild_list = []
...@@ -94,10 +95,10 @@ class GuildSet(object): ...@@ -94,10 +95,10 @@ class GuildSet(object):
def paymentset_guild_data(page, size): def paymentset_guild_data(page, size):
count_sql = f"SELECT count(*) FROM `payment_log`" count_sql = f"SELECT count(*) FROM `payment_log`"
paymentset_sql = LinkMysql(env.MysqlDB).query_mysql(count_sql) paymentset_sql = LinkMysql(env.DB_3YV2).query_mysql(count_sql)
total = paymentset_sql[0].get("count(*)") 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)} " 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.MysqlDB).query_mysql(list_sql) payment_list = LinkMysql(env.DB_3YV2).query_mysql(list_sql)
list = [] list = []
for item in range(len(payment_list)): for item in range(len(payment_list)):
payment_list[item]['url'] = env.oss_url + payment_list[item].get("url") payment_list[item]['url'] = env.oss_url + payment_list[item].get("url")
...@@ -115,43 +116,66 @@ def outon_account_data(db: Session, dbname, params): ...@@ -115,43 +116,66 @@ def outon_account_data(db: Session, dbname, params):
return data, count return data, count
def accout_list_data(db: Session, dbname, params): def accout_list_data(**params):
accout_filters = [] accout_filters = []
if params.get("transfer_name"): if params.get("transfer_name"):
accout_filters.append(dbname.transfer_name.like(f'%{params.get("transfer_name")}%')) accout_filters.append(f" transfer_name like '%{params.get('transfer_name')}%'")
if params.get("dst_name"): if params.get("dst_name"):
accout_filters.append(dbname.dst_name.like(f'%{params.get("dst_name")}%')) accout_filters.append(f" dst_name like '%{params.get('dst_name')}%'")
if params.get("start_time"): if params.get("start_time"):
accout_filters.append(dbname.create_time >= params.get("start_time") + " 00:00:00") accout_filters.append(f" create_time >= {time_str_to_timestamp(params.get('start_time') + ' 00:00:00')} ")
if params.get("end_time"): if params.get("end_time"):
accout_filters.append(dbname.create_time <= params.get("end_time") + " 23:59:59") accout_filters.append(f" create_time <= {time_str_to_timestamp(params.get('end_time') + ' 23:59:59')} ")
querydata, count = QueryAllData(db, dbname, params, accout_filters).query_data() if accout_filters:
data = [QueryAllData.serialization(item) for item in querydata] count_sql = f"select count(id) as num from fi_transfer_log where {' and '.join(accout_filters)}"
return data, count data_sql = f"select id,amount,dst_name,create_time,dst_uuid,transfer_uuid,remarks,operator from fi_transfer_log where {' and '.join(accout_filters)} order by id DESC limit {(int(params.get('page')) - 1) * params.get('size')},{params.get('size')}"
else:
count_sql = f"select count(id) as num from fi_transfer_log"
data_sql = f"select * from fi_transfer_log order by id DESC limit {(int(params.get('page')) - 1) * params.get('size')},{params.get('size')}"
with ThreadPoolExecutor(max_workers=2) as pool:
future1 = pool.submit(LinkMysql(env.DB_3YV2).query_mysql, count_sql)
future2 = pool.submit(LinkMysql(env.DB_3YV2).query_mysql, data_sql)
total = future1.result()
res = future2.result()
if res:
return res, total[0]['num']
return [], 0
def query_uuid_or_user_number(db: Session, param): def query_uuid_or_user_number(param):
"""查询uuid和user_number""" """查询uuid和user_number"""
if param.uuid: if param.uuid:
user = db.query(V2User).filter(V2User.uuid == param.uuid).first() user_sql = f"select nick_name,uuid from v2_user where uuid='{param.uuid}' limit 0,1"
user = LinkMysql(env.DB_3YV2).query_mysql(user_sql)
if not user: if not user:
guild = db.query(Guild).filter(Guild.uuid == param.uuid).first() guild_sql = f"select id,guild_name,uuid from guild where uuid='{param.uuid}' limit 0,1"
guild = LinkMysql(env.DB_3YV2).query_mysql(guild_sql)
if not guild: if not guild:
return {} return {}
return {"nick_name": "(公会)" + guild.guild_name, "uuid": guild.uuid, "is_guild": 1, "id": guild.id} return {"nick_name": "(公会)" + guild[0]['guild_name'], "uuid": guild[0]['uuid'], "is_guild": 1,
return {"nick_name": user.nick_name, "uuid": user.uuid, "is_guild": 0, "id": user.user_id} "id": guild[0]['id']}
return {"nick_name": user[0]['nick_name'], "uuid": user[0]['uuid'], "is_guild": 0, "id": user[0]['user_id']}
if param.user_number: if param.user_number:
account = db.query(Account).filter(Account.uuid == param.user_number).first() account_sql = f"select id,name,uuid,unique_tag from fi_account where uuid='{param.uuid}' limit 0,1"
return {"nick_name": account.name, "user_id": account.unique_tag, "uuid": account.uuid, "id": account.id} account = LinkMysql(env.DB_3YV2).query_mysql(account_sql)
if account:
return {"nick_name": account[0]['name'], "user_id": account[0]['unique_tag'], "uuid": account[0]['uuid'],
"id": account[0]['id']}
return {}
def account_money(db: Session, param): def account_money(uuid):
"""查询账户余额""" """查询账户余额"""
account = db.query(Account).filter(Account.uuid == param.id).first() platform_data = search({"uuid": uuid}, 'Server.UserQuery.GetUserAsset')
if not account: if platform_data['status']:
return 0 try:
return account.consumable if account.consumable else 0 platform_money = platform_data['data']['result']['data']['asset_balance']['consumable']['current_amount']
except Exception as e:
print(f"清算系统异常：{e}")
platform_money = 0
return platform_money
return 0
def query_token(db, h_list): def query_token(db, h_list):
...@@ -168,58 +192,69 @@ def query_token(db, h_list): ...@@ -168,58 +192,69 @@ def query_token(db, h_list):
return user_info return user_info
def transfer_trigger_task(db, data): def transfer_trigger_task(uuid, user_id, balance, type, amount_type=1, remark='用户转账', money_data=[],
isUser=1, dst_uuid=False, referNum=''):
"""转账验证""" """转账验证"""
try:
dst = db.query(Account).filter(Account.uuid == data.dst_id).first() # 转出 request_data = {
transfer = db.query(Account).filter(Account.uuid == data.transfer_id).first() # 转入 "ip": get_ip(),
if float(dst.consumable) < data.amount: "uuid": uuid,
return "账户余额不足" "dst_uuid": dst_uuid,
dst.consumable = float(dst.consumable) - data.amount "reference_number": get_order(),
transfer.consumable = float(transfer.consumable) + data.amount "reference_type": type,
db.commit() "amount": balance,
except Exception as e: "timestamp": get_now_timestamp(),
db.rollback() "amount_type": 'consumable' if amount_type ==1 else 'withdrawable',
return "操作失败" "notify_url": ""
return "" }
res = search(request_data, 'Server.UserExecute.Transfer')
print(res)
status = 2
if res['status'] == 0:
errmsg = json.dumps(res['data'])
status = 3
add_sql = f"insert into all_record_table(user_id, type, status, reference_number, remark, money, is_add, money_data,create_time) " \
f"values({user_id}, '{type}', {status},'{get_order()}','{remark}', {balance * 10 if amount_type == 1 else balance * 100},1,'{json.dumps(money_data)}',{get_now_timestamp()});"
LinkMysql(env.DB_3YV2).perform_mysql(add_sql)
return res
def transfer_money(db: Session, param, h_list): def transfer_money(db: Session, param, h_list):
"""转账""" """转账"""
user = query_token(db, h_list) user_id = 0
if param.type == 0: if param.type == 0: # 系统转系统
out = db.query(Account).filter(Account.uuid == param.dst_id).first() out_sql = f"select name from fi_account where uuid='{param.dst_id}' limit 0,1"
income = db.query(Account).filter(Account.uuid == param.transfer_id).first() out = LinkMysql(env.DB_3YV2).query_mysql(out_sql)
dst_name = out.name dst_name = out[0]['name']
transfer_name = income.name if param.type == 1: # 系统转个人/公会
if param.type == 1: out_sql = f"select name from fi_account where uuid='{param.dst_id}' limit 0,1"
out = db.query(Account).filter(Account.uuid == param.dst_id).first() out = LinkMysql(env.DB_3YV2).query_mysql(out_sql)
income = db.query(V2User).filter(V2User.uuid == param.transfer_id).first() income_sql = f"select user_id,nick_name from v2_user where uuid='{param.transfer_id}' limit 0,1"
transfer_name = income.nick_name if income else "" income = LinkMysql(env.DB_3YV2).query_mysql(income_sql)
if not income: # income存在用户存在，就不查公会
income = db.query(Guild).filter(Guild.uuid == param.transfer_id).first() if income:
transfer_name = income.guild_name if income else "" user_id = income[0]['user_id']
dst_name = out.name if income else "" dst_name = out[0]['name']
if param.type == 2: if param.type == 2: # 个人/公会转系统
out = db.query(V2User).filter(V2User.uuid == param.dst_id).first() out_sql = f"select nick_name from v2_user where uuid='{param.transfer_id}' limit 0,1"
dst_name = out.nick_name if out else "" out = LinkMysql(env.DB_3YV2).query_mysql(out_sql)
if not out: if out:
out = db.query(Guild).filter(Guild.uuid == param.dst_id).first() dst_name = out[0]['nick_name']
dst_name = out.guild_name if out else "" else:
income = db.query(Account).filter(Account.uuid == param.transfer_id).first() out_guild_sql = f"select guild_name from guild where uuid='{param.transfer_id}'"
transfer_name = income.name if income else "" out_guild = LinkMysql(env.DB_3YV2).query_mysql(out_guild_sql)
# 转账 dst_name = out_guild[0]['guild_name'] if out_guild else ""
is_success = transfer_trigger_task(db, param)
if is_success:
return is_success
try: try:
present = Fitransferlog(dst_id=param.dst_id, dst_name=dst_name, amount=param.amount, type=param.type, # 转账
transfer_id=param.transfer_id, nick_name=param.nick_name, remark=param.remark, is_success = transfer_trigger_task(param.dst_id, 0, param.amount, 'platformRecharge', 1,
operator=user.get("username"), transfer_type=param.transfer_type, f"{param.dst_id}给{param.transfer_id}转账", [], 0, param.transfer_id)
create_time=get_now_datetime(), transfer_name=transfer_name) if not is_success['status']:
db.add(present) return is_success
db.commit() user = query_token(db, h_list)
db.refresh(present) transfer_sql = f"insert into fi_transfer_log(amount, dst_name, create_time, transfer_uuid, dst_uuid, user_id, remarks, operator,operator_id) " \
f"values({param.amount}, '{dst_name}', {get_now_timestamp()},'{param.transfer_id}','{param.dst_id}', {user_id if user_id else 0},'{param.remark}','{user.get('username')}',{user.get('user_id')});"
LinkMysql(env.DB_3YV2).perform_mysql(transfer_sql)
except Exception as e: except Exception as e:
return e return e
return {} return {}
...@@ -380,4 +415,4 @@ def transfer_query(data): ...@@ -380,4 +415,4 @@ def transfer_query(data):
else: else:
method = 'Server.BaseExecute.Reduce' method = 'Server.BaseExecute.Reduce'
response = search(params=data, method=method) response = search(params=data, method=method)
print(response.text) print(response)
app/api/statement/schemas.py
View file @ e5fbe536
...@@ -109,14 +109,12 @@ class UserNumber(BaseModel): ...@@ -109,14 +109,12 @@ class UserNumber(BaseModel):
class CreateBill(BaseModel): class CreateBill(BaseModel):
dst_id: Optional[str] = "" dst_id: Optional[str] = ""
dst_name: str = "" dst_name: Optional[str] = ""
amount: float amount: Optional[float] = 0.0
transfer_id: Optional[str] = "" transfer_id: Optional[str] = ""
transfer_name: str = ""
remark: Optional[str] = "" remark: Optional[str] = ""
type: int
nick_name: Optional[str] = ""
transfer_type: Optional[str] = "" transfer_type: Optional[str] = ""
type: Optional[int] = None
# @validator('transfer_id') # @validator('transfer_id')
# def transfer_id_must_contain_space(cls, v): # def transfer_id_must_contain_space(cls, v):
......
app/api/statement/views.py
View file @ e5fbe536
...@@ -21,7 +21,7 @@ router = APIRouter() ...@@ -21,7 +21,7 @@ router = APIRouter()
@router.get("/recharge/list") @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] = 1, size: Optional[int] = 10, token=Depends(login_required)):
"""充值报表列表""" """充值报表列表"""
# page: Optional[int] = None # page: Optional[int] = None
# size: Optional[int] = None # size: Optional[int] = None
...@@ -31,8 +31,8 @@ def statement_recharge_list(page: Optional[int] = 1, size: Optional[int] = 10,to ...@@ -31,8 +31,8 @@ def statement_recharge_list(page: Optional[int] = 1, size: Optional[int] = 10,to
# user_id: Optional[str] = "" # user_id: Optional[str] = ""
# sid: Optional[str] = "" # sid: Optional[str] = ""
# pay_channel: Optional[str] = "" # pay_channel: Optional[str] = ""
total,statement_list,money= RechargeStatement().query_data(page,size) total, statement_list, money = RechargeStatement().query_data(page, size)
return HttpResultResponse(total=total,count=float(money),data=statement_list) return HttpResultResponse(total=total, count=float(money), data=statement_list)
@router.post("/derive/excel") @router.post("/derive/excel")
...@@ -44,36 +44,36 @@ def statement_derive_excel(data: schemas.StatementList, request: Request, db: Se ...@@ -44,36 +44,36 @@ def statement_derive_excel(data: schemas.StatementList, request: Request, db: Se
@router.get("/userWithdrawal/list") @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, 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)
return HttpResultResponse(total=total, count=float(money), actual_count=final_money, data=statement_list) return HttpResultResponse(total=total, count=float(money), actual_count=final_money, data=statement_list)
#http://fiance-rys.3yakj.com/Guild/settlement # http://fiance-rys.3yakj.com/Guild/settlement
@router.get("/guildWithdrawal/list") @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] = 1, size: Optional[int] = 10, 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)
return HttpResultResponse(total=total, count=float(money), actual_count=final_money, data=guild_list) return HttpResultResponse(total=total, count=float(money), actual_count=final_money, data=guild_list)
@router.get("/guild/settlement") @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] = 1, size: Optional[int] = 10, token=Depends(login_required)):
"""公会结算""" """公会结算"""
guild_list, total = GuildSet().get_guild_data(page, size) guild_list, total = GuildSet().get_guild_data(page, size)
return HttpResultResponse(total=total, data=guild_list) return HttpResultResponse(total=total, data=guild_list)
@router.get("/guild/payment") @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, token=Depends(login_required)):
"""打款记录""" """打款记录"""
payment_list, total = paymentset_guild_data(page,size) payment_list, total = paymentset_guild_data(page, size)
return HttpResultResponse(total=total, data=payment_list) return HttpResultResponse(total=total, data=payment_list)
@router.post('/upload') @router.post('/upload')
async def uploadFile(a_file: bytes = File(...),token=Depends(login_required),): async def uploadFile(a_file: bytes = File(...), token=Depends(login_required), ):
a_content = a_file a_content = a_file
image_name = random_number() image_name = random_number()
cos_path = new_upload_file(a_content, image_name) cos_path = new_upload_file(a_content, image_name)
...@@ -83,37 +83,46 @@ async def uploadFile(a_file: bytes = File(...),token=Depends(login_required),): ...@@ -83,37 +83,46 @@ async def uploadFile(a_file: bytes = File(...),token=Depends(login_required),):
@router.post("/payment/add") @router.post("/payment/add")
def guild_payment_list(data:PaymentAdd,db: Session = Depends(get_db)): def guild_payment_list(data: PaymentAdd, db: Session = Depends(get_db)):
"""提交打款""" """提交打款"""
transfer_query(data) transfer_query(data)
return HttpResultResponse(data='') return HttpResultResponse(data='')
@router.get("/onaccount") @router.get("/onaccount")
def outon_account(db: Session = Depends(get_db),token=Depends(login_required)): def outon_account(db: Session = Depends(get_db), token=Depends(login_required)):
"""转出和转入账户人员列表""" """转出和转入账户人员列表"""
account_list, total = outon_account_data(db, Account, {}) account_list, total = outon_account_data(db, Account, {})
return HttpResultResponse(total=total, data=account_list) return HttpResultResponse(total=total, data=account_list)
@router.post("/transferlist") @router.get("/transferlist")
def outon_account(data: PaymentAccountlList,token=Depends(login_required),db: Session = Depends(get_db)): def out_on_account(page: int,
size: int,
start_time: Optional[str] = "",
end_time: Optional[str] = "",
transfer_name: Optional[str] = "",
dst_name: Optional[str] = "",
token=Depends(login_required)):
"""转账列表""" """转账列表"""
account_list, total = accout_list_data(db, Fitransferlog, data.dict(exclude_none=True)) account_list, total = accout_list_data(page=page, size=size, start_time=start_time, end_time=end_time,
transfer_name=transfer_name, dst_name=dst_name)
return HttpResultResponse(total=total, data=account_list) return HttpResultResponse(total=total, data=account_list)
@router.post("/query/consumable") @router.get("/query/consumable")
def query_account_money(data: UserNumber,token=Depends(login_required),db: Session = Depends(get_db)): def query_account_money(uuid: str, token=Depends(login_required)):
"""查询账户余额""" """查询账户余额"""
consumable = account_money(db, data) if not uuid:
return HttpResultResponse(data=int(consumable)) return HttpResultResponse(code=500, msg='请输入uuid')
consumable = account_money(uuid)
return HttpResultResponse(data=consumable)
@router.post("/query/uuid") @router.post("/query/uuid")
def query_uuid_account(data: UserNumber, token=Depends(login_required), db: Session = Depends(get_db)): def query_uuid_account(data: UserNumber, token=Depends(login_required)):
"""uuid user_number查询""" """uuid user_number查询"""
user_info = query_uuid_or_user_number(db, data) user_info = query_uuid_or_user_number(data)
return HttpResultResponse(data=user_info) return HttpResultResponse(data=user_info)
...@@ -131,7 +140,7 @@ def account_transfer_money(data: CreateBill, request: Request, ...@@ -131,7 +140,7 @@ def account_transfer_money(data: CreateBill, request: Request,
@router.post("/guild/update") @router.post("/guild/update")
def guild_update_list(data: schemas.GuildUpdate,token=Depends(login_required)): def guild_update_list(data: schemas.GuildUpdate, token=Depends(login_required)):
"""公会结算""" """公会结算"""
GuildSet().update_guild_info(data) GuildSet().update_guild_info(data)
return HttpResultResponse() return HttpResultResponse()
...@@ -167,7 +176,8 @@ def recovery_fix(page: int, ...@@ -167,7 +176,8 @@ def recovery_fix(page: int,
end_time: Optional[str] = "", end_time: Optional[str] = "",
token=Depends(login_required)): token=Depends(login_required)):
"""异常数据修复列表""" """异常数据修复列表"""
recovery_list, total = guild.recovery_fix_data(page=page, size=size, uuid=uuid, start_time=start_time, end_time=end_time) recovery_list, total = guild.recovery_fix_data(page=page, size=size, uuid=uuid, start_time=start_time,
end_time=end_time)
return HttpResultResponse(total=total, data=recovery_list) return HttpResultResponse(total=total, data=recovery_list)
......
core/config/env.py
View file @ e5fbe536
...@@ -12,23 +12,22 @@ from qcloud_cos import CosS3Client ...@@ -12,23 +12,22 @@ from qcloud_cos import CosS3Client
SITE_ROOT = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) SITE_ROOT = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
FILE_PATH = os.path.join(SITE_ROOT, "runtime", "images") FILE_PATH = os.path.join(SITE_ROOT, "runtime", "images")
region = 'ap-guangzhou'
region ='ap-guangzhou'
token = None token = None
scheme ='https' scheme = 'https'
# Bucket ="3yakj-center-1256890024" #正式桶 # Bucket ="3yakj-center-1256890024" #正式桶
Bucket="fj-dc-test-1256890024" #测试桶 Bucket = "fj-dc-test-1256890024" # 测试桶
# Bucket="3yakj" #测试桶 # Bucket="3yakj" #测试桶
# secret_id='LTAI5t6JyitXaGoGdU7mga7o' # secret_id='LTAI5t6JyitXaGoGdU7mga7o'
# secret_key='Qg69gRB0vTThX5Ur6tlqgbmvqRaUjE' # secret_key='Qg69gRB0vTThX5Ur6tlqgbmvqRaUjE'
secret_id='AKIDra5Ur292g4FCzYrwmMhAOQFsHSP9wb3S' secret_id = 'AKIDra5Ur292g4FCzYrwmMhAOQFsHSP9wb3S'
secret_key='JRKyzpSr1wc5OXXUFsGPKtKfsvqcEcqw' secret_key = 'JRKyzpSr1wc5OXXUFsGPKtKfsvqcEcqw'
config = CosConfig(Region=region, SecretId=secret_id, SecretKey=secret_key, Token=token, Scheme=scheme) config = CosConfig(Region=region, SecretId=secret_id, SecretKey=secret_key, Token=token, Scheme=scheme)
client = CosS3Client(config) client = CosS3Client(config)
COS_PATH ='https://fj-dc-test-1256890024.cos.ap-guangzhou.myqcloud.com' #测试 COS_PATH = 'https://fj-dc-test-1256890024.cos.ap-guangzhou.myqcloud.com' # 测试
COS_RERURN_PATH='/images/' COS_RERURN_PATH = '/images/'
class Env(BaseSettings): class Env(BaseSettings):
...@@ -62,8 +61,8 @@ class Env(BaseSettings): ...@@ -62,8 +61,8 @@ class Env(BaseSettings):
PASSWORD: str = "fj123456" PASSWORD: str = "fj123456"
# DB_HISTORY = "3yakj_v2" # DB_HISTORY = "3yakj_v2"
# guild_url="" # guild_url=""
oss_url='http://oss.3yakj.com/application_static_data' oss_url = 'http://oss.3yakj.com/application_static_data'
clear_url="http://192.168.4.124:8002" clear_url = "http://192.168.4.124:8002"
CLEARING_CENTER_URL: str = 'http://106.55.103.148:6464/' CLEARING_CENTER_URL: str = 'http://106.55.103.148:6464/'
...@@ -84,6 +83,7 @@ env = Env() # 开发环境 ...@@ -84,6 +83,7 @@ env = Env() # 开发环境
# env = ProdEnv() # 生产环境 # env = ProdEnv() # 生产环境
redis_data = env.Redis redis_data = env.Redis
pool = redis.ConnectionPool(host=redis_data.get("host"), port=redis_data.get("port"), password=redis_data.get("password"), pool = redis.ConnectionPool(host=redis_data.get("host"), port=redis_data.get("port"),
password=redis_data.get("password"),
db=redis_data.get("redis_db"), decode_responses=True) db=redis_data.get("redis_db"), decode_responses=True)
red = redis.StrictRedis(connection_pool=pool) red = redis.StrictRedis(connection_pool=pool)
libs/functions.py
View file @ e5fbe536
...@@ -88,7 +88,7 @@ def search(params, method): ...@@ -88,7 +88,7 @@ def search(params, method):
:param params: 传入参数 :param params: 传入参数
:param method: 传入方法 :param method: 传入方法
""" """
url = env.clear_url url = env.CLEARING_CENTER_URL
header = { header = {
"RPC-METHOD": method, "RPC-METHOD": method,
"RPC-ID": '159', "RPC-ID": '159',
...@@ -97,9 +97,9 @@ def search(params, method): ...@@ -97,9 +97,9 @@ def search(params, method):
} }
response = requests.post(url=url, headers=header, json=params) response = requests.post(url=url, headers=header, json=params)
if response.status_code != 200: if response.status_code != 200:
return {"status": 0} return {}
text = json.loads(response.text) text = json.loads(response.text)
return {"status": 1, 'data': text.get('result')} return text
def get_ip(): def get_ip():
......
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