From a348b18ca45f6a6fccb940c73f30b10b9b199309 Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期二, 01 八月 2023 14:12:37 +0800
Subject: [PATCH] bug修复
---
third_data/code_plate_key_manager.py | 28 ++++++++++++++++++++--------
1 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/third_data/code_plate_key_manager.py b/third_data/code_plate_key_manager.py
index 344f1bc..9a7a792 100644
--- a/third_data/code_plate_key_manager.py
+++ b/third_data/code_plate_key_manager.py
@@ -409,6 +409,8 @@
code_limit_up_reason_dict = {}
load_code_block()
msg_list = []
+
+ can_buy_blocks = []
for block in keys:
is_top_8_record, top_8_record = kpl_block_util.is_record_top_block(code, block, limit_up_record_datas,
yesterday_current_limit_up_codes, 20)
@@ -425,20 +427,24 @@
code_limit_up_reason_dict, shsz=True)
# 鑾峰彇涓绘澘鍘嗗彶韬綅
if is_top_4:
- is_open_limit_up, msg = kpl_block_util.is_shsz_open_limit_up(code, block, limit_up_record_datas,
- code_limit_up_reason_dict)
- if is_open_limit_up:
+ pen_limit_up_codes = kpl_block_util.get_shsz_open_limit_up_codes(code, block, limit_up_record_datas,
+ code_limit_up_reason_dict)
+ if pen_limit_up_codes:
# 涓绘澘寮�1
- if current_shsz_rank < 2 and record_shsz_rank < 2:
+ if current_shsz_rank < len(pen_limit_up_codes) + 1 and record_shsz_rank < len(
+ pen_limit_up_codes) + 1:
# 灞炰簬榫�1,榫�2
- return block, f"{block}锛歵op4娑ㄥ仠鏉垮潡锛屼富鏉垮紑1,灞炰簬榫�1/榫�2(瀹炴椂韬綅-{current_shsz_rank})"
+ can_buy_blocks.append((block,
+ f"{block}锛歵op4娑ㄥ仠鏉垮潡锛屼富鏉垮紑1({pen_limit_up_codes}),灞炰簬涓绘澘鍓嶉緳{len(pen_limit_up_codes) + 1}(瀹炴椂韬綅-{current_shsz_rank})"))
+ continue
else:
msg_list.append(
- f"鏉垮潡-{block}: top4娑ㄥ仠鏉垮潡锛屼富鏉垮紑1锛坽msg}锛�,涓嶄负涓绘澘榫�1榫�2锛堝疄鏃惰韩浣�-{current_shsz_rank},鍘嗗彶韬綅-{record_shsz_rank}锛�")
+ f"鏉垮潡-{block}: top4娑ㄥ仠鏉垮潡锛屼富鏉垮紑1锛坽pen_limit_up_codes}锛�,涓嶄负涓绘澘鍓嶉緳{len(pen_limit_up_codes) + 1}锛堝疄鏃惰韩浣�-{current_shsz_rank},鍘嗗彶韬綅-{record_shsz_rank}锛�")
continue
else:
if current_shsz_rank == 0 and record_shsz_rank < 2:
- return block, f"{block}锛歵op4娑ㄥ仠鏉垮潡锛岄潪涓绘澘寮�1锛屽睘浜庨緳1"
+ can_buy_blocks.append((block, f"{block}锛歵op4娑ㄥ仠鏉垮潡锛岄潪涓绘澘寮�1锛屽睘浜庨緳1"))
+ continue
else:
msg_list.append(
f"鏉垮潡-{block}: top4娑ㄥ仠鏉垮潡锛岄潪涓绘澘寮�1,涓嶄负涓绘澘榫�1锛堝疄鏃惰韩浣�-{current_shsz_rank},鍘嗗彶韬綅-{record_shsz_rank}锛�")
@@ -453,11 +459,17 @@
else:
# 鏄惁涓轰富鏉块緳1锛堝疄鏃堕緳1锛屽巻鍙查緳2浠ュ唴锛�
if current_shsz_rank == 0 and record_shsz_rank < 2:
- return block, f"{block}锛氫笉鏄痶op4娑ㄥ仠鏉垮潡锛屾弧瓒崇簿閫�/琛屼笟娴佸叆瑕佹眰锛屾弧瓒充富鏉块緳1"
+ can_buy_blocks.append((block, f"{block}锛氫笉鏄痶op4娑ㄥ仠鏉垮潡锛屾弧瓒崇簿閫�/琛屼笟娴佸叆瑕佹眰锛屾弧瓒充富鏉块緳1"))
+ continue
else:
msg_list.append(
f"鏉垮潡-{block}: 涓嶆槸top4娑ㄥ仠鏉垮潡锛屾弧瓒崇簿閫�/琛屼笟娴佸叆瑕佹眰,涓嶄负涓绘澘榫�1锛堝疄鏃惰韩浣�-{current_shsz_rank},鍘嗗彶韬綅-{record_shsz_rank}锛�")
continue
+ if len(can_buy_blocks) == len(keys):
+ blocks = "/".join([x[0] for x in can_buy_blocks])
+ blocks_msg = "\n".join([x[1] for x in can_buy_blocks])
+ return blocks, blocks_msg
+
return None, "\n".join(msg_list)
# 鏄惁鍙互涓嬪崟
--
Gitblit v1.8.0