From e91b7aea968fc18495fdf7df8d49751129594966 Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期日, 26 五月 2024 09:16:14 +0800
Subject: [PATCH] 分离LSH撤

---
 test/l2_trade_test.py |   28 +++++++++++++++-------------
 1 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/test/l2_trade_test.py b/test/l2_trade_test.py
index 556f2c3..3a8f0bc 100644
--- a/test/l2_trade_test.py
+++ b/test/l2_trade_test.py
@@ -11,9 +11,9 @@
 from unittest import mock
 
 import constant
+from cancel_strategy.s_l_h_cancel_strategy import SCancelBigNumComputer
 from code_attribute import big_money_num_manager, gpcode_manager
 from db.redis_manager_delegate import RedisUtils
-from l2.huaxin import huaxin_delegate_postion_manager
 from l2.l2_sell_manager import L2MarketSellManager
 from l2.l2_transaction_data_manager import HuaXinSellOrderStatisticManager
 from log_module import log, log_export, async_log_util
@@ -26,7 +26,7 @@
 from third_data import kpl_util, kpl_data_manager, block_info
 from third_data.code_plate_key_manager import LimitUpCodesPlateKeyManager, CodePlateKeyBuyManager
 from third_data.kpl_data_manager import KPLDataManager
-from trade import trade_data_manager, current_price_process_manager, l2_trade_util, trade_manager, l2_trade_factor
+from trade import trade_data_manager, current_price_process_manager, l2_trade_util, trade_manager
 import l2.l2_data_manager_new, l2.l2_data_manager, l2.l2_data_util, l2.cancel_buy_strategy
 
 
@@ -89,7 +89,7 @@
 
     # @unittest.skip("璺宠繃姝ゅ崟鍏冩祴璇�")
     def test_trade(self):
-        constant.TEST=True
+        constant.TEST = True
         trade_manager.TradeStateManager().open_buy()
         threading.Thread(target=async_log_util.run_sync, daemon=True).start()
         code = "000691"
@@ -141,7 +141,6 @@
 
         # hook
         # tool.get_now_time_str = mock.Mock(return_value="09:35:00")
-
 
         # 鑾峰彇浜ゆ槗杩涘害
         trade_progress_list, buy_queues = log_export.get_trade_progress(code)
@@ -211,19 +210,19 @@
         code = "002288"
         l2.l2_data_util.load_l2_data(code)
         l2.l2_data_util.local_today_datas[code] = l2.l2_data_util.local_today_datas[code][:222]
-        l2.cancel_buy_strategy.SCancelBigNumComputer().set_real_place_order_index(code, 153, False)
+        SCancelBigNumComputer().set_real_place_order_index(code, 153, False)
 
         TradeBuyQueue.get_traded_index = mock.Mock(return_value=(117, False))
         order_begin_pos = l2_data_manager.OrderBeginPosInfo(buy_single_index=117, buy_exec_index=122)
         sell_order_info = [1517999, [[2996226, 300000, 5.06, (10223471, 4876395), (10223471, 4876395)]]]
-        l2.cancel_buy_strategy.SCancelBigNumComputer().set_big_sell_order_info_for_cancel(code, sell_order_info,
-                                                                                          order_begin_pos)
+        SCancelBigNumComputer().set_big_sell_order_info_for_cancel(code, sell_order_info,
+                                                                   order_begin_pos)
 
         sell_order_info = [508507, [[5564445, 100100, 5.08, (10372994, 4876545), (10372994, 4876546)]]]
-        l2.cancel_buy_strategy.SCancelBigNumComputer().set_big_sell_order_info_for_cancel(code, sell_order_info,
-                                                                                          order_begin_pos)
-        l2.cancel_buy_strategy.SCancelBigNumComputer().set_big_sell_order_info_for_cancel(code, sell_order_info,
-                                                                                          order_begin_pos)
+        SCancelBigNumComputer().set_big_sell_order_info_for_cancel(code, sell_order_info,
+                                                                   order_begin_pos)
+        SCancelBigNumComputer().set_big_sell_order_info_for_cancel(code, sell_order_info,
+                                                                   order_begin_pos)
 
     @unittest.skip("璺宠繃姝ゅ崟鍏冩祴璇�")
     def test_h_cancel(self):
@@ -234,9 +233,9 @@
         l2.l2_data_util.local_today_datas[code] = total_datas
         l2.l2_data_util.load_num_operate_map(l2.l2_data_util.local_today_num_operate_map, code, total_datas, True)
 
-    @unittest.skip("璺宠繃姝ゅ崟鍏冩祴璇�")
+    # @unittest.skip("璺宠繃姝ゅ崟鍏冩祴璇�")
     def test_block(self):
-        code = "002801"
+        code = "002055"
         # KPLCodeJXBlockManager().load_jx_blocks(code, 23.52,23.62,
         #                                        kpl_data_manager.KPLLimitUpDataRecordManager.get_current_reasons())
         #
@@ -246,6 +245,9 @@
         kpl_data_manager.KPLLimitUpDataRecordManager.save_record(tool.get_now_date_str(),
                                                                  kpl_data_manager.KPLDataManager.get_data(
                                                                      kpl_util.KPLDataType.LIMIT_UP))
+        limit_up_data = kpl_data_manager.KPLLimitUpDataRecordManager.record_code_dict.get(code)
+        if limit_up_data:
+            limit_up_time = tool.to_time_str(limit_up_data[2])
         CodePlateKeyBuyManager.update_can_buy_blocks(code,
                                                      kpl_data_manager.KPLLimitUpDataRecordManager.latest_origin_datas,
                                                      kpl_data_manager.KPLLimitUpDataRecordManager.total_datas,

--
Gitblit v1.8.0