From 0e921bc8d68e830f15bb049dfb84b22bc05db788 Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期四, 15 八月 2024 09:49:50 +0800
Subject: [PATCH] bug修复
---
l2/l2_transaction_data_processor.py | 85 ++++++++++++++++++++++++++----------------
1 files changed, 52 insertions(+), 33 deletions(-)
diff --git a/l2/l2_transaction_data_processor.py b/l2/l2_transaction_data_processor.py
index f7cf83c..65faadc 100644
--- a/l2/l2_transaction_data_processor.py
+++ b/l2/l2_transaction_data_processor.py
@@ -2,10 +2,15 @@
import time
import constant
+from cancel_strategy.s_l_h_cancel_strategy import HourCancelBigNumComputer
+from cancel_strategy.s_l_h_cancel_strategy import LCancelBigNumComputer, LCancelRateManager
+from cancel_strategy.s_l_h_cancel_strategy import SCancelBigNumComputer
from code_attribute import gpcode_manager
from l2 import l2_data_util, l2_data_manager, transaction_progress
-from l2.cancel_buy_strategy import FCancelBigNumComputer, LCancelBigNumComputer, LCancelRateManager, \
- GCancelBigNumComputer, SCancelBigNumComputer, HourCancelBigNumComputer, NewGCancelBigNumComputer
+from l2.cancel_buy_strategy import FCancelBigNumComputer, \
+ NewGCancelBigNumComputer, \
+ NBCancelBigNumComputer
+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
@@ -13,8 +18,9 @@
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 trade import current_price_process_manager
-from trade.deal_big_money_manager import DealOrderNoManager
import concurrent.futures
+
+from utils import tool
class HuaXinTransactionDatasProcessor:
@@ -29,19 +35,22 @@
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
@classmethod
- def statistic_big_order_infos(cls, code, datas, order_begin_pos:OrderBeginPosInfo):
+ def statistic_big_order_infos(cls, code, datas, order_begin_pos: OrderBeginPosInfo):
"""
缁熻澶у崟鎴愪氦
@param code:
@param datas:
@return:
"""
- buy_datas, bigger_buy_datas = HuaXinBuyOrderManager.statistic_big_buy_data(code, datas)
+ limit_up_price = round(float(gpcode_manager.get_limit_up_price(code)), 2)
+ buy_datas, bigger_buy_datas = HuaXinBuyOrderManager.statistic_big_buy_data(code, datas, limit_up_price)
if buy_datas:
BigOrderDealManager().add_buy_datas(code, buy_datas)
try:
@@ -53,7 +62,8 @@
for buy_data in bigger_buy_datas:
order_no = f"{buy_data[0]}"
if order_no in buyno_map:
- LCancelBigNumComputer().add_deal_index(code, buyno_map[order_no]["index"], order_begin_pos.buy_single_index)
+ LCancelBigNumComputer().add_deal_index(code, buyno_map[order_no]["index"],
+ order_begin_pos.buy_single_index)
except Exception as e:
logger_debug.exception(e)
@@ -69,8 +79,15 @@
@classmethod
def process_huaxin_transaction_datas(cls, code, datas):
__start_time = time.time()
+ limit_up_price = gpcode_manager.get_limit_up_price(code)
+ if limit_up_price:
+ limit_up_price = round(float(limit_up_price), 2)
# 璁剧疆鎴愪氦浠�
- current_price_process_manager.set_trade_price(code, datas[-1][1])
+ try:
+ current_price_process_manager.set_trade_price(code, datas[-1][1], l2_huaxin_util.convert_time(datas[-1][3]),
+ limit_up_price)
+ except:
+ pass
total_datas = l2_data_util.local_today_datas.get(code)
use_time_list = []
try:
@@ -84,53 +101,39 @@
big_sell_order_info = None
try:
- limit_up_price = gpcode_manager.get_limit_up_price(code)
- if limit_up_price:
- limit_up_price = round(float(limit_up_price), 2)
+
# 缁熻鍗栧崟
big_sell_order_info = HuaXinSellOrderStatisticManager.add_transaction_datas(code, datas, limit_up_price)
_start_time = time.time()
use_time_list.append(("澶勭悊鍗栧崟鎴愪氦鏁版嵁", _start_time - __start_time))
if is_placed_order:
+
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,
+ need_cancel, cancel_msg = FCancelBigNumComputer().need_cancel_for_p(code,
order_begin_pos)
+ # 鍒ゆ柇鏃堕棿鏄惁涓庢湰鍦版椂闂寸浉宸�5s浠ヤ笂
+ if tool.trade_time_sub(tool.get_now_time_str(), l2_huaxin_util.convert_time(datas[-1][3])) > 10:
+ 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)
# GCancelBigNumComputer().set_big_sell_order_info(code, big_sell_order_info)
use_time_list.append(("澶勭悊鍗栧崟鐩稿叧鎾ゆ暟鎹�", time.time() - _start_time))
_start_time = time.time()
+ HuaXinSellOrderStatisticManager.statistic_total_deal_volume(code, datas)
+ use_time_list.append(("缁熻鎴愪氦閲忔暟鎹�", time.time() - _start_time))
except Exception as e:
async_log_util.error(logger_debug, f"鍗栧崟缁熻寮傚父锛歿big_sell_order_info}")
logger_debug.exception(e)
-
_start_time = time.time()
- # 璁＄畻宸茬粡鎴愪氦鐨勫ぇ鍗�
- # big_money_count = 0
- # for d in datas:
- # data = buyno_map.get(f"{d[6]}")
- # buy_num = None
- # if data:
- # buy_num = data["val"]["num"] * 100
- # # 缁熻鎴愪氦鍗�
- # 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"])
- # val = data["val"]
- # if l2_data_util.is_big_money(val) and L2DataUtil.is_limit_up_price_buy(val):
- # big_money_count += 1
- # DealOrderNoManager().add_orderno(code, f"{deal_info[0]}")
- # # L鍚庢槸鍚︽湁鎴愪氦锛屽鏋滄湁鎴愪氦灏遍渶瑕侀櫎鍘诲綋鍓嶇瑪鏁帮紝鐒跺悗閲嶆柊鍥婃嫭涓�绗�
- # # 鏆傛椂涓嶉渶瑕佽繖绉嶅鏉傜殑鏈哄埗
- # # LCancelBigNumComputer().add_deal_index(code, data["index"], order_begin_pos.buy_single_index)
cls.__statistic_thread_pool.submit(cls.statistic_big_order_infos, code, datas, order_begin_pos)
use_time_list.append(("缁熻涔板崟鏁版嵁", time.time() - _start_time))
@@ -154,6 +157,21 @@
cancel_result = FCancelBigNumComputer().need_cancel_for_deal_fast(code, buy_progress_index)
if cancel_result[0]:
L2TradeDataProcessor.cancel_buy(code, f"F鎾�:{cancel_result[1]}")
+ if not cancel_result[0]:
+ try:
+ cancel_result = NBCancelBigNumComputer().need_cancel(code, buy_progress_index)
+ if cancel_result[0]:
+ L2TradeDataProcessor.cancel_buy(code, f"澶у競鍊兼棤澶у崟鎾�:{cancel_result[1]}")
+ except:
+ pass
+
+ if not cancel_result[0] and buy_progress_index_changed:
+ try:
+ cancel_result = FCancelBigNumComputer().need_cancel_for_w(code)
+ if cancel_result[0]:
+ L2TradeDataProcessor.cancel_buy(code, f"W鎾�:{cancel_result[1]}")
+ except:
+ pass
SCancelBigNumComputer().set_transaction_index(code, order_begin_pos.buy_single_index,
buy_progress_index)
@@ -172,4 +190,5 @@
finally:
use_time = int((time.time() - __start_time) * 1000)
if use_time > 5:
- async_log_util.info(hx_logger_l2_upload, f"{code}澶勭悊鎴愪氦鐢ㄦ椂锛歿use_time} 璇︽儏:{use_time_list}")
+ async_log_util.info(hx_logger_l2_upload,
+ f"{code}澶勭悊鎴愪氦鐢ㄦ椂锛歿use_time} 鏁版嵁鏁伴噺锛歿len(datas)} 璇︽儏:{use_time_list}")
--
Gitblit v1.8.0