From 8280205a0f077235a2e03c9ca3079140f5a3d370 Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期一, 27 十一月 2023 18:01:45 +0800
Subject: [PATCH] 独苗撤单规则生效

---
 l2/l2_data_manager_new.py |   15 +++++++--------
 1 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/l2/l2_data_manager_new.py b/l2/l2_data_manager_new.py
index b274409..183211a 100644
--- a/l2/l2_data_manager_new.py
+++ b/l2/l2_data_manager_new.py
@@ -1002,23 +1002,22 @@
                                                          kpl_data_manager.KPLLimitUpDataRecordManager.total_datas,
                                                          yesterday_codes,
                                                          block_info.get_before_blocks_dict(),
-                                                         kpl_data_manager.KPLLimitUpDataRecordManager.get_current_code_block_dict())
+                                                         kpl_data_manager.KPLLimitUpDataRecordManager.get_current_reason_codes_dict())
             can_buy_result = CodePlateKeyBuyManager.can_buy(code)
 
         if can_buy_result is None:
             return False, True, "灏氭湭鑾峰彇鍒版澘鍧椾俊鎭�"
 
+        if can_buy_result[1]:
+            if cls.volume_rate_info[code][0] < 0.6:
+                return False, True, f"鐙嫍锛氶噺姣旓紙{cls.volume_rate_info[code][0]}锛夋湭杈惧埌60%"
+
         # 鑾峰彇K绾垮舰鎬侊紝鍒ゆ柇鏄惁杩�2澶╂槸鍚︿负10澶╁唴鏈�澶ч噺
         k_format = code_nature_analyse.CodeNatureRecordManager().get_k_format_cache(code)
         if k_format and len(k_format) >= 10 and k_format[9][0]:
             # 鏄嫭鑻�
-            if can_buy_result[1]:
-                if cls.volume_rate_info[code][0] < 0.6:
-                    return False, True, f"鐙嫍锛氳繎2澶╂湁10鏃ュ唴鏈�楂橀噺锛岄噺姣旓紙{cls.volume_rate_info[code][0]}锛夋湭杈惧埌60%"
-            else:
-                if cls.volume_rate_info[code][0] < 0.3:
-                    return False, True, f"杩�2澶╂湁10鏃ュ唴鏈�楂橀噺锛岄噺姣旓紙{cls.volume_rate_info[code][0]}锛夋湭杈惧埌30%"
-
+            if cls.volume_rate_info[code][0] < 0.3:
+                return False, True, f"杩�2澶╂湁10鏃ュ唴鏈�楂橀噺锛岄噺姣旓紙{cls.volume_rate_info[code][0]}锛夋湭杈惧埌30%"
         # 鏄嫭鑻�
         if can_buy_result[1]:
             now_time_int = int(tool.get_now_time_str().replace(":", ""))

--
Gitblit v1.8.0