From 1176a493039ded49d888b451793bc272e18a9b5a Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期二, 02 四月 2024 14:16:05 +0800
Subject: [PATCH] 激进买

---
 l2/l2_transaction_data_processor.py |  110 ++++++++++++++++++------------------------------------
 1 files changed, 37 insertions(+), 73 deletions(-)

diff --git a/l2/l2_transaction_data_processor.py b/l2/l2_transaction_data_processor.py
index 406cd94..4ebc715 100644
--- a/l2/l2_transaction_data_processor.py
+++ b/l2/l2_transaction_data_processor.py
@@ -1,19 +1,16 @@
 import logging
 import time
 
-from code_attribute import gpcode_manager
-from l2 import l2_data_util, l2_data_manager, l2_data_source_util, transaction_progress
+from l2 import l2_data_util, l2_data_manager, transaction_progress
 from l2.cancel_buy_strategy import FCancelBigNumComputer, LCancelBigNumComputer, LCancelRateManager, \
-    GCancelBigNumComputer, SecondCancelBigNumComputer, HourCancelBigNumComputer
+    GCancelBigNumComputer, SCancelBigNumComputer, HourCancelBigNumComputer
 from l2.l2_data_manager_new import L2TradeDataProcessor
-from l2.l2_data_util import L2DataUtil, local_today_canceled_buyno_map
-from l2.l2_transaction_data_manager import HuaXinTransactionDataManager
+from l2.l2_data_util import L2DataUtil
+from l2.l2_transaction_data_manager import HuaXinBuyOrderManager, HuaXinSellOrderStatisticManager
 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
-from msg import push_msg_manager
-from trade import current_price_process_manager, trade_manager
+from trade import current_price_process_manager
 from trade.deal_big_money_manager import DealOrderNoManager
-from utils import tool
 
 
 class HuaXinTransactionDatasProcessor:
@@ -27,7 +24,6 @@
             d = datas[i]
             buy_no = f"{d[6]}"
             if buyno_map and buy_no in buyno_map:
-                async_log_util.info(hx_logger_l2_debug, f"{code}鎴愪氦杩涘害锛歿buyno_map[buy_no]['index']}")
                 buy_progress_index = buyno_map[buy_no]["index"]
                 break
         return buy_progress_index
@@ -40,34 +36,41 @@
         __start_time = time.time()
         try:
             buyno_map = l2_data_util.local_today_buyno_map.get(code)
-            if not buyno_map:
-                if trade_manager.CodesTradeStateManager().get_trade_state(
-                        code) != trade_manager.TRADE_STATE_NOT_TRADE:
-                    l2_data_util.load_l2_data(code)
-                    buyno_map = l2_data_util.local_today_buyno_map.get(code)
+            # 鏆傛椂涓嶉渶瑕侀噸鏂板姞杞借幏鍙�
+            # if not buyno_map:
+            #     if trade_manager.CodesTradeStateManager().get_trade_state_cache(
+            #             code) != trade_manager.TRADE_STATE_NOT_TRADE:
+            #         l2_data_util.load_l2_data(code)
+            #         buyno_map = l2_data_util.local_today_buyno_map.get(code)
             if buyno_map is None:
                 buyno_map = {}
 
             order_begin_pos = l2_data_manager.TradePointManager().get_buy_compute_start_data_cache(code)
+            # 鏄惁宸茬粡涓嬪崟
+            is_placed_order = l2_data_manager.TradePointManager.is_placed_order(order_begin_pos)
 
-            if order_begin_pos and order_begin_pos.buy_exec_index and order_begin_pos.buy_exec_index > -1:
-                # 宸茬粡涓嬪崟鐨勯渶瑕佺粺璁鎾�
-                try:
-                    for d in datas:
-                        if FCancelBigNumComputer().need_cancel(d)[0]:
-                            L2TradeDataProcessor.cancel_buy(code, f"F鎾ゆ挙鍗�:{d}")
-                            order_begin_pos = None
-                            break
-                except Exception as e:
-                    async_log_util.error(hx_logger_l2_debug, str(e))
-                try:
-                    # 涓嬪崟2s鍚庢墠寮�濮嬬敓鏁�
-                    cresult = LCancelBigNumComputer().add_transaction_datas(code, datas)
-                    if cresult[0]:
-                        L2TradeDataProcessor.cancel_buy(code, f"L鍚庢垚浜ゅお蹇挙鍗�:{cresult[1]}")
-                        order_begin_pos = None
-                except Exception as e:
-                    async_log_util.error(hx_logger_l2_debug, str(e))
+            big_sell_order_info = None
+            try:
+                # 缁熻鍗栧崟
+                big_sell_order_info = HuaXinSellOrderStatisticManager.add_transaction_datas(code, datas,
+                                                                                            order_begin_pos.buy_exec_index if is_placed_order else None)
+                need_cancel, cancel_msg = SCancelBigNumComputer().set_big_sell_order_info_for_cancel(code,
+                                                                                                     big_sell_order_info,
+                                                                                                     order_begin_pos)
+                if need_cancel:
+                    cancel_msg = f"S鎾�:{cancel_msg}"
+
+                if not need_cancel:
+                    need_cancel, cancel_msg = FCancelBigNumComputer().need_cancel_for_p(code, big_sell_order_info,
+                                                                                        order_begin_pos)
+
+                if need_cancel:
+                    L2TradeDataProcessor.cancel_buy(code, cancel_msg)
+
+                GCancelBigNumComputer().set_big_sell_order_info(code, big_sell_order_info)
+            except Exception as e:
+                async_log_util.error(logger_debug, f"鍗栧崟缁熻寮傚父锛歿big_sell_order_info}")
+                logger_debug.exception(e)
 
             # 璁$畻宸茬粡鎴愪氦鐨勫ぇ鍗�
             big_money_count = 0
@@ -77,7 +80,7 @@
                 if data:
                     buy_num = data["val"]["num"] * 100
                 # 缁熻鎴愪氦鍗�
-                deal_info = HuaXinTransactionDataManager.statistic_deal_desc(code, d, buy_num)
+                deal_info = HuaXinBuyOrderManager.statistic_deal_desc(code, d, buy_num)
                 if deal_info and deal_info[1]:
                     data = buyno_map.get(f"{deal_info[0]}")
                     print("宸茬粡鎴愪氦绱㈠紩锛�", data["index"])
@@ -103,49 +106,9 @@
 
                 LCancelBigNumComputer().set_trade_progress(code, order_begin_pos.buy_single_index, buy_progress_index,
                                                            total_datas)
-                SecondCancelBigNumComputer().set_transaction_index(
-                    code,
-                    buy_progress_index)
                 if order_begin_pos and order_begin_pos.buy_exec_index and order_begin_pos.buy_exec_index > -1:
                     HourCancelBigNumComputer().set_transaction_index(code, order_begin_pos.buy_single_index,
                                                                      buy_progress_index)
-                    # ---------------------------------鍒ゆ柇鏉垮潡鏄惁璺熶笂鏉ヤ簡-------------------------------
-                    try:
-                        pass
-                        # order_begin_pos = l2_data_manager.TradePointManager().get_buy_compute_start_data_cache(code)
-                        # volume_rate = 0
-                        # volume_info = L2TradeDataProcessor.volume_rate_info.get(code)
-                        # if volume_info:
-                        #     volume_rate = volume_info[0]
-                        # need_cancel, msg = UCancelBigNumComputer().need_cancel(code, buy_progress_index, order_begin_pos,
-                        #                                                        kpl_data_manager.KPLLimitUpDataRecordManager.get_current_reason_codes_dict(),
-                        #                                                        volume_rate)
-                        # if need_cancel:
-                        #     L2TradeDataProcessor.cancel_buy(code, msg)
-                    except Exception as e:
-                        logger_debug.exception(e)
-                    if buy_progress_index_changed:
-                        # 浜ゆ槗杩涘害鍙樺寲锛屽垽鏂埌鐪熷疄涓嬪崟浣嶇疆鐨勮窛绂�
-                        real_order_index = SecondCancelBigNumComputer().get_real_place_order_index_cache(code)
-                        if real_order_index and real_order_index >= buy_progress_index:
-
-                            total_left_count = 0
-                            for i in range(buy_progress_index + 1, real_order_index):
-                                val = total_datas[i]["val"]
-                                if not L2DataUtil.is_limit_up_price_buy(val):
-                                    continue
-                                if val["num"] * float(val["price"]) < 5000:
-                                    continue
-                                left_count = l2_data_source_util.L2DataSourceUtils.get_limit_up_buy_no_canceled_count_v2(
-                                    code, i,
-                                    total_datas,
-                                    local_today_canceled_buyno_map.get(
-                                        code))
-                                if left_count > 0:
-                                    total_left_count += 1
-                            if total_left_count <= 3:
-                                # 褰撴垚浜よ繘搴﹁窛绂荤湡瀹炰笅鍗曚綅缃笉瓒�3绗旀椂鎺ㄩ�佸嵆灏嗘垚浜ょ殑娑堟伅
-                                push_msg_manager.push_order_almost_deal(code, gpcode_manager.get_code_name(code))
             else:
                 pass
             if order_begin_pos and order_begin_pos.buy_exec_index and order_begin_pos.buy_exec_index > -1:
@@ -159,3 +122,4 @@
             use_time = int((time.time() - __start_time) * 1000)
             if use_time > 10:
                 async_log_util.info(hx_logger_l2_upload, f"{code}澶勭悊鎴愪氦鐢ㄦ椂锛歿use_time}")
+

--
Gitblit v1.8.0