From a4af22e525c8dc0a5b178f05f2b2f745233990bb Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期一, 25 三月 2024 17:26:35 +0800
Subject: [PATCH] G撤修改/买单价30块以下的票/L2接口修改
---
l2/l2_transaction_data_processor.py | 34 ++++++++--------------------------
1 files changed, 8 insertions(+), 26 deletions(-)
diff --git a/l2/l2_transaction_data_processor.py b/l2/l2_transaction_data_processor.py
index 3b8d48e..6dd80fd 100644
--- a/l2/l2_transaction_data_processor.py
+++ b/l2/l2_transaction_data_processor.py
@@ -9,8 +9,7 @@
from l2.l2_transaction_data_manager import HuaXinBuyOrderManager, HuaXinSellOrderStatisticManager
from log_module import async_log_util
from log_module.log import hx_logger_l2_debug, logger_l2_trade_buy_queue, logger_debug, hx_logger_l2_upload
-from msg import buy_order_msg_manager
-from trade import current_price_process_manager, trade_manager
+from trade import current_price_process_manager
from trade.deal_big_money_manager import DealOrderNoManager
@@ -25,7 +24,6 @@
d = datas[i]
buy_no = f"{d[6]}"
if buyno_map and buy_no in buyno_map:
- async_log_util.info(hx_logger_l2_debug, f"{code}鎴愪氦杩涘害锛歿buyno_map[buy_no]['index']}")
buy_progress_index = buyno_map[buy_no]["index"]
break
return buy_progress_index
@@ -38,11 +36,12 @@
__start_time = time.time()
try:
buyno_map = l2_data_util.local_today_buyno_map.get(code)
- if not buyno_map:
- if trade_manager.CodesTradeStateManager().get_trade_state(
- code) != trade_manager.TRADE_STATE_NOT_TRADE:
- l2_data_util.load_l2_data(code)
- buyno_map = l2_data_util.local_today_buyno_map.get(code)
+ # 鏆傛椂涓嶉渶瑕侀噸鏂板姞杞借幏鍙�
+ # if not buyno_map:
+ # if trade_manager.CodesTradeStateManager().get_trade_state_cache(
+ # code) != trade_manager.TRADE_STATE_NOT_TRADE:
+ # l2_data_util.load_l2_data(code)
+ # buyno_map = l2_data_util.local_today_buyno_map.get(code)
if buyno_map is None:
buyno_map = {}
@@ -78,7 +77,7 @@
if need_cancel:
# async_log_util.error(logger_debug, f"{code} S鍓嶆挙鍗曪細{cancel_msg}")
L2TradeDataProcessor.cancel_buy(code, f"S鍚庢挙:{cancel_msg}")
-
+ GCancelBigNumComputer().set_big_sell_order_info(code, big_sell_order_info)
except Exception as e:
async_log_util.error(logger_debug, f"鍗栧崟缁熻寮傚父锛歿big_sell_order_info}")
logger_debug.exception(e)
@@ -120,28 +119,11 @@
if order_begin_pos and order_begin_pos.buy_exec_index and order_begin_pos.buy_exec_index > -1:
HourCancelBigNumComputer().set_transaction_index(code, order_begin_pos.buy_single_index,
buy_progress_index)
- # cresult = FCancelBigNumComputer().need_cancel_for_deal_fast(code, buy_progress_index)
- # if cresult[0] and not DCancelBigNumComputer().has_auto_cancel_rules(code):
- # L2TradeDataProcessor.cancel_buy(code, f"涓嬪崟30s鍐呮帓鍗曚笉瓒�:{cresult[1]}")
-
cresult = FCancelBigNumComputer().need_cancel_for_deal_fast_with_total_sell(code,
buy_progress_index,
order_begin_pos)
if cresult[0] and not DCancelBigNumComputer().has_auto_cancel_rules(code):
L2TradeDataProcessor.cancel_buy(code, f"3s鍐呮垚浜ゅお澶�:{cresult[1]}")
-
- # ---------------------------------鎴愪氦杩涘害浣嶅彉鍖�-------------------------------
- # if buy_progress_index_changed:
- # # 浜ゆ槗杩涘害鍙樺寲锛屽垽鏂埌鐪熷疄涓嬪崟浣嶇疆鐨勮窛绂�
- # real_order_index = SCancelBigNumComputer().get_real_place_order_index_cache(code)
- # if real_order_index and real_order_index >= buy_progress_index:
- # # 鍙戦�佷笅鍗曟秷鎭�
- # try:
- # buy_order_msg_manager.almost_deal(code, real_order_index, buy_progress_index)
- # buy_order_msg_manager.follow_not_enough(code, order_begin_pos.buy_exec_index,
- # real_order_index)
- # except Exception as e:
- # logger_debug.exception(e)
else:
pass
if order_begin_pos and order_begin_pos.buy_exec_index and order_begin_pos.buy_exec_index > -1:
--
Gitblit v1.8.0