From 77874e3405bedfcbbef2ebc9649197b27de649a7 Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期三, 26 二月 2025 16:55:02 +0800
Subject: [PATCH] 订阅修改/买入均线条件修改/每次上板大单修改

---
 trade/current_price_process_manager.py |   51 ++++++++++++++++++++++-----------------------------
 1 files changed, 22 insertions(+), 29 deletions(-)

diff --git a/trade/current_price_process_manager.py b/trade/current_price_process_manager.py
index f734a10..8e49d8a 100644
--- a/trade/current_price_process_manager.py
+++ b/trade/current_price_process_manager.py
@@ -85,37 +85,30 @@
         # 娑ㄥ仠杩囩殑浠g爜鎵嶄細璁$畻鏉垮潡韬綅
         for b in blocks:
             index = None
-
-            # 濡傛灉褰撳墠鏉垮潡涓嶈兘涔板垯涓嶈闃�
-            if not radical_buy_data_manager.is_can_buy_for_forbidden_plate(code, b, yesterday_limit_up_codes):
-                continue
-            if b in top_in_blocks:
-                index = top_in_blocks.index(b)
-            else:
-                if RadicalBuyBlockManager.is_block_can_buy_with_block_in(code, b,
-                                                                         yesterday_limit_up_codes=yesterday_limit_up_codes)[
-                    0]:
-                    index = 100
-            if index is None:
-                continue
-            # 鏌ヨ鍦ㄦ澘鍧椾腑鐨勬帓搴�
-            info = RadicalBuyBlockManager().get_history_index(code, b, yesterday_limit_up_codes)
-            if info[0] > 0:
-                info = RadicalBuyBlockManager().filter_before_codes(code, b, info[0], info[1],
-                                                                    yesterday_limit_up_codes)
-            if info[0] < 3:
-                return index + 1
-            else:
-                # 鍒ゆ柇鏄惁鍏锋湁杈ㄨ瘑搴�
-                special_codes = BlockSpecialCodesManager().get_block_codes(b)
-                if special_codes and code in special_codes:
+            # 鍙闃呮湁杈ㄨ瘑搴︾殑绁ㄥ拰鏂版澘鍧楀墠3
+            special_codes = BlockSpecialCodesManager().get_block_codes(b)
+            if special_codes and code in special_codes:
+                # 鏈夎鲸璇嗗害鍦ㄥ噣娴佸叆涓垯璁㈤槄
+                if b in top_in_blocks:
+                    index = top_in_blocks.index(b)
                     return index + 1
+            else:
+                # 娌℃湁杈ㄨ瘑搴︼紝鏂版澘鍧楄闃呭墠3
+                new_blocks = LimitUpCodesBlockRecordManager().get_new_blocks()
+                if new_blocks and b in new_blocks:
+                    info = RadicalBuyBlockManager().get_history_index(code, b, yesterday_limit_up_codes)
+                    if info[0] > 0:
+                        info = RadicalBuyBlockManager().filter_before_codes(code, b, info[0], info[1],
+                                                                            yesterday_limit_up_codes)
+                    if info[0] < 3:
+                        if b in top_in_blocks:
+                            index = top_in_blocks.index(b)
+                            return index + 1
+                        else:
+                            return 200
     else:
         # 灏氭湭娑ㄥ仠杩囩殑浠g爜锛岃闃呮澘鍧楁湁杈ㄨ瘑搴︾殑鍓�6
         for b in blocks:
-            # 濡傛灉褰撳墠鏉垮潡涓嶈兘涔板垯涓嶈闃�
-            if not radical_buy_data_manager.is_can_buy_for_forbidden_plate(code, b, yesterday_limit_up_codes):
-                continue
             if b not in top_in_blocks:
                 continue
             index = top_in_blocks.index(b)
@@ -158,8 +151,8 @@
                     # 鍒涗笟鏉跨殑娑ㄥ箙闇�瑕佹墦鎶�
                     rate = rate / 2
                 if order_index >= 0:
-                    if order_index < 1000 and rate >= 5:
-                        # 娑ㄥ箙澶т簬5%鐨勬墠鑳借闃�
+                    if order_index < 1000 and rate >= 3:
+                        # 娑ㄥ箙澶т簬3%鐨勬墠鑳借闃�
                         _code_list.append((rate, code, order_index))
                     else:
                         _delete_list.append((rate, code, 0))

--
Gitblit v1.8.0