From 57d3daa6d8edeba3b7b01ff9b1bfce8286b39583 Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期五, 08 十二月 2023 19:37:09 +0800
Subject: [PATCH] 独苗不下单/高位板看泛化板块
---
l2/l2_data_manager_new.py | 55 ++++++++++++++++++++++++++++++-------------------------
1 files changed, 30 insertions(+), 25 deletions(-)
diff --git a/l2/l2_data_manager_new.py b/l2/l2_data_manager_new.py
index dc675b1..e60f697 100644
--- a/l2/l2_data_manager_new.py
+++ b/l2/l2_data_manager_new.py
@@ -951,11 +951,11 @@
can_buy_result = CodePlateKeyBuyManager.can_buy(code)
if can_buy_result is None:
async_log_util.warning(logger_debug, "娌℃湁鑾峰彇鍒版澘鍧楃紦瀛橈紝灏嗚幏鍙栨澘鍧�")
- yesterday_codes = kpl_data_manager.get_yesterday_limit_up_codes()
+ yesterday_current_limit_up_records = kpl_data_manager.get_yesterday_current_limit_up_records()
CodePlateKeyBuyManager.update_can_buy_blocks(code,
kpl_data_manager.KPLLimitUpDataRecordManager.latest_origin_datas,
kpl_data_manager.KPLLimitUpDataRecordManager.total_datas,
- yesterday_codes,
+ yesterday_current_limit_up_records,
block_info.get_before_blocks_dict(),
kpl_data_manager.KPLLimitUpDataRecordManager.get_current_reason_codes_dict())
can_buy_result = CodePlateKeyBuyManager.can_buy(code)
@@ -967,6 +967,10 @@
can_buy_result = cls.__get_can_buy_block(code)
if can_buy_result is None:
return False, True, "灏氭湭鑾峰彇鍒版澘鍧椾俊鎭�"
+ if not can_buy_result[0] and can_buy_result[1]:
+ # 鐙嫍
+ return False, True, "鐙嫍涓嶄笅鍗�"
+
l2_log.debug(code, "鑾峰彇鍒扮殑鏉垮潡淇℃伅锛歿}", can_buy_result)
# -------閲忕殑绾︽潫--------
@@ -1005,29 +1009,30 @@
# HighIncreaseCodeManager().add_code(code)
return False, True, f"杩戞棩鍑虹幇鏈�澶ч噺锛屽綋鏃ラ噺姣�({cls.volume_rate_info[code][0]})灏忎簬0.6"
- if can_buy_result[1]:
- # 鐙嫍
- # ------鑷敱娴侀�氬競鍊肩害鏉�------
- zyltgb = global_util.zyltgb_map.get(code)
- if zyltgb:
- if zyltgb < 10 * 100000000:
- return False, True, f"鐙嫍锛岃嚜鐢辨祦閫氬皬浜�10浜匡紙{zyltgb}锛�"
- if code in cls.volume_rate_info and cls.volume_rate_info[code][0] < 0.6:
- return False, True, f"鐙嫍锛氶噺姣旓紙{cls.volume_rate_info[code][0]}锛夋湭杈惧埌60%"
-
- # 鍒ゆ柇鏄惁杩�2澶╂槸鍚︿负10澶╁唴鏈�澶ч噺
- if k_format and len(k_format) >= 10 and k_format[9]:
- # 鏄嫭鑻�
- if code in cls.volume_rate_info and cls.volume_rate_info[code][0] < 0.3:
- return False, True, f"杩�2澶╂湁10鏃ュ唴鏈�楂橀噺锛岄噺姣旓紙{cls.volume_rate_info[code][0]}锛夋湭杈惧埌30%"
- if now_timestamp < int("100000") or int("130000") <= now_timestamp < int("133000"):
- # 鐙嫍蹇呴』9:30-10:00鍜�13:00-13:30鏃堕棿娈靛唴涔�
- return True, False, f"鐙嫍锛歿can_buy_result[2]}"
- else:
- return False, True, f"鐙嫍锛氬綋鍓嶆椂闂翠笉鑳戒拱"
- else:
- if can_buy_result[0]:
- return True, False, can_buy_result[2]
+ # 鐙嫍涓嶅啀涓嬪崟
+ # if can_buy_result[1]:
+ # # 鐙嫍
+ # # ------鑷敱娴侀�氬競鍊肩害鏉�------
+ # zyltgb = global_util.zyltgb_map.get(code)
+ # if zyltgb:
+ # if zyltgb < 10 * 100000000:
+ # return False, True, f"鐙嫍锛岃嚜鐢辨祦閫氬皬浜�10浜匡紙{zyltgb}锛�"
+ # if code in cls.volume_rate_info and cls.volume_rate_info[code][0] < 0.6:
+ # return False, True, f"鐙嫍锛氶噺姣旓紙{cls.volume_rate_info[code][0]}锛夋湭杈惧埌60%"
+ #
+ # # 鍒ゆ柇鏄惁杩�2澶╂槸鍚︿负10澶╁唴鏈�澶ч噺
+ # if k_format and len(k_format) >= 10 and k_format[9]:
+ # # 鏄嫭鑻�
+ # if code in cls.volume_rate_info and cls.volume_rate_info[code][0] < 0.3:
+ # return False, True, f"杩�2澶╂湁10鏃ュ唴鏈�楂橀噺锛岄噺姣旓紙{cls.volume_rate_info[code][0]}锛夋湭杈惧埌30%"
+ # if now_timestamp < int("100000") or int("130000") <= now_timestamp < int("133000"):
+ # # 鐙嫍蹇呴』9:30-10:00鍜�13:00-13:30鏃堕棿娈靛唴涔�
+ # return True, False, f"鐙嫍锛歿can_buy_result[2]}"
+ # else:
+ # return False, True, f"鐙嫍锛氬綋鍓嶆椂闂翠笉鑳戒拱"
+ # else:
+ if can_buy_result[0]:
+ return True, False, can_buy_result[2]
return False, True, can_buy_result[2]
@classmethod
--
Gitblit v1.8.0