From 0e68e24f54db11d340785b17570fff2bc5fc7ac6 Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期一, 24 七月 2023 13:05:16 +0800
Subject: [PATCH] bug修复
---
third_data/code_plate_key_manager.py | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/third_data/code_plate_key_manager.py b/third_data/code_plate_key_manager.py
index 67639df..cb77e22 100644
--- a/third_data/code_plate_key_manager.py
+++ b/third_data/code_plate_key_manager.py
@@ -377,7 +377,12 @@
load_code_block()
msg_list = []
for block in keys:
- is_top_4 = kpl_block_util.is_top_block(code, block, limit_up_record_datas, 4)
+ is_top_8_record, top_8_record = kpl_block_util.is_record_top_block(code, block, limit_up_record_datas, 8)
+ is_top_4_current, top_4_current = kpl_block_util.is_current_top_block(code, block, current_limit_up_datas, 4)
+ is_top_4 = is_top_8_record and is_top_4_current
+ msg_list.append(f"瀹炴椂top4: {top_4_current}")
+ msg_list.append(f"鍘嗗彶top8: {top_8_record}")
+
# 鑾峰彇涓绘澘瀹炴椂韬綅
current_shsz_rank = kpl_block_util.get_code_current_rank(code, block, current_limit_up_datas,
code_limit_up_reason_dict, shsz=True)
@@ -391,14 +396,14 @@
# 涓绘澘寮�1
if current_shsz_rank < 2 and record_shsz_rank < 2:
# 灞炰簬榫�1,榫�2
- return block, f"top4娑ㄥ仠鏉垮潡锛屼富鏉垮紑1,灞炰簬榫�1/榫�2(瀹炴椂韬綅-{current_shsz_rank})"
+ return block, f"{block}锛歵op4娑ㄥ仠鏉垮潡锛屼富鏉垮紑1,灞炰簬榫�1/榫�2(瀹炴椂韬綅-{current_shsz_rank})"
else:
msg_list.append(
f"鏉垮潡-{block}: top4娑ㄥ仠鏉垮潡锛屼富鏉垮紑1锛坽msg}锛�,涓嶄负涓绘澘榫�1榫�2锛堝疄鏃惰韩浣�-{current_shsz_rank},鍘嗗彶韬綅-{record_shsz_rank}锛�")
continue
else:
if current_shsz_rank == 0 and record_shsz_rank < 2:
- return block, "top4娑ㄥ仠鏉垮潡锛岄潪涓绘澘寮�1锛屽睘浜庨緳1"
+ return block, f"{block}锛歵op4娑ㄥ仠鏉垮潡锛岄潪涓绘澘寮�1锛屽睘浜庨緳1"
else:
msg_list.append(
f"鏉垮潡-{block}: top4娑ㄥ仠鏉垮潡锛岄潪涓绘澘寮�1,涓嶄负涓绘澘榫�1锛堝疄鏃惰韩浣�-{current_shsz_rank},鍘嗗彶韬綅-{record_shsz_rank}锛�")
@@ -413,7 +418,7 @@
else:
# 鏄惁涓轰富鏉块緳1锛堝疄鏃堕緳1锛屽巻鍙查緳2浠ュ唴锛�
if current_shsz_rank == 0 and record_shsz_rank < 2:
- return block, "涓嶆槸top4娑ㄥ仠鏉垮潡锛屾弧瓒崇簿閫�/琛屼笟娴佸叆瑕佹眰锛屾弧瓒充富鏉块緳1"
+ return block, f"{block}锛氫笉鏄痶op4娑ㄥ仠鏉垮潡锛屾弧瓒崇簿閫�/琛屼笟娴佸叆瑕佹眰锛屾弧瓒充富鏉块緳1"
else:
msg_list.append(
f"鏉垮潡-{block}: 涓嶆槸top4娑ㄥ仠鏉垮潡锛屾弧瓒崇簿閫�/琛屼笟娴佸叆瑕佹眰,涓嶄负涓绘澘榫�1锛堝疄鏃惰韩浣�-{current_shsz_rank},鍘嗗彶韬綅-{record_shsz_rank}锛�")
@@ -423,7 +428,7 @@
# 鏄惁鍙互涓嬪崟
# 杩斿洖锛氭槸鍚﹀彲浠ヤ笅鍗�,娑堟伅,鏉垮潡绫诲瀷
@classmethod
- def can_buy(cls, code, current_limit_up_datas, limit_up_record_datas,before_blocks_dict):
+ def can_buy(cls, code, current_limit_up_datas, limit_up_record_datas, before_blocks_dict):
if constant.TEST:
return True, "", cls.BLOCK_TYPE_NONE
block, block_msg = cls.get_can_buy_block(code, current_limit_up_datas,
--
Gitblit v1.8.0