From cbb47fc396a73d39dc2e5c403fd8d6eef9dc72aa Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期五, 19 七月 2024 11:04:47 +0800
Subject: [PATCH] bug修复

---
 l2/l2_transaction_data_processor.py |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/l2/l2_transaction_data_processor.py b/l2/l2_transaction_data_processor.py
index f02a061..65faadc 100644
--- a/l2/l2_transaction_data_processor.py
+++ b/l2/l2_transaction_data_processor.py
@@ -13,6 +13,7 @@
 from l2.huaxin import l2_huaxin_util
 from l2.l2_data_manager import OrderBeginPosInfo
 from l2.l2_data_manager_new import L2TradeDataProcessor
+from l2.l2_data_util import L2DataUtil
 from l2.l2_transaction_data_manager import HuaXinBuyOrderManager, HuaXinSellOrderStatisticManager, BigOrderDealManager
 from log_module import async_log_util
 from log_module.log import hx_logger_l2_debug, logger_l2_trade_buy_queue, logger_debug, hx_logger_l2_upload
@@ -34,7 +35,9 @@
             d = datas[i]
             buy_no = f"{d[6]}"
             if buyno_map and buy_no in buyno_map:
-                buy_progress_index = buyno_map[buy_no]["index"]
+                # 鎴愪氦杩涘害浣嶅繀椤绘槸娑ㄥ仠涔�
+                if L2DataUtil.is_limit_up_price_buy(buyno_map[buy_no]["val"]):
+                    buy_progress_index = buyno_map[buy_no]["index"]
                 break
         return buy_progress_index
 
@@ -116,8 +119,9 @@
                                                                                             order_begin_pos)
                     # 鍒ゆ柇鏃堕棿鏄惁涓庢湰鍦版椂闂寸浉宸�5s浠ヤ笂
                     if tool.trade_time_sub(tool.get_now_time_str(), l2_huaxin_util.convert_time(datas[-1][3])) > 10:
-                        need_cancel, cancel_msg = True, f"鎴愪氦鏃堕棿涓庢湰鍦版椂闂寸浉宸�10S浠ヤ笂锛寋l2_huaxin_util.convert_time(datas[-1][3])}"
-
+                        now_seconds = int(tool.get_now_time_str().replace(":", ""))
+                        if now_seconds < int("093200"): #or int("130000") <= now_seconds < int("130200"):
+                            need_cancel, cancel_msg = True, f"鎴愪氦鏃堕棿涓庢湰鍦版椂闂寸浉宸�10S浠ヤ笂锛寋l2_huaxin_util.convert_time(datas[-1][3])}"
                     if need_cancel:
                         L2TradeDataProcessor.cancel_buy(code, cancel_msg)
 

--
Gitblit v1.8.0