列表条件筛选提交

.idea/financial-system.iml

@@ -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

@@ -43,16 +43,38 @@ def data_to_file(db, data, name, header):
 class RechargeStatement(object):
     """充值报表"""
     def __init__(self):
-        self.linkmysql=LinkMysql(env.MysqlDB)
+        self.linkmysql=LinkMysql(env.DB_3YV2)
         self.derive_list = []
 
-    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=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)}'
-        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'
-        moeny_data=self.linkmysql.query_mysql(money_sql)[0].get("sum(d.balanceadd)")
+    def query_data(self,page,size,order_number,user_id,sid,start_time,end_time):
+        query=[]
+        if start_time:
+            query.append(f" current >= {time_str_to_timestamp(start_time + ' 00:00:00')} ")
+        if end_time:
+            query.append(f" lastupdate < {time_str_to_timestamp(end_time + ' 23:59:59')} ")
+        if order_number:
+            query.append(f"id={order_number} ")
+        elif user_id:
+            query.append(f"user_id={user_id} ")
+        elif sid:
+            query.append(f"sid='{sid}' ")
+        if query==[]:
+            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(*)")
+            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 {(int(page) - 1) * size},{size}'
+            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"
+            moeny_data = self.linkmysql.query_mysql(money_sql)[0].get("sum(d.balanceadd)") if \
+            self.linkmysql.query_mysql(money_sql)[0].get("sum(d.balanceadd)") != None else 0
+        else:
+            query = ' and '.join(query)
+            count_sql=f"SELECT count(*) FROM `orders` as  d   inner join v2_user  as u on  d.userid=u.user_id where status=1 and {query}"
+            print(count_sql)
+            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  and {query} ORDER BY id desc limit {(int(page) - 1) * size},{size}'
+            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 and {query}"
+            moeny_data= self.linkmysql.query_mysql(money_sql)[0].get("sum(d.balanceadd)") if self.linkmysql.query_mysql(money_sql)[0].get("sum(d.balanceadd)")!=None else 0
         return count,once_res,moeny_data
 
     # def query_all_data(self, db):
@@ -115,6 +137,7 @@ class WithdrawStatement(object):
     """提现报表"""
     def __init__(self):
         self.derive_user_list = []
+        self.linkmysql=LinkMysql(env.DB_3YV2)
         self.derive_guild_list = []
 
     def thread_to_data(self, db, num):
@@ -171,17 +194,37 @@ class WithdrawStatement(object):
     #         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 [], 0, 0, 0
-    def get_user_withdraw_cash(self,page,size):
-        choice=1
-        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(*)")  #总条数
-        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)  #提现总数
-        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)")   #提现金额
-        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)")   # 实得金额
+    def get_user_withdraw_cash(self,page, size, name, status,start_time,end_time):
+        query = []
+        if start_time:
+            query.append(f" current >= {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 name:
+            query.append(f" nickname like '%{name}%' ")
+        if  status:
+            query.append(f"status={status} ")
+        if query==[]:
+            choice = 1
+            count_sql = f'SELECT count(*) FROM `tixian_order` where choice=1 and  `status`=3'
+            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}  ORDER BY id desc limit {(int(page) - 1) * size},{size}'
+            statement_list = self.linkmysql.query_mysql(sql)  # 提现总数
+            money_sql = f'SELECT sum(money) FROM `tixian_order` where choice=1'
+            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'
+            final_money = self.linkmysql.query_mysql(final_data)[0].get("sum(final_money)")  # 实得金额
+        else:
+            choice=1
+            query = ' and '.join(query)
+            count_sql = f'SELECT count(*) FROM `tixian_order` where choice=1 and {query}'
+            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 {query} ORDER BY id desc limit {(int(page) - 1) * size},{size}'
+            statement_list = self.linkmysql.query_mysql(sql)  #提现总数
+            money_sql = f'SELECT sum(money) FROM `tixian_order` where choice=1  and {query}'
+            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 {query}'
+            final_money=self.linkmysql.query_mysql(final_data)[0].get("sum(final_money)")   # 实得金额
         return statement_list, count, moeny_data,final_money
 
     # def dispose_guild_to_data(self, db, num):
@@ -239,16 +282,36 @@ class WithdrawStatement(object):
     #         return guild_info[(int(cond.page) - 1) * cond.size:cond.size * cond.page], total, count, final_count
     #     return [], 0, 0, 0
 
-    def get_guild_withdraw_cash(self,page,size):
-        status = 2
-        count_sql = f'SELECT count(*) FROM `guild_ti_xian` where `status`=2'
-        count = self.linkmysql.query_mysql(count_sql)[0].get("count(*)")  # 总条数
-        sql = f'SELECT t.guild_id,t.parent_id as merchants_id,g.guild_name,t.money,t.account,t.`status`,t.finalMoney as final_money,t.update_time,t.taxRate as platform_service_fee,t.thirdServiceFee as third_service_fee FROM `guild_ti_xian` as t inner join guild  as g on g.id=t.guild_id where t.status=2 ORDER BY t.id desc   limit {page},{(size)}'
-        statement_list = self.linkmysql.query_mysql(sql)  # 提现总数
-        money_sql = f'SELECT sum(money) FROM `guild_ti_xian` where `status`=2'
-        moeny_data = self.linkmysql.query_mysql(money_sql)[0].get("sum(money)")  # 提现金额
-        final_data = f'SELECT sum(finalMoney) FROM `guild_ti_xian` where  `status`=2'
-        final_money = self.linkmysql.query_mysql(final_data)[0].get("sum(finalMoney)")  # 实得金额
+    def get_guild_withdraw_cash(self,page,size,guild_id,status,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" 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_ti_xian`'
+            count = self.linkmysql.query_mysql(count_sql)[0].get("count(*)")  # 总条数
+            sql = f'SELECT t.guild_id,t.parent_id as merchants_id,g.guild_name,t.money,t.account,t.`status`,t.finalMoney as final_money,t.update_time,t.taxRate as platform_service_fee,t.thirdServiceFee as third_service_fee FROM `guild_ti_xian` as t inner join guild  as g on g.id=t.guild_id  ORDER BY t.id desc   limit {(int(page) - 1) * size},{size}'
+            statement_list = self.linkmysql.query_mysql(sql)  # 提现总数
+            money_sql = f'SELECT sum(money) FROM `guild_ti_xian`'
+            moeny_data = self.linkmysql.query_mysql(money_sql)[0].get("sum(money)")  # 提现金额
+            final_data = f'SELECT sum(finalMoney) FROM `guild_ti_xian`'
+            final_money = self.linkmysql.query_mysql(final_data)[0].get("sum(finalMoney)")  # 实得金额
+        else:
+            query1 = ' and '.join(query)
+            query_time=' and '.join(query).replace('create_time','t.create_time').replace('update_time','t.update_time').replace('guild_id','t.guild_id').replace('status','t.status')
+            count_sql = f'SELECT count(*) FROM `guild_ti_xian` where {query1}'
+            count = self.linkmysql.query_mysql(count_sql)[0].get("count(*)")  # 总条数
+            sql = f'SELECT t.guild_id,t.parent_id as merchants_id,g.guild_name,t.money,t.account,t.`status`,t.finalMoney as final_money,t.update_time,t.taxRate as platform_service_fee,t.thirdServiceFee as third_service_fee FROM `guild_ti_xian` as t inner join guild  as g on g.id=t.guild_id where {query_time} ORDER BY t.id desc   limit {(int(page) - 1) * size},{size}'
+            statement_list = self.linkmysql.query_mysql(sql)  # 提现总数
+            money_sql = f'SELECT sum(money) FROM `guild_ti_xian` where {query1}'
+            moeny_data = self.linkmysql.query_mysql(money_sql)[0].get("sum(money)") if self.linkmysql.query_mysql(money_sql)[0].get("sum(money)")!=None else 0 # 提现金额
+            final_data = f'SELECT sum(finalMoney) FROM `guild_ti_xian` where  {query1}'
+            final_money = self.linkmysql.query_mysql(final_data)[0].get("sum(finalMoney)")  # 实得金额
         return statement_list, count, moeny_data, final_money
 
 
@@ -267,7 +330,7 @@ class FinanceFix(object):
             count_sql = f"select count(id) as num from finance_fix_log where {' and '.join(finance_filters)}"
             data_sql = f"select id,type,money,unique_tag,amount_type,operator,create_time,remark from finance_fix_log where {' and '.join(finance_filters)} order by id DESC limit {(int(page) - 1) * size},{size}"
         else:
-            count_sql = f"select count(id) as num from finance_fix_log"
+            count_sql = f"select count(id) as num from finance_fix_log where {' and '.join(finance_filters)}"
             data_sql = f"select id,type,money,unique_tag,amount_type,operator,create_time,remark from finance_fix_log order by id DESC limit {(int(page) - 1) * size},{size}"
         with ThreadPoolExecutor(max_workers=2) as pool:
             future1 = pool.submit(LinkMysql(env.DB_3YV2).query_mysql, count_sql)

app/api/statement/guild.py

@@ -7,7 +7,7 @@ from sqlalchemy import and_, func, engine
 from sqlalchemy.orm import Session
 from core.config.env import env
 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.token_verify import get_current_user
 from models.recharge import Settlement, Fitransferlog, FinanceFixLog, Account_log, Paymentlog
@@ -22,7 +22,7 @@ locka = threading.Lock()
 class GuildSet(object):
     def __init__(self):
         self.settlement_list = []
-        self.linkmysql = LinkMysql(env.MysqlDB)
+        self.linkmysql = LinkMysql(env.DB_3YV2)
 
     def dispose_guild_data(self, db, num):
         guild_list = []
@@ -74,11 +74,28 @@ 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):
-        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)}'
-        statement_list = self.linkmysql.query_mysql(sql)  # 提现总数
+    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 {(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
 
     def update_guild_info(self, data):
@@ -92,12 +109,21 @@ class GuildSet(object):
             self.linkmysql.excete_mysql(guild_sql)
 
 
-def paymentset_guild_data(page, size):
-    count_sql = f"SELECT count(*) FROM `payment_log`"
-    paymentset_sql = LinkMysql(env.MysqlDB).query_mysql(count_sql)
+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.MysqlDB).query_mysql(list_sql)
+    payment_list = LinkMysql(env.DB_3YV2).query_mysql(list_sql)
     list = []
     for item in range(len(payment_list)):
         payment_list[item]['url'] = env.oss_url + payment_list[item].get("url")
@@ -364,7 +390,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'
@@ -379,5 +406,14 @@ def transfer_query(data):
         params['timestamp'] = 0
     else:
         method = 'Server.BaseExecute.Reduce'
-    response = search(params=data, method=method)
+        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

@@ -21,17 +21,9 @@ 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)
+    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)
 
 
@@ -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)