From cbe19ea6066a600cbd0b5110db5d43f8252d14a8 Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期四, 13 六月 2024 11:23:53 +0800
Subject: [PATCH] L撤成交进度相关改进

---
 third_data/kpl_block_util.py |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/third_data/kpl_block_util.py b/third_data/kpl_block_util.py
index 5c29965..6c9c1f4 100644
--- a/third_data/kpl_block_util.py
+++ b/third_data/kpl_block_util.py
@@ -66,7 +66,7 @@
     for k in block_limit_up_dict:
         has_shsz = False
         for b in block_limit_up_dict[k]:
-            if b[0].find('00') == 0 or b[0].find('60') == 0:
+            if tool.is_can_buy_code(b[0]):
                 has_shsz = True
                 break
         if not has_shsz:
@@ -146,7 +146,7 @@
         if k[3] == code:
             # 鑾峰彇褰撳墠浠g爜娑ㄥ仠鏃堕棿
             limit_up_time = int(k[5])
-        if shsz and not tool.is_shsz_code(k[3]):
+        if shsz and not tool.is_can_buy_code(k[3]):
             continue
         # 鍓旈櫎楂樹綅鏉�
         if k[3] in yesterday_current_limit_up_codes:
@@ -168,20 +168,20 @@
 
 # 鑾峰彇褰撴棩瀹炴椂韬綅
 # before_blocks_dict鏍煎紡浣峽"浠g爜":set("鏉垮潡")}
-def get_code_current_rank(code, block, current_limit_up_datas, code_limit_up_reason_dict,
-                          yesterday_current_limit_up_codes, exclude_codes, open_limit_up_count, shsz=False):
+def get_code_current_rank(code, block, current_limit_up_datas, code_limit_up_reasons_dict,
+                          yesterday_current_limit_up_codes, exclude_codes, open_limit_up_count, shsz=False,
+                          limit_up_time=time.time()):
     block_codes_infos = []
-    limit_up_time = time.time()
     for k in current_limit_up_datas:
         if k[0] == code:
             # 鑾峰彇褰撳墠浠g爜娑ㄥ仠鏃堕棿
             limit_up_time = int(k[2])
-        if shsz and not tool.is_shsz_code(k[0]):
+        if shsz and not tool.is_can_buy_code(k[0]):
             continue
         # 鍓旈櫎楂樹綅鏉�
         if k[0] in yesterday_current_limit_up_codes:
             continue
-        if code_limit_up_reason_dict.get(k[0]) == block:
+        if code_limit_up_reasons_dict.get(k[0]) and block in code_limit_up_reasons_dict.get(k[0]):
             if k[0] != code:
                 # 浠g爜.娑ㄥ仠鏃堕棿
                 block_codes_infos.append((k[0], int(k[2])))

--
Gitblit v1.8.0