结算代码修改

app/api/statement/guild.py

@@ -536,11 +536,11 @@ def GuildSettlementAdd(db, data):
         guild_sql = f"select * from guild where id={guild_data.guild_id} limit 0,1"
         guild_info = LinkMysql(env.DB_3YV2).query_mysql(guild_sql)
         if not guild_info:
-            return '公会数据错误'
+            return 400,{"name":"公会数据错误"}
         acc_sql = f"select * from fi_account where config_key='guildSettlement' limit 0,1"
         acc_info = LinkMysql(env.DB_3YV2).query_mysql(acc_sql)
         if not acc_info:
-            return '财务平台账户数据错误'
+            return 400, {"name": "财务平台账户数据错误"}
         if guild_data.status == 0:
             first_sta = 00
             # 钻石处理
@@ -548,21 +548,22 @@ def GuildSettlementAdd(db, data):
                 balance_refer_num = f'guild_settlement_{data.id}_balance'
                 is_failure = transfer_trigger_task(guild_info[0].get("uuid"), 0, data.balance, 'guild_clear', 'consumable', balance_refer_num, [], 1, acc_info[0]['uuid'])
                 if is_failure:
-                    return is_failure
+                    return 400, {"name": "结算错误"}
                 first_sta = 1
             # 珍珠处理
             if guild_data.pearl and guild_data.pearl > 0:
                 pearl_refer_num = f'guild_settlement_{data.id}_pearl'
-                is_lose = transfer_trigger_task(guild_info[0].get("uuid"), 0, data.balance, 'guild_clear', 'withdrawable', pearl_refer_num, [], 1, acc_info[0]['uuid'])
+                is_lose = transfer_trigger_task(guild_info[0].get("uuid"), 0, data.pearl, 'guild_clear', 'withdrawable', pearl_refer_num, [], 1, acc_info[0]['uuid'])
                 if is_lose:
-                    return is_lose
+                    return 400, {"name": "结算错误"}
                 first_sta = 1
             if first_sta:
                 url = "http://106.55.103.148:8787/api/guild/editSettlementLog"
                 json={'id': guild_data.work_id, 'status': 2}
                 res = requests.post(url=url, json=json)
                 if res.status_code != 200:
-                    return '财务回调失败'
+                    return 400, {"name": "财务请求失败"}
+                guild_data = db.query(GuildSettlementLog).filter(GuildSettlementLog.id == data.id).first()
                 db.query(GuildSettlementLog).filter(GuildSettlementLog.work_id == guild_data.work_id).update(
                     {GuildSettlementLog.status: data.status, GuildSettlementLog.update_time: get_now_timestamp()})
                 db.commit()

app/api/statement/views.py

@@ -259,5 +259,5 @@ def menu_list(db: Session = Depends(get_db),menu_type: Optional[int] = ""):
 @router.post("/guild/accounts")
 def guild_add(data: schemas.GuildAddLog, db: Session = Depends(get_db)):
     """公会结算"""
-    GuildSettlementAdd(db, data)
-    return HttpResultResponse(code=200, msg=HttpMessage.SUCCESS)
+    code,data=GuildSettlementAdd(db, data)
+    return HttpResultResponse(code=code, data=data)