From 9039563a3c2e1349b0f71003f8a3f0b793924e82 Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期五, 22 十二月 2023 16:54:27 +0800
Subject: [PATCH] bug修复
---
third_data/code_plate_key_manager.py | 52 +++++++++++++++++++++++++++-------------------------
1 files changed, 27 insertions(+), 25 deletions(-)
diff --git a/third_data/code_plate_key_manager.py b/third_data/code_plate_key_manager.py
index a109fc0..23082eb 100644
--- a/third_data/code_plate_key_manager.py
+++ b/third_data/code_plate_key_manager.py
@@ -9,7 +9,7 @@
import constant
from db.redis_manager_delegate import RedisUtils
-from third_data import kpl_block_util, kpl_api
+from third_data import kpl_block_util, kpl_api, kpl_util
from utils import global_util, tool
from log_module import log, async_log_util
from db import redis_manager_delegate as redis_manager
@@ -518,12 +518,16 @@
if not general_blocks or block not in general_blocks:
# 娌″湪娉涘寲鏉垮潡涓�
continue
- if d[4].find("杩炴澘") > 0:
- if d[4].replace("杩炴澘", "").isdigit():
- count = int(d[4].replace("杩炴澘", ""))
- if count >= 3:
- is_strong_block = True
- break
+ count = kpl_util.get_high_level_count(d[4])
+ if count >= 3:
+ if d[4].find("杩炴澘") > 0:
+ is_strong_block = True
+ break
+ elif d[0] in yesterday_current_limit_up_codes and len(block_codes) >= 2:
+ # 鍑犲ぉ鍑犳澘锛屼笖鏈�杩�2杩炴澘
+ # 鐪嬫槸鍚︽湁棣栨澘鍚庢帓
+ is_strong_block = True
+ break
if not is_strong_block:
temp_block_codes = set(copy.deepcopy(block_codes))
@@ -776,24 +780,22 @@
high_level_general_code_blocks = {}
# 鏄惁鏄�3鏉垮強浠ヤ笂鐨勯珮浣嶆澘
for r in current_limit_up_datas:
- if r[4].find("杩炴澘") > 0:
- if r[4].replace("杩炴澘", "").isdigit():
- count = int(r[4].replace("杩炴澘", ""))
- if count >= 3:
- latest_datas = latest_current_limit_up_records[:count-1]
- # 鏄珮浣嶆澘
- # 褰撴棩绮鹃��
- blocks = set(r[6].split("銆�"))
- for d in latest_datas:
- for dd in d[1]:
- if dd[0] == r[0]:
- blocks.add(dd[5])
- break
- f_blocks = []
- for b in blocks:
- if b:
- f_blocks.append(b)
- high_level_general_code_blocks[r[0]] = f_blocks
+ count = kpl_util.get_high_level_count(r[4])
+ if count >= 3 and r[0] in yesterday_current_limit_up_codes:
+ latest_datas = latest_current_limit_up_records[:count - 1]
+ # 鏄珮浣嶆澘
+ # 褰撴棩绮鹃��
+ blocks = set(r[6].split("銆�"))
+ for d in latest_datas:
+ for dd in d[1]:
+ if dd[0] == r[0]:
+ blocks.add(dd[5])
+ break
+ f_blocks = []
+ for b in blocks:
+ if b:
+ f_blocks.append(b)
+ high_level_general_code_blocks[r[0]] = f_blocks
can_buy_blocks, unique, msg, can_buy_strong_blocks, keys = cls.__compute_can_buy_blocks(code,
current_limit_up_datas,
--
Gitblit v1.8.0