From 331d8caf63a7119c8cf2d1faef28b5450b8f40f5 Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期五, 11 十月 2024 18:41:24 +0800
Subject: [PATCH] bug修复/新增加接口
---
l2/l2_data_manager_new.py | 27 ++++++++++++++++-----------
1 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/l2/l2_data_manager_new.py b/l2/l2_data_manager_new.py
index 8214d08..e6b4b57 100644
--- a/l2/l2_data_manager_new.py
+++ b/l2/l2_data_manager_new.py
@@ -703,7 +703,12 @@
pass
@classmethod
- def start_buy(cls, code, last_data, last_data_index, is_first_code):
+ def __is_pre_can_buy(cls, code):
+ """
+ 棰勫垽鏂槸鍚﹀彲涔�
+ @param code:
+ @return锛�
+ """
if not cls.__TradeStateManager.is_can_buy_cache():
return False, True, f"浠婃棩宸茬姝氦鏄�", True
@@ -715,7 +720,13 @@
now_time_int = int(tool.get_now_time_str().replace(":", ""))
if now_time_int >= 145700:
return False, True, f"14:57鍚庝笉鑳戒氦鏄�", True
- cls.__buy(code, 0, last_data, last_data_index, is_first_code)
+ return True, False, f"", False
+
+ @classmethod
+ def start_buy(cls, code, last_data, last_data_index, is_first_code):
+ pre_result = cls.__is_pre_can_buy(code)
+ if pre_result[0]:
+ cls.__buy(code, 0, last_data, last_data_index, is_first_code)
@classmethod
def get_active_buy_blocks(cls, code):
@@ -927,17 +938,11 @@
@return:(鏄惁鍙互涓嬪崟, 鏄惁娓呯悊淇″彿鏁版嵁, 涓嶈兘涓嬪崟娑堟伅, 鏄惁绠楁湁鏁堟墽琛�)
"""
- if not cls.__TradeStateManager.is_can_buy_cache():
- return False, True, f"浠婃棩宸茬姝氦鏄�", True
+ pre_result = cls.__is_pre_can_buy(code)
+ if not pre_result[0]:
+ return pre_result[0],pre_result[1], pre_result[2], pre_result[3]
- if l2_trade_util.is_in_forbidden_trade_codes(code):
- return False, True, f"浠ｇ爜绂佹浜ゆ槗", True
-
- if cls.__PauseBuyCodesManager.is_in_cache(code):
- return False, True, f"璇ヤ唬鐮佽鏆傚仠浜ゆ槗", True
now_time_int = int(tool.get_now_time_str().replace(":", ""))
- if now_time_int >= 145700:
- return False, True, f"14:57鍚庝笉鑳戒氦鏄�", True
if 130100 >= now_time_int >= 112900 or now_time_int < 93100:
if now_time_int < 93100:
# 鍒ゆ柇杩�120澶╂槸鍚︽湁娑ㄥ仠
--
Gitblit v1.8.0