From cfba83b787a60317424f6b6ae2a282aaa8df612b Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期二, 29 七月 2025 15:49:05 +0800
Subject: [PATCH] 每次上板大单bug修复/成交进度位近似处理

---
 l2/l2_data_manager_new.py |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/l2/l2_data_manager_new.py b/l2/l2_data_manager_new.py
index d354a6b..ea64647 100644
--- a/l2/l2_data_manager_new.py
+++ b/l2/l2_data_manager_new.py
@@ -2066,6 +2066,7 @@
                                                                                              radical_data[5])
             # 缂轰箯鐨勫ぇ鍗曢噾棰�
             current_lack_money = int(big_order_deal_enough_result[5])
+            current_deal_order_ids = big_order_deal_enough_result[7]
             total_lack_money = int(big_order_deal_enough_result[6])
             # 濡傛灉鏈夊ぇ鍗曟垚浜ゅ氨涓嶉渶瑕佺湅澶у崟
             if constant.CAN_RADICAL_BUY_NEED_BIG_ORDER_EVERYTIME:
@@ -2131,8 +2132,9 @@
                 if val["num"] >= bigger_money_num:
                     watch_indexes.add(i)
 
-                if val["num"] >= current_min_num:
+                if val["num"] >= current_min_num and int(val["orderNo"]) not in current_deal_order_ids:
                     current_lack_money -= round(val["price"], 2) * val["num"] * 100
+                    current_deal_order_ids.add(val["orderNo"])
 
                 if val["num"] >= total_min_num:
                     total_lack_money -= round(val["price"], 2) * val["num"] * 100
@@ -2146,7 +2148,7 @@
                     min_order_no = min(min(every_time_big_orders, key=lambda e: e[0])[0], radical_data[1])
                 else:
                     min_order_no = radical_data[1]
-                return True, single_index, f"鏈夊ぇ鍗�,澶у崟鎯呭喌锛歿big_order_deal_enough_result[1]}", watch_indexes, min_order_no
+                return True, single_index, f"鏈夊ぇ鍗�,澶у崟鎯呭喌锛歿big_order_deal_enough_result[1]}, 鏈壒娆′笂鏉垮ぇ鍗曪細{current_deal_order_ids}", watch_indexes, min_order_no
             return False, None, f"澶у崟涓嶈冻锛歿trade_index}-{end_index}  缂哄皯鐨勫ぇ鍗�-{max(current_lack_money, total_lack_money)}  澶у崟鎯呭喌锛歿big_order_deal_enough_result[1]}", watch_indexes, None
 
         radical_data = RadicalBuyDealCodesManager.buy_by_l2_delegate_expire_time_dict.get(code)

--
Gitblit v1.8.0