From b5722d08b369ec10f667eeec3e3040b1b4be2b16 Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期三, 24 四月 2024 18:15:50 +0800
Subject: [PATCH] L2去除日志

---
 l2/l2_transaction_data_manager.py |   30 +++++++++++++++++++++---------
 1 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/l2/l2_transaction_data_manager.py b/l2/l2_transaction_data_manager.py
index 011de92..7bcd474 100644
--- a/l2/l2_transaction_data_manager.py
+++ b/l2/l2_transaction_data_manager.py
@@ -23,7 +23,7 @@
     """
     __total_buy_datas_dict = {}
     __total_sell_datas_dict = {}
-    __instance=None
+    __instance = None
 
     def __new__(cls, *args, **kwargs):
         if not cls.__instance:
@@ -139,7 +139,7 @@
         """
         鑾峰彇褰撳墠姝e湪鎴愪氦鐨勬暟鎹�
         @param code:
-        @return: [涔板崟鍙�,鎬昏偂鏁�,鎬婚噾棰漖
+        @return: [璁㈠崟鍙凤紝鎬昏偂鏁帮紝鎴愪氦閲戦,鎴愪氦寮�濮嬫椂闂�,鎴愪氦缁撴潫鏃堕棿]
         """
         return cls.__dealing_order_info_dict.get(code)
 
@@ -158,12 +158,13 @@
             #                   data['SellNo'], data['ExecType']))
 
             if code not in cls.__dealing_order_info_dict:
-                # 鏁版嵁鏍煎紡[璁㈠崟鍙凤紝鎬昏偂鏁帮紝鎴愪氦閲戦]
-                cls.__dealing_order_info_dict[code] = [data[6], data[2], data[2] * data[1]]
+                # 鏁版嵁鏍煎紡[璁㈠崟鍙凤紝鎬昏偂鏁帮紝鎴愪氦閲戦,鎴愪氦寮�濮嬫椂闂�,鎴愪氦缁撴潫鏃堕棿]
+                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]}")
@@ -174,7 +175,7 @@
                 if deal_info[2] >= 2990000:
                     big_buy_datas.append(deal_info)
                 # 鍒濆鍖栨湰鏉℃暟鎹�
-                cls.__dealing_order_info_dict[code] = [data[6], data[2], data[2] * data[1]]
+                cls.__dealing_order_info_dict[code] = [data[6], data[2], data[2] * data[1], data[3], data[3]]
         return big_buy_datas
 
 
@@ -305,15 +306,14 @@
                         # 澶т簬50w鍔犲叆鍗栧崟
                         money = info[1] * info[2]
                         if money >= 500000:
-                            # 璁㈠崟閲岄潰鏈夋垚浜ゆ槸涓诲姩鍗栧氨绠椾富鍔ㄥ崠
-                            l2_log.info(code, hx_logger_l2_transaction_sell_order,
-                                        f"{cls.__latest_sell_order_dict[code]}")
                             cls.__big_sell_order_ids_dict[code].add(info[0])
                             cls.__big_sell_order_info_dict[code][info[0]] = info
                             cls.__big_sell_order_info_list_dict[code].append(info)
                         # 鍙繚鐣�10w浠ヤ笂鐨勫崟
                         if money > 100000:
                             cls.__latest_all_sell_orders_dict[code].append(info)
+                            l2_log.info(code, hx_logger_l2_transaction_sell_order,
+                                        f"{info}")
                         if limit_up_price == info[2]:
                             # 灏嗘定鍋滀富鍔ㄥ崠璁板叆鏃ュ織
                             l2_log.info(code, hx_logger_l2_active_sell, f"{info}")
@@ -374,7 +374,15 @@
 
     # 鑾峰彇鏈�杩戞垚浜ゆ暟鎹�
     @classmethod
-    def get_latest_transaction_datas(cls, code, min_sell_order_no=None, min_deal_time=None):
+    def get_latest_transaction_datas(cls, code, min_sell_order_no=None, min_deal_time=None, min_sell_money=None):
+        """
+        鑾峰彇鏈�杩戠殑涓诲姩鍗栨垚浜や俊鎭�
+        @param code:
+        @param min_sell_order_no:
+        @param min_deal_time:
+        @param min_sell_money:
+        @return:
+        """
         total_orders = []
         sell_orders = cls.__latest_all_sell_orders_dict.get(code)
         if sell_orders:
@@ -385,6 +393,10 @@
 
                 if min_sell_order_no and min_sell_order_no > sell_orders[i][0]:
                     continue
+                if min_sell_money and sell_orders[i][1] * sell_orders[i][2] < min_sell_money:
+                    # 杩囨护灏忛噾棰�
+                    continue
+
                 total_orders.append(sell_orders[i])
         if code in cls.__latest_sell_order_dict:
             if min_sell_order_no:

--
Gitblit v1.8.0