From a445f9a2650b9826fa72a203f3144a3ac27509a0 Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期一, 03 六月 2024 10:46:14 +0800
Subject: [PATCH] 代码结构修复
---
l2/l2_data_manager_new.py | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/l2/l2_data_manager_new.py b/l2/l2_data_manager_new.py
index f036a25..2267a60 100644
--- a/l2/l2_data_manager_new.py
+++ b/l2/l2_data_manager_new.py
@@ -20,7 +20,8 @@
from db import redis_manager_delegate as redis_manager
from third_data.code_plate_key_manager import CodePlateKeyBuyManager, KPLCodeJXBlockManager
from trade import trade_manager, trade_queue_manager, l2_trade_factor, l2_trade_util, \
- trade_result_manager, current_price_process_manager, trade_data_manager, trade_huaxin, trade_record_log_util
+ trade_result_manager, current_price_process_manager, trade_data_manager, trade_huaxin, trade_record_log_util, \
+ trade_constant
from l2 import l2_data_manager, l2_log, l2_data_source_util, code_price_manager, \
transaction_progress, cancel_buy_strategy, place_order_single_data_manager
from l2.cancel_buy_strategy import DCancelBigNumComputer, \
@@ -35,7 +36,9 @@
from trade.trade_data_manager import CodeActualPriceProcessor, PlaceOrderCountManager
-from trade.trade_manager import TradeTargetCodeModeManager, AccountAvailableMoneyManager, MarketSituationManager
+from trade.trade_manager import TradeTargetCodeModeManager, AccountAvailableMoneyManager
+
+from settings.trade_setting import MarketSituationManager
import concurrent.futures
@@ -489,7 +492,7 @@
state = cls.__CodesTradeStateManager.get_trade_state_cache(code)
start_index = len(total_datas) - len(add_datas)
end_index = len(total_datas) - 1
- if state == trade_manager.TRADE_STATE_BUY_DELEGATED or state == trade_manager.TRADE_STATE_BUY_PLACE_ORDER or state == trade_manager.TRADE_STATE_BUY_SUCCESS:
+ if state == trade_constant.TRADE_STATE_BUY_DELEGATED or state == trade_constant.TRADE_STATE_BUY_PLACE_ORDER or state == trade_constant.TRADE_STATE_BUY_SUCCESS:
# 宸叉寕鍗�
cls.__process_order(code, start_index, end_index, capture_timestamp, is_first_code)
else:
@@ -697,7 +700,7 @@
with cls.__buy_lock_dict[code]:
# 鍒ゆ柇鏄惁鍙互涓嬪崟锛屼笉澶勪簬鍙笅鍗曠姸鎬侀渶瑕佽繑鍥�
state = cls.__CodesTradeStateManager.get_trade_state_cache(code)
- if state == trade_manager.TRADE_STATE_BUY_DELEGATED or state == trade_manager.TRADE_STATE_BUY_PLACE_ORDER or state == trade_manager.TRADE_STATE_BUY_SUCCESS:
+ if state == trade_constant.TRADE_STATE_BUY_DELEGATED or state == trade_constant.TRADE_STATE_BUY_PLACE_ORDER or state == trade_constant.TRADE_STATE_BUY_SUCCESS:
# 涓嶅浜庡彲涓嬪崟鐘舵��
return False
__start_time = tool.get_now_timestamp()
@@ -1847,7 +1850,7 @@
@classmethod
def __get_threshmoney(cls, code):
m, msg = cls.__l2PlaceOrderParamsManagerDict[code].get_m_val()
- if trade_manager.CodesTradeStateManager().get_trade_state_cache(code) == trade_manager.TRADE_STATE_NOT_TRADE:
+ if trade_manager.CodesTradeStateManager().get_trade_state_cache(code) == trade_constant.TRADE_STATE_NOT_TRADE:
# 棣栨涓嬪崟m鍊兼墿澶�1.5鍊�
m = int(m * 1.5)
return m, msg
--
Gitblit v1.8.0