From ad3de9ee593d5ed555104b7229e26a71746ae477 Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期五, 12 一月 2024 17:42:46 +0800
Subject: [PATCH] 删除老的F撤
---
l2/l2_data_manager_new.py | 25 +------------------------
1 files changed, 1 insertions(+), 24 deletions(-)
diff --git a/l2/l2_data_manager_new.py b/l2/l2_data_manager_new.py
index 0ffab6c..398ed10 100644
--- a/l2/l2_data_manager_new.py
+++ b/l2/l2_data_manager_new.py
@@ -23,7 +23,7 @@
from l2 import l2_data_manager, l2_log, l2_data_source_util, code_price_manager, \
transaction_progress, cancel_buy_strategy, l2_data_log
from l2.cancel_buy_strategy import SecondCancelBigNumComputer, HourCancelBigNumComputer, DCancelBigNumComputer, \
- LCancelBigNumComputer, LatestCancelIndexManager, FastCancelBigNumComputer, LCancelRateManager, GCancelBigNumComputer
+ LCancelBigNumComputer, LatestCancelIndexManager, LCancelRateManager, GCancelBigNumComputer
from l2.l2_data_manager import L2DataException, OrderBeginPosInfo
from l2.l2_data_util import local_today_datas, L2DataUtil, local_today_num_operate_map, local_today_buyno_map, \
local_latest_datas, local_today_canceled_buyno_map
@@ -296,12 +296,6 @@
@classmethod
def set_real_place_order_index(cls, code, index, order_begin_pos: OrderBeginPosInfo):
trade_record_log_util.add_real_place_order_position_log(code, index, order_begin_pos.buy_single_index)
- if order_begin_pos.mode == OrderBeginPosInfo.MODE_FAST:
- need_cancel = FastCancelBigNumComputer().set_real_order_index(code, index)
- if need_cancel:
- l2_log.debug(code, "瑙﹀彂鎾ゅ崟锛屾挙鍗曚綅缃細{} 锛屾挙鍗曞師鍥狅細{}", index, "F鎾や笉澶�2绗旇Е鍙戞挙鍗�")
- cls.cancel_buy(code, msg="F鎾や笉澶�2绗旇Е鍙戞挙鍗�")
- return
l2_log.debug(code, "璁剧疆鐪熷疄涓嬪崟浣嶏細{}", index)
cancel_buy_strategy.set_real_place_position(code, index, order_begin_pos.buy_single_index)
@@ -524,20 +518,6 @@
pass
return None, ""
- # F鎾�
- def f_cancel(_buy_single_index, _buy_exec_index):
- try:
- b_need_cancel, b_cancel_data = FastCancelBigNumComputer().need_cancel(code, start_index, end_index,
- order_begin_pos)
- if b_need_cancel and b_cancel_data:
- return b_cancel_data, f"F鎾�"
- except Exception as e:
- if constant.TEST:
- logging.exception(e)
- async_log_util.error(logger_l2_error,
- f"F鎾ゅ嚭閿� 鍙傛暟锛歜uy_single_index-{_buy_single_index} buy_exec_index-{_buy_exec_index} 閿欒鍘熷洜锛歿str(e)}")
- async_log_util.exception(logger_l2_error, e)
- return None, ""
# L鎾�
def l_cancel(_buy_single_index, _buy_exec_index):
@@ -593,9 +573,6 @@
if order_begin_pos.buy_volume_rate is None:
buy_volume_rate = 0.2
cancel_data, cancel_msg = None, ""
- if order_begin_pos.mode == OrderBeginPosInfo.MODE_FAST:
- cancel_data, cancel_msg = f_cancel(order_begin_pos.buy_single_index, order_begin_pos.buy_exec_index)
-
if not cancel_data:
cancel_data, cancel_msg = g_cancel(order_begin_pos.buy_single_index, order_begin_pos.buy_exec_index)
--
Gitblit v1.8.0