From ffc5b9eb80eb5bd43077a0ce96e0fb2ea4c8d62c Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期三, 25 十月 2023 11:31:58 +0800
Subject: [PATCH] bug修复

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

diff --git a/l2/l2_transaction_data_manager.py b/l2/l2_transaction_data_manager.py
index 1b21b48..389bc76 100644
--- a/l2/l2_transaction_data_manager.py
+++ b/l2/l2_transaction_data_manager.py
@@ -6,7 +6,7 @@
 from code_attribute import gpcode_manager
 from l2 import l2_data_util, l2_data_manager, transaction_progress
 from l2.cancel_buy_strategy import LCancelRateManager, DCancelBigNumComputer, LCancelBigNumComputer, \
-    SecondCancelBigNumComputer
+    SecondCancelBigNumComputer, HourCancelBigNumComputer
 from l2.l2_data_manager_new import L2TradeDataProcessor
 from l2.l2_data_util import L2DataUtil
 from log_module import async_log_util
@@ -72,31 +72,37 @@
                     rate = round(total_deal_nums / (thresh_hold_money // (float(limit_up_price) * 100)), 2)
                     LCancelRateManager().set_big_num_deal_rate(code, rate)
 
+                    # 鑾峰彇鎵ц浣嶆椂闂�
+            buy_single_index, buy_exec_index, compute_index, num, count, max_num_set, volume_rate = l2_data_manager.TradePointManager().get_buy_compute_start_data_cache(code)
             if buy_progress_index is not None:
-                # 鑾峰彇鎵ц浣嶆椂闂�
-                buy_single_index, buy_exec_index, compute_index, num, count, max_num_set, volume_rate = l2_data_manager.TradePointManager().get_buy_compute_start_data_cache(
-                    code)
                 cls.__TradeBuyQueue.set_traded_index(code, buy_progress_index)
                 async_log_util.info(logger_l2_trade_buy_queue, "鑾峰彇鎴愪氦浣嶇疆鎴愬姛锛� code-{} index-{}", code,
                                     buy_progress_index)
-                limit_up_price = gpcode_manager.get_limit_up_price(code)
-                if buy_exec_index and buy_exec_index > -1:
-                    m_base_val = L2PlaceOrderParamsManager.get_base_m_val(code)
-                    need_cancel, msg = DCancelBigNumComputer().set_trade_progress(code,
-                                                                                  buy_progress_index,
-                                                                                  buy_exec_index,
-                                                                                  total_datas,
-                                                                                  m_base_val,
-                                                                                  limit_up_price)
-                    if need_cancel:
-                        L2TradeDataProcessor.cancel_buy(code, f"D鎾�:{msg}", source="d_cancel")
+                # limit_up_price = gpcode_manager.get_limit_up_price(code)
+                # 娉ㄩ噴鎺塂鎾ゅ崟
+                # if buy_exec_index and buy_exec_index > -1:
+                #     m_base_val = L2PlaceOrderParamsManager.get_base_m_val(code)
+                #     need_cancel, msg = DCancelBigNumComputer().set_trade_progress(code,
+                #                                                                   buy_progress_index,
+                #                                                                   buy_exec_index,
+                #                                                                   total_datas,
+                #                                                                   m_base_val,
+                #                                                                   limit_up_price)
+                #     if need_cancel:
+                #         L2TradeDataProcessor.cancel_buy(code, f"D鎾�:{msg}", source="d_cancel")
 
                 LCancelBigNumComputer().set_trade_progress(code, buy_progress_index, total_datas)
                 SecondCancelBigNumComputer().set_transaction_index(
                     code,
                     buy_progress_index)
+                if buy_exec_index and buy_exec_index > -1:
+                    HourCancelBigNumComputer().set_transaction_index(code, buy_progress_index)
             else:
                 pass
+            if buy_exec_index and buy_exec_index > -1:
+                # 瑙﹀彂L鎾や笂閲嶆柊璁$畻
+                LCancelBigNumComputer().re_compute_l_up_watch_indexes(code)
+
         except Exception as e:
             hx_logger_l2_transaction.exception(e)
         finally:

--
Gitblit v1.8.0