From 8138f3e5c6a2f05ed58adb12569ede34ffccf167 Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期二, 02 七月 2024 13:50:00 +0800
Subject: [PATCH] 上证成交进度信息排除主动买成交数据

---
 l2/l2_transaction_data_manager.py |   67 +++++++++++++++++++++++++--------
 1 files changed, 50 insertions(+), 17 deletions(-)

diff --git a/l2/l2_transaction_data_manager.py b/l2/l2_transaction_data_manager.py
index 33681d7..0d1773d 100644
--- a/l2/l2_transaction_data_manager.py
+++ b/l2/l2_transaction_data_manager.py
@@ -123,6 +123,9 @@
 
     # 姝e湪鎴愪氦鐨勮鍗�
     __dealing_order_info_dict = {}
+
+    # 姝e湪鎴愪氦鐨勪富鍔ㄤ拱鐨勮鍗�
+    __dealing_active_buy_order_info_dict = {}
     # 鏈�杩戞垚浜ょ殑璁㈠崟{"code":(璁㈠崟鍙凤紝鏄惁鎴愪氦瀹屾垚)}
     __latest_deal_order_info_dict = {}
 
@@ -165,6 +168,15 @@
         return cls.__dealing_order_info_dict.get(code)
 
     @classmethod
+    def get_dealing_active_order_info(cls, code):
+        """
+        鑾峰彇姝e湪涓诲姩鎴愪氦鐨勬暟鎹�
+        @param code:
+        @return:[璁㈠崟鍙凤紝鎬昏偂鏁帮紝鎴愪氦閲戦,鎴愪氦寮�濮嬫椂闂�,鎴愪氦缁撴潫鏃堕棿]
+        """
+        return cls.__dealing_active_buy_order_info_dict.get(code)
+
+    @classmethod
     def statistic_big_buy_data(cls, code, datas, limit_up_price):
         """
         缁熻澶у崟涔�
@@ -184,25 +196,46 @@
             if code not in cls.__dealing_order_info_dict:
                 # 鏁版嵁鏍煎紡[璁㈠崟鍙凤紝鎬昏偂鏁帮紝鎴愪氦閲戦,鎴愪氦寮�濮嬫椂闂�,鎴愪氦缁撴潫鏃堕棿]
                 cls.__dealing_order_info_dict[code] = [data[6], data[2], data[2] * data[1], data[3], data[3]]
-            if cls.__dealing_order_info_dict[code][0] == data[6]:
-                # 鎴愪氦鍚屼竴涓鍗曞彿
-                cls.__dealing_order_info_dict[code][1] += data[2]
-                cls.__dealing_order_info_dict[code][2] += data[2] * data[1]
-                cls.__dealing_order_info_dict[code][4] = data[3]
             else:
-                # 淇濆瓨涓婁竴鏉℃暟鎹�
-                async_log_util.info(hx_logger_l2_transaction_desc, f"{code}#{cls.__dealing_order_info_dict[code]}")
-                # 璁剧疆鏈�杩戞垚浜ゅ畬鎴愮殑涓�鏉℃暟鎹�
-                deal_info = cls.__dealing_order_info_dict[code]
-                cls.__latest_deal_order_info_dict[code] = deal_info
-                # 鏄惁涓哄ぇ涔板崟
-                if deal_info[2] >= threshold_big_money:
-                    big_buy_datas.append(deal_info)
-                if deal_info[2] >= 500000:
-                    normal_buy_datas.append(deal_info)
+                if cls.__dealing_order_info_dict[code][0] == data[6]:
+                    # 鎴愪氦鍚屼竴涓鍗曞彿
+                    cls.__dealing_order_info_dict[code][1] += data[2]
+                    cls.__dealing_order_info_dict[code][2] += data[2] * data[1]
+                    cls.__dealing_order_info_dict[code][4] = data[3]
+                else:
+                    # 淇濆瓨涓婁竴鏉℃暟鎹�
+                    async_log_util.info(hx_logger_l2_transaction_desc, f"{code}#{cls.__dealing_order_info_dict[code]}")
+                    # 璁剧疆鏈�杩戞垚浜ゅ畬鎴愮殑涓�鏉℃暟鎹�
+                    deal_info = cls.__dealing_order_info_dict[code]
+                    cls.__latest_deal_order_info_dict[code] = deal_info
+                    # 鏄惁涓哄ぇ涔板崟
+                    if deal_info[2] >= threshold_big_money:
+                        big_buy_datas.append(deal_info)
+                    if deal_info[2] >= 500000:
+                        normal_buy_datas.append(deal_info)
 
-                # 鍒濆鍖栨湰鏉℃暟鎹�
-                cls.__dealing_order_info_dict[code] = [data[6], data[2], data[2] * data[1], data[3], data[3]]
+                    # 鍒濆鍖栨湰鏉℃暟鎹�
+                    cls.__dealing_order_info_dict[code] = [data[6], data[2], data[2] * data[1], data[3], data[3]]
+            # 缁熻涓诲姩涔�(涔板崟鍙峰ぇ浜庡崠鍗曞彿)
+            try:
+                if data[6] > data[7]:
+                    if code not in cls.__dealing_active_buy_order_info_dict:
+                        # 鏁版嵁鏍煎紡[璁㈠崟鍙凤紝鎬昏偂鏁帮紝鎴愪氦閲戦,鎴愪氦寮�濮嬫椂闂�,鎴愪氦缁撴潫鏃堕棿]
+                        cls.__dealing_active_buy_order_info_dict[code] = [data[6], data[2], data[2] * data[1], data[3],
+                                                                          data[3]]
+                    else:
+                        if cls.__dealing_active_buy_order_info_dict[code][0] == data[6]:
+                            # 鎴愪氦鍚屼竴涓鍗曞彿
+                            cls.__dealing_active_buy_order_info_dict[code][1] += data[2]
+                            cls.__dealing_active_buy_order_info_dict[code][2] += data[2] * data[1]
+                            cls.__dealing_active_buy_order_info_dict[code][4] = data[3]
+                        else:
+                            # 鍒濆鍖栨湰鏉℃暟鎹�
+                            cls.__dealing_active_buy_order_info_dict[code] = [data[6], data[2], data[2] * data[1],
+                                                                              data[3], data[3]]
+            except:
+                pass
+
         return big_buy_datas, normal_buy_datas
 
 

--
Gitblit v1.8.0