Commit 76ca98d3 authored by xupeng's avatar xupeng

代码提交

parent 42913a47
...@@ -3,5 +3,5 @@ ...@@ -3,5 +3,5 @@
<component name="JavaScriptSettings"> <component name="JavaScriptSettings">
<option name="languageLevel" value="ES6" /> <option name="languageLevel" value="ES6" />
</component> </component>
<component name="ProjectRootManager" version="2" project-jdk-name="Python 3.8 (financial-system)" project-jdk-type="Python SDK" /> <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.8 (financial_system)" project-jdk-type="Python SDK" />
</project> </project>
\ No newline at end of file
...@@ -95,15 +95,15 @@ class GuildSet(object): ...@@ -95,15 +95,15 @@ class GuildSet(object):
count = db.query(func.count(GuildSettlementLog.id)).filter().scalar() count = db.query(func.count(GuildSettlementLog.id)).filter().scalar()
return data, count return data, count
def update_guild_info(self, data): # def update_guild_info(self, data):
"""公会结算修改""" # """公会结算修改"""
id = data.get("id") # id = data.get("id")
guild_sql = f"SELECT count(*) FROM `guild_settlement_log` where id={id})" # guild_sql = f"SELECT count(*) FROM `guild_settlement_log` where id={id})"
guild_data = self.linkmysql.query_mysql(guild_sql) # guild_data = self.linkmysql.query_mysql(guild_sql)
if guild_data: # if guild_data:
status = 1 if data.get("status") == 0 else 2 # status = 1 if data.get("status") == 0 else 2
guild_sql = f"UPDATE guild_settlement_log set status={status} where id={id}" # guild_sql = f"UPDATE guild_settlement_log set status={status} where id={id}"
self.linkmysql.excete_mysql(guild_sql) # 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):
...@@ -386,7 +386,6 @@ def create_fix_table(db: Session, param, h_list): ...@@ -386,7 +386,6 @@ def create_fix_table(db: Session, param, h_list):
"timestamp": get_now_timestamp() "timestamp": get_now_timestamp()
} }
clearing_res = search(data, method) clearing_res = search(data, method)
print(clearing_res)
if clearing_res['status']: if clearing_res['status']:
unique_res = [] unique_res = []
if param.type == 0: if param.type == 0:
...@@ -523,7 +522,7 @@ def transfer_query(data): ...@@ -523,7 +522,7 @@ def transfer_query(data):
def GuildSettlementAdd(db, data): def GuildSettlementAdd(db, data):
guild_data = db.query(GuildSettlementLog).filter(GuildSettlementLog.work_id == data.id).first() guild_data = db.query(GuildSettlementLog).filter(GuildSettlementLog.work_id == data.id).first()
if guild_data: if guild_data:
transfer_trigger_task() # transfer_trigger_task()
db_export = db.query(GuildSettlementLog).filter(GuildSettlementLog.work_id == data.id).update( db_export = db.query(GuildSettlementLog).filter(GuildSettlementLog.work_id == data.id).update(
{GuildSettlementLog.status: data.status}) {GuildSettlementLog.status: data.status})
else: else:
......
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