From f3ddd9985477ebde3ff49440ecfa0c9af28db84e Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期一, 09 六月 2025 11:24:46 +0800
Subject: [PATCH] bug修复

---
 trade/buy_radical/radical_buy_data_manager.py |   29 +++++++++++++++++++++--------
 1 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/trade/buy_radical/radical_buy_data_manager.py b/trade/buy_radical/radical_buy_data_manager.py
index 3b91cc9..4f95cc2 100644
--- a/trade/buy_radical/radical_buy_data_manager.py
+++ b/trade/buy_radical/radical_buy_data_manager.py
@@ -141,19 +141,19 @@
         limit_up_price_money_list = []
         pre_limit_up_price_money_list = []
         deal_order_list = BigOrderDealManager().get_total_buy_data_list(code)
-        deal_order_ids = set()
+        exclude_deal_order_ids = set()
         if deal_order_list:
             for x in deal_order_list:
-                if opened_time and int(opened_time.replace(":", "")) > int(
-                        l2_huaxin_util.convert_time(x[3]).replace(":", "")):
-                    # 寮�鏉挎椂闂翠箣鍓�
-                    continue
-                deal_order_ids.add(x[0])
+                # if opened_time and int(opened_time.replace(":", "")) > int(
+                #         l2_huaxin_util.convert_time(x[3]).replace(":", "")):
+                #     # 鐐告澘涔嬪墠鎴愪氦鐨勮鍗曚笉璁$畻鍦ㄥ唴
+                #     continue
+                exclude_deal_order_ids.add(x[0])
         for info in buy_money_list:
             if info[1] != limit_up_price:
                 continue
             limit_up_price_money_list.append(info[0])
-            if info[2] in deal_order_ids:
+            if info[2] in exclude_deal_order_ids:
                 continue
             pre_limit_up_price_money_list.append((info[0], info[2]))
             total_deal_buy_money += info[0]
@@ -163,7 +163,7 @@
             self.set_big_order_threshold(code, threshold_money)
         self.__already_total_deal_big_order_money[code] = (total_deal_buy_money, pre_limit_up_price_money_list)
         async_log_util.info(logger_l2_radical_buy_data,
-                            f"涔嬪墠鐨勫ぇ涔板崟锛歿code}-{total_deal_buy_money}-{total_deal_buy_money_info_list}")
+                            f"寮�鏉挎椂闂达細{opened_time} 涔嬪墠鐨勫ぇ涔板崟锛歿code}-{total_deal_buy_money}-{total_deal_buy_money_info_list}")
         # 澶勭悊澶у崠鍗�
         pre_limit_up_price_money_sell_list = []
         if True:
@@ -245,6 +245,19 @@
             return self.__already_total_deal_big_order_money[code][0]
         return 0
 
+    def get_deal_big_order_money_of_lack(self, code, exclude_order_ids):
+        """
+        鑾峰彇娌℃湁鍦ㄦ湰鍦癓2鎴愪氦闃熷垪涓殑鎴愪氦澶у崟
+        @param exclude_order_ids:
+        @param code:
+        @return:
+        """
+        if code in self.__already_total_deal_big_order_money:
+            # [(閲戦,浠锋牸,璁㈠崟鍙�)]
+            money_info_list = self.__already_total_deal_big_order_money[code][1]
+            return sum([x[0] for x in money_info_list if x[2] not in exclude_order_ids])
+        return 0
+
     def get_sell_deal_big_order_money(self, code, threshold_money):
         if code in self.__already_total_sell_deal_big_order_money:
             sellno_map = l2_data_util_new.local_today_sellno_map.get(code)

--
Gitblit v1.8.0