优化合并x

app/api/statement/guild.py

@@ -75,7 +75,7 @@ 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,db, page, size,status,start_time,end_time,guild_id):
+    def get_guild_data(self, db, 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')} ")
@@ -106,13 +106,13 @@ class GuildSet(object):
             self.linkmysql.excete_mysql(guild_sql)
 
 
-def paymentset_guild_data(page, size,start_time,end_time):
+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!=[]:
+    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:
@@ -201,11 +201,13 @@ def query_uuid_or_user_number(param):
         if param.type == 1:  # 公会查询
             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)
-            return {"nick_name": "(公会)" + guild[0]['guild_name'], "uuid": guild[0]['uuid'], "is_guild": 1, "id": guild[0]['id']} if guild else {}
+            return {"nick_name": "(公会)" + guild[0]['guild_name'], "uuid": guild[0]['uuid'], "is_guild": 1,
+                    "id": guild[0]['id']} if guild else {}
         elif param.type == 2:  # 用户查询
             user_sql = f"select user_id,nick_name,uuid from v2_user where uuid='{param.uuid}' limit 0,1"
             user = LinkMysql(env.DB_3YV2).query_mysql(user_sql)
-            return {"nick_name": user[0]['nick_name'], "uuid": user[0]['uuid'], "is_guild": 0, "id": user[0]['user_id']} if user else {}
+            return {"nick_name": user[0]['nick_name'], "uuid": user[0]['uuid'], "is_guild": 0,
+                    "id": user[0]['user_id']} if user else {}
         else:
             user_sql = f"select user_id,nick_name,uuid from v2_user where uuid='{param.uuid}' limit 0,1"
             guild_sql = f"select id,guild_name,uuid from guild where uuid='{param.uuid}' limit 0,1"
@@ -215,9 +217,11 @@ def query_uuid_or_user_number(param):
             user = future1.result()
             guild = future2.result()
             if user:
-                return {"nick_name": user[0]['nick_name'], "uuid": user[0]['uuid'], "is_guild": 0, "id": user[0]['user_id']}
+                return {"nick_name": user[0]['nick_name'], "uuid": user[0]['uuid'], "is_guild": 0,
+                        "id": user[0]['user_id']}
             elif guild:
-                return {"nick_name": "(公会)" + guild[0]['guild_name'], "uuid": guild[0]['uuid'], "is_guild": 1,"id": guild[0]['id']}
+                return {"nick_name": "(公会)" + guild[0]['guild_name'], "uuid": guild[0]['uuid'], "is_guild": 1,
+                        "id": guild[0]['id']}
             else:
                 return {}
     if param.user_number:
@@ -487,7 +491,7 @@ def transfer_query(data):
     '''
     调用
     '''
-    payment_sql=f"insert into payment_log(cont,money,create_time,url,uuid) values('{data.cont}','{data.money}',{get_now_timestamp()},'{data.url}','{data.uuid}')"
+    payment_sql = f"insert into payment_log(cont,money,create_time,url,uuid) values('{data.cont}','{data.money}',{get_now_timestamp()},'{data.url}','{data.uuid}')"
     LinkMysql(env.DB_3YV2).perform_mysql(payment_sql)
     params = {}
     if data.money > 0:
@@ -496,7 +500,7 @@ def transfer_query(data):
         params['ip'] = get_ip()
         params['dst_amount_type'] = 'Payment'
         params['amount'] = 1
-        params['fee'] = data.money *-1 if data.money<0 else data.money
+        params['fee'] = data.money * -1 if data.money < 0 else data.money
         params['reference_number'] = get_order()
         params['reference_type'] = 'finance_admin_fix'
         params['reference_info'] = []
@@ -507,22 +511,26 @@ def transfer_query(data):
         params['ip'] = get_ip()
         params['dst_amount_type'] = 'Payment'
         params['amount'] = 1
-        params['fee'] = data.money *-1 if data.money<0 else data.money
+        params['fee'] = data.money * -1 if data.money < 0 else data.money
         params['reference_number'] = get_order()
         params['reference_type'] = 'finance_admin_fix'
         params['reference_info'] = []
         params['timestamp'] = 0
-    search(params=params,method=method)
+    search(params=params, method=method)
     return
 
 
-def  GuildSettlementAdd(db,data):
-     guild_data=db.query(GuildSettlementLog).filter(GuildSettlementLog.work_id == data.id).first()
-     if  guild_data:
-         transfer_trigger_task()
-         db_export=db.query(GuildSettlementLog).filter(GuildSettlementLog.work_id == data.id).update({GuildSettlementLog.status: data.status})
-     else:
-         db_export = GuildSettlementLog(work_id=data.id, guild_id=data.guild_id, balance=data.balance,
-                              pearl=data.pearl, status=data.status,create_time=data.create_time,update_time=data.update_time,guild_name=data.guild_name,guild_per=data.guild_per,actual_money=data.actual_money,pledge_deposit_money=data.pledge_deposit_money)
-         db.add(db_export)
-     db.commit()
+def GuildSettlementAdd(db, data):
+    guild_data = db.query(GuildSettlementLog).filter(GuildSettlementLog.work_id == data.id).first()
+    if guild_data:
+        transfer_trigger_task()
+        db_export = db.query(GuildSettlementLog).filter(GuildSettlementLog.work_id == data.id).update(
+            {GuildSettlementLog.status: data.status})
+    else:
+        db_export = GuildSettlementLog(work_id=data.id, guild_id=data.guild_id, balance=data.balance,
+                                       pearl=data.pearl, status=data.status, create_time=data.create_time,
+                                       update_time=data.update_time, guild_name=data.guild_name,
+                                       guild_per=data.guild_per, actual_money=data.actual_money,
+                                       pledge_deposit_money=data.pledge_deposit_money)
+        db.add(db_export)
+    db.commit()