From 7b44f8947a94dbe4f7c23a43e6fbfe331f93d29b Mon Sep 17 00:00:00 2001 From: Administrator <admin@example.com> Date: 星期一, 19 八月 2024 16:58:55 +0800 Subject: [PATCH] 整体撤单比例不足加入提示原因 --- third_data/code_plate_key_manager.py | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/third_data/code_plate_key_manager.py b/third_data/code_plate_key_manager.py index 3f2a6de..80903ff 100644 --- a/third_data/code_plate_key_manager.py +++ b/third_data/code_plate_key_manager.py @@ -8,11 +8,12 @@ import time import constant -from code_attribute import code_nature_analyse from db.redis_manager_delegate import RedisUtils from third_data import kpl_block_util, kpl_api, kpl_util from settings.trade_setting import MarketSituationManager -from utils import global_util, tool, buy_condition_util +from third_data.history_k_data_manager import HistoryKDataManager +from third_data.history_k_data_util import HistoryKDatasUtils +from utils import global_util, tool, buy_condition_util, init_data_util from log_module import log, async_log_util from db import redis_manager_delegate as redis_manager @@ -93,7 +94,7 @@ # logger_kpl_block_can_buy.info(f"鍑嗗鏇存柊绮鹃�夋澘鍧楋細{code}-{buy_1_price}-{limit_up_price}") if limit_up_price and buy_1_price: # 澶勭悊涔�1,鍗�1淇℃伅 - pre_close_price = round(float(limit_up_price) / 1.1, 2) + pre_close_price = round(float(limit_up_price) / tool.get_limit_up_rate(code), 2) # 濡傛灉娑ㄥ箙澶т簬7%灏辫鍙栨澘鍧� price_rate = (buy_1_price - pre_close_price) / pre_close_price if price_rate > 0.07: @@ -760,7 +761,7 @@ is_strong_block = False # 鏈�澶氫拱鑰佸嚑 - RANKS = [5, 4, 3, 3, 3, 2, 2] + RANKS = [6, 5, 4, 4, 3, 3, 2] RANK_TIMES = ["10:00:00", "10:30:00", "11:00:00", "11:30:00", "13:30:00", "14:00:00", "15:00:00"] now_time_str = tool.get_now_time_str() max_rank = 2 @@ -800,10 +801,12 @@ is_active_buy = cls.__is_need_active_buy(code, block, current_shsz_rank, len(current_open_limit_up_codes)) if current_shsz_rank < len(current_open_limit_up_codes) + max_rank: - return True, False, f"銆恵block}銆戝墠鎺掍唬鐮侊細{current_shsz_rank}", is_strong_block, is_active_buy, current_shsz_rank, len( + return True, len(block_codes | { + code}) <= 1, f"銆恵block}銆戝墠鎺掍唬鐮侊細{current_shsz_rank}", is_strong_block, is_active_buy, current_shsz_rank, len( block_codes), len(block_codes_records) else: - return False, False, f"銆恵block}銆戝墠鎺掍唬鐮侊細{front_current_shsz_rank_codes} 瓒呰繃{len(current_open_limit_up_codes) + max_rank}涓�", is_strong_block, is_active_buy, current_shsz_rank, len( + return False, len(block_codes | { + code}) <= 1, f"銆恵block}銆戝墠鎺掍唬鐮侊細{front_current_shsz_rank_codes} 瓒呰繃{len(current_open_limit_up_codes) + max_rank}涓�", is_strong_block, is_active_buy, current_shsz_rank, len( block_codes), len(block_codes_records) # 鑾峰彇鍙互涔扮殑鏉垮潡 -- Gitblit v1.8.0