Commit 027bcd29 authored by xianyang's avatar xianyang

优化代码,自测bug

parent bbd41b8f
...@@ -82,10 +82,10 @@ def create_account(db: Session, param: schemas.AccountCreate): ...@@ -82,10 +82,10 @@ def create_account(db: Session, param: schemas.AccountCreate):
def update_account_info(db: Session, old_data): def update_account_info(db: Session, old_data):
"""修改""" """修改"""
db.query(models.Account).filter(models.Account.id == old_data.id).update( db.query(models.Account).filter(models.Account.id == old_data.id).update(
{models.Account.name: old_data.name}, {models.Account.name: old_data.name,
{models.Account.remark: old_data.remark}, models.Account.remark: old_data.remark,
{models.Account.income: ','.join(map(str, old_data.income))}, models.Account.income: ','.join(map(str, old_data.income)),
{models.Account.output: ','.join(map(str, old_data.output))}) models.Account.output: ','.join(map(str, old_data.output))})
db.commit() db.commit()
......
...@@ -19,7 +19,7 @@ def get_export_list(db: Session, param): ...@@ -19,7 +19,7 @@ def get_export_list(db: Session, param):
if param.get("start_time"): if param.get("start_time"):
export_filters.append(ExportFile.create_time >= param.get("start_time")) export_filters.append(ExportFile.create_time >= param.get("start_time"))
if param.get("end_time"): if param.get("end_time"):
export_filters.append(ExportFile.create_time >= param.get("end_time")) export_filters.append(ExportFile.create_time <= param.get("end_time"))
querydata, count = QueryAllData(db, ExportFile, param, export_filters).query_data() querydata, count = QueryAllData(db, ExportFile, param, export_filters).query_data()
data = [QueryAllData.serialization(item) for item in querydata] data = [QueryAllData.serialization(item) for item in querydata]
return data, count return data, count
......
...@@ -75,7 +75,7 @@ class RechargeStatement(object): ...@@ -75,7 +75,7 @@ class RechargeStatement(object):
not_null_filters.append(Recharge.user_id == param.user_id) not_null_filters.append(Recharge.user_id == param.user_id)
if param.sid: if param.sid:
not_null_filters.append(Recharge.sid.like(param.sid)) not_null_filters.append(Recharge.sid.like(param.sid))
if param.paychannel: if param.pay_channel:
not_null_filters.append(Recharge.pay_channel.like(param.pay_channel)) not_null_filters.append(Recharge.pay_channel.like(param.pay_channel))
if param.start_time: if param.start_time:
not_null_filters.append(Recharge.current >= param.start_time) not_null_filters.append(Recharge.current >= param.start_time)
...@@ -137,8 +137,8 @@ class WithdrawStatement(object): ...@@ -137,8 +137,8 @@ class WithdrawStatement(object):
def get_user_withdraw_cash(self, db: Session, param): def get_user_withdraw_cash(self, db: Session, param):
"""用户提现""" """用户提现"""
is_filters = [] is_filters = []
if param.user_id: if param.name:
is_filters.append(UserWC.user_id == param.user_id) is_filters.append(UserWC.nick_name.like(f'%{param.name}%'))
if param.status or param.status == 0: if param.status or param.status == 0:
is_filters.append(UserWC.status == param.status) is_filters.append(UserWC.status == param.status)
if param.start_time: if param.start_time:
......
...@@ -108,20 +108,11 @@ def outon_account_data(db: Session, dbname, params): ...@@ -108,20 +108,11 @@ def outon_account_data(db: Session, dbname, params):
def accout_list_data(db: Session, dbname, params): def accout_list_data(db: Session, dbname, params):
accout_filters = [] accout_filters = []
if params.get("id"):
accout_filters.append(dbname.guild_id == params.get("guild_id"))
if params.get("transfer_id"): if params.get("transfer_id"):
accout_filters.append(dbname.transfer_id == params.get("transfer_id")) accout_filters.append(dbname.transfer_id == params.get("transfer_id"))
if params.get("dst_id"): if params.get("dst_id"):
accout_filters.append(dbname.dst_id == params.get("dst_id")) accout_filters.append(dbname.dst_id == params.get("dst_id"))
if params.get("cont"):
accout_filters.append(dbname.cont == params.get("cont"))
if params.get("money"):
accout_filters.append(dbname.money == params.get("money"))
if params.get("url"):
accout_filters.append(dbname.url == params.get("url"))
if params.get("uuid"):
accout_filters.append(dbname.uuid == params.get("uuid"))
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(dbname.create_time >= params.get("start_time") + " 00:00:00")
if params.get("end_time"): if params.get("end_time"):
......
...@@ -23,7 +23,7 @@ class StatementList(BaseModel): ...@@ -23,7 +23,7 @@ class StatementList(BaseModel):
order_number: Optional[str] = "" order_number: Optional[str] = ""
user_id: Optional[str] = "" user_id: Optional[str] = ""
sid: Optional[str] = "" sid: Optional[str] = ""
paychannel: Optional[str] = "" pay_channel: Optional[str] = ""
class Statement(StatementBase): class Statement(StatementBase):
...@@ -39,7 +39,7 @@ class UserWithdrawalList(BaseModel): ...@@ -39,7 +39,7 @@ class UserWithdrawalList(BaseModel):
start_time: Optional[str] = "" start_time: Optional[str] = ""
end_time: Optional[str] = "" end_time: Optional[str] = ""
status: Optional[int] = None status: Optional[int] = None
user_id: Optional[int] = None name: Optional[str] = ""
class GuildWithdrawalList(BaseModel): class GuildWithdrawalList(BaseModel):
......
...@@ -96,6 +96,6 @@ def update_user_info(db: Session, param, user_info): ...@@ -96,6 +96,6 @@ def update_user_info(db: Session, param, user_info):
res["data"] = "两次密码不一致!" res["data"] = "两次密码不一致!"
return res return res
db.query(models.User).filter(models.User.id == user_info.get("user_id")).update({models.User.username: param.username, db.query(models.User).filter(models.User.id == user_info.get("user_id")).update({models.User.username: param.username,
models.User.hashed_password: param.new_pwd}) models.User.hashed_password: param.new_pwd})
db.commit() db.commit()
return res return res
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