From ab11008d660832876dce7c6d05a2b5be0da1dd20 Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期日, 23 七月 2023 23:51:16 +0800
Subject: [PATCH] 选票板块即将更改
---
l2/l2_data_manager_new.py | 29 +++++------------------------
1 files changed, 5 insertions(+), 24 deletions(-)
diff --git a/l2/l2_data_manager_new.py b/l2/l2_data_manager_new.py
index 35c0a78..30015b9 100644
--- a/l2/l2_data_manager_new.py
+++ b/l2/l2_data_manager_new.py
@@ -5,7 +5,7 @@
limit_up_time_manager, global_data_loader, gpcode_manager
import constant
from l2.huaxin import l2_huaxin_util, huaxin_delegate_postion_manager
-from third_data import kpl_data_manager
+from third_data import kpl_data_manager, block_info
from utils import global_util, ths_industry_util, tool
import l2_data_util
from db import redis_manager
@@ -851,32 +851,13 @@
zyltgb = global_util.zyltgb_map.get(code)
if zyltgb >= 80 * 100000000:
return True, False, "{9:30:00-9:35:00}鑷敱甯傚�尖墺80浜�"
-
- # 鑾峰彇娑ㄥ仠
- latest_2_day_limit_up_datas_temp = kpl_data_manager.get_current_limit_up_data_records(2)
- latest_2_day_limit_up_datas = []
- for d in latest_2_day_limit_up_datas_temp:
- latest_2_day_limit_up_datas.extend(d[1])
# 鍒ゆ柇鏉垮潡
- plate_can_buy, msg, block_type = CodePlateKeyBuyManager.can_buy(code,
- kpl_data_manager.KPLLimitUpDataRecordManager.latest_origin_datas,
- latest_2_day_limit_up_datas,
- kpl_data_manager.KPLLimitUpDataRecordManager.total_datas)
+ plate_can_buy, msg = CodePlateKeyBuyManager.can_buy(code,
+ kpl_data_manager.KPLLimitUpDataRecordManager.latest_origin_datas,
+ kpl_data_manager.KPLLimitUpDataRecordManager.total_datas,block_info.get_before_blocks_dict())
if not plate_can_buy:
return False, True, msg
-
- has_k_format = is_has_k_format(score_info)
- # 鐙嫍
- if block_type == CodePlateKeyBuyManager.BLOCK_TYPE_START_UP:
- # 蹇呴』婊¤冻锛堝垎鏁扳墺150涓斾笂鏉挎椂閲忊墺40 % 涓旀湁K绾垮舰鎬侊級鎴栵紙鍏锋湁杈ㄨ瘑搴︼級鐨勬墠鑳戒拱
- if has_k_format and score_index >= 0 and volume_rate_info[0] >= 0.4:
- return True, False, "鐙嫍锛氬垎鏁扳墺150涓斾笂鏉挎椂閲忊墺40% 涓旀湁K绾垮舰鎬�"
- elif score_info[1][3][8][0]:
- return True, False, "鐙嫍锛氬叿鏈夎鲸璇嗗害"
- else:
- return False, True, f"鐙嫍锛氫笉婊¤冻涔板叆鏉′欢"
- else:
- return True, False, msg
+ return True, False, msg
# if volume_rate_info[0] < 0.4:
# return False, True, f"閲忓ぇ浜�40%鎵嶄笅鍗�,閲忔瘮锛歿volume_rate_info[0]}"
--
Gitblit v1.8.0