From b9bf21dca8ed7c7c196e1d1713689f7a342a54d7 Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期一, 29 七月 2024 01:43:12 +0800
Subject: [PATCH] 修改订阅的自由流通市值/输出撤单原因

---
 l2/l2_data_manager_new.py |   25 +++++++++++++++++++++++--
 1 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/l2/l2_data_manager_new.py b/l2/l2_data_manager_new.py
index 483b57f..ed3e082 100644
--- a/l2/l2_data_manager_new.py
+++ b/l2/l2_data_manager_new.py
@@ -837,7 +837,25 @@
         if now_time_int >= 145700:
             return False, True, f"14:57鍚庝笉鑳戒氦鏄�"
         if 130100 >= now_time_int >= 112900 or now_time_int < 93100:
-            return False, True, f"09:31:00涔嬪墠锛�11:29:00-13:01:00涓嶈兘浜ゆ槗"
+            if now_time_int < 93100:
+                # 鍒ゆ柇鎴愪氦鐨勫ぇ鍗曟暟閲�
+                data_list = BigOrderDealManager().get_total_buy_money_list(code)
+                bigger_money = 2990000
+                fdatas = []
+                for d in data_list:
+                    if d < bigger_money:
+                        continue
+                    fdatas.append(d)
+                if len(fdatas) < 3:
+                    return False, True, f"09:31:00涔嬪墠涓嬪崟锛屾垚浜ゅぇ鍗曟暟閲忥紙{len(fdatas)}锛変笉瓒�3涓�"
+                else:
+                    # 鍒ゆ柇鏁版嵁鏄惁鍗�
+                    total_datas = local_today_datas.get(code)
+                    if tool.trade_time_sub_with_ms(tool.get_now_time_with_ms_str(),
+                                                   L2DataUtil.get_time_with_ms(total_datas[-1]["val"])) > 500:
+                        return False, True, f"09:31:00涔嬪墠涓嬪崟锛孡2鏁版嵁鏃堕棿鐩稿樊500ms浠ヤ笂"
+            else:
+                return False, True, f"09:31:00涔嬪墠锛�11:29:00-13:01:00涓嶈兘浜ゆ槗"
 
         # place_order_count = cls.__PlaceOrderCountManager.get_place_order_count(code)
         # if place_order_count > 0 and now_time_int >= 140000:
@@ -957,7 +975,7 @@
                                                                                 total_datas[-1]["index"],
                                                                                 limit_up_price, min_money)
                 if left_count < 1:
-                    return False, False, f"绗瑊place_order_count+1}涓嬪崟鏃犲緟鎴愪氦鐨勫ぇ鍗�"
+                    return False, False, f"绗瑊place_order_count + 1}涓嬪崟鏃犲緟鎴愪氦鐨勫ぇ鍗�"
 
         # 鏆傛椂娉ㄩ噴鎯充拱鍗曞姛鑳�
         if not cls.__WantBuyCodesManager.is_in_cache(code):
@@ -2228,6 +2246,9 @@
                 # 澶т簬8浜跨殑瀹夊叏绗旀暟蹇呴』鏈�8绗�
                 if money_y >= 8:
                     safe_count = 8
+            # 9:31涔嬪墠涓嬪崟锛屽畨鍏ㄧ瑪鏁版渶灏忎负5绗�
+            if int(tool.get_now_time_str().replace(":", "")) < int("093100"):
+                safe_count = max(safe_count, 5)
 
             if buy_count < safe_count:
                 not_buy_msg = f"銆恵i}銆戝畨鍏ㄧ瑪鏁颁笉瓒筹紝{buy_count}/{safe_count}"

--
Gitblit v1.8.0