优化公会结算

app/api/statement/guild.py

@@ -264,13 +264,13 @@ def query_token(db, h_list):
 
 
 def transfer_trigger_task(uuid, user_id, balance, type, amount_type, remark='用户转账', money_data=[],
-                          isUser=1, dst_uuid="", referNum=''):
+                          isUser=1, dst_uuid="", reference_number=''):
     """转账验证"""
     request_data = {
         "ip": get_ip(),
         "uuid": uuid,
         "dst_uuid": dst_uuid,
-        "reference_number": get_order(),
+        "reference_number": reference_number if reference_number else get_order(),
         "reference_type": type,
         "amount": balance,
         "timestamp": get_now_timestamp(),
@@ -533,8 +533,8 @@ def GuildSettlementAdd(db, data):
             first_sta = 00
             # 钻石处理
             if guild_data.balance and guild_data.balance > 0:
-                balance_refer_num = f'guild_settlement_{data.id}_balance'
-                is_failure = transfer_trigger_task(guild_info[0].get("uuid"), 0, float(guild_data.balance), 'guild_clear', 'consumable', balance_refer_num, [], 1, acc_info[0]['uuid'])
+                balance_refer_num = f'guild_settlement_{guild_info[0].get("id")}_balance'
+                is_failure = transfer_trigger_task(guild_info[0].get("uuid"),0,float(guild_data.balance),'guild_clear','consumable',balance_refer_num,[],1,acc_info[0]['uuid'],reference_number=balance_refer_num)
                 if is_failure:
                     db.query(GuildSettlementLog).filter(GuildSettlementLog.id == data.id).update(
                         {GuildSettlementLog.status: 0, GuildSettlementLog.update_time: time_int_timestamp()})
@@ -543,8 +543,8 @@ def GuildSettlementAdd(db, data):
                 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, float(guild_data.pearl), 'guild_clear', 'withdrawable', pearl_refer_num, [], 1, acc_info[0]['uuid'])
+                pearl_refer_num = f'guild_settlement_{guild_info[0].get("id")}_pearl'
+                is_lose = transfer_trigger_task(guild_info[0].get("uuid"), 0, float(guild_data.pearl), 'guild_clear', 'withdrawable', pearl_refer_num, [], 1, acc_info[0]['uuid'], reference_number=pearl_refer_num)
                 if is_lose:
                     db.query(GuildSettlementLog).filter(GuildSettlementLog.id == data.id).update(
                         {GuildSettlementLog.status: 0, GuildSettlementLog.update_time: time_int_timestamp()})