From 2f2516749615da866e96d8d24e499b7ecbb63a3e Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期一, 23 六月 2025 12:28:52 +0800
Subject: [PATCH] 默认交易模式变更/真实下单位置计算位置修改
---
utils/data_export_util.py | 56 +++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 49 insertions(+), 7 deletions(-)
diff --git a/utils/data_export_util.py b/utils/data_export_util.py
index 046716c..4de83e7 100644
--- a/utils/data_export_util.py
+++ b/utils/data_export_util.py
@@ -13,10 +13,12 @@
from code_attribute import gpcode_manager
import l2.l2_data_util
from l2.huaxin import l2_huaxin_util
+from l2.l2_transaction_data_manager import BigOrderDealManager
from log_module import log, log_export
from l2 import l2_data_source_util, l2_data_util
from log_module.log import logger_debug
from trade import deal_big_money_manager
+from trade.buy_money_count_setting import BuyMoneyUtil
from utils import tool
# 缂撳瓨L2鏁版嵁锛屾牸寮忥細{"鏃ユ湡":{鏁版嵁}}
@@ -74,9 +76,15 @@
if datas[i]["index"] == end_index:
datas = datas[:i]
break
+ # 鎴愪氦鐨勫ぇ鍗曚俊鎭痆(涔板崟鍙�,鎬昏偂鏁�,鎬绘垚浜ら,鎴愪氦寮�濮嬫椂闂�,鎴愪氦缁撴潫鏃堕棿)]
+ deal_big_buy_order_list = copy.deepcopy(BigOrderDealManager().get_total_buy_data_list(code))
+ deal_big_buy_order_no_dict = {}
+ if deal_big_buy_order_list:
+ for d in deal_big_buy_order_list:
+ deal_big_buy_order_no_dict[d[0]] = d
fdatas = export_l2_data(code, datas, process_indexs, trade_indexs, real_position_indexes, deal_list_dict, sell_nos,
- active_sell_set, cancel_reasons)
+ active_sell_set, cancel_reasons, deal_big_buy_order_no_dict)
return fdatas
@@ -90,7 +98,7 @@
def export_l2_data(code, datas, process_indexs, trade_indexs, real_position_indexes, deal_list_dict, sell_nos,
- active_sell_nos, cancel_reasons):
+ active_sell_nos, cancel_reasons, deal_big_buy_order_no_dict):
def find_process_index(index):
for i in range(0, len(process_indexs)):
if process_indexs[i][0] <= index <= process_indexs[i][1]:
@@ -106,7 +114,6 @@
# 鏈�鏂扮殑涓�鏉℃暟鎹�
latest_data = datas[-1]
latest_time_str_with_ms = l2.l2_data_util.L2DataUtil.get_time_with_ms(latest_data["val"])
-
# 鏁版嵁棰勫鐞�
num_operate_map = {}
@@ -126,16 +133,31 @@
fdatas = []
# 鏁版嵁澶灏遍渶瑕佽繃婊ゆ帀灏忛噾棰�
is_data_too_large = len(datas) > 20000
+
+ limit_up_price = gpcode_manager.get_limit_up_price_as_num(code)
+ if limit_up_price:
+ # 闇�瑕佽闃呯殑鐗规畩鐨勯噺
+ special_volumes = BuyMoneyUtil.get_possible_buy_volumes(limit_up_price)
+ special_volumes = [x//100 for x in special_volumes]
+ else:
+ special_volumes = []
+
for data in datas:
index += 1
if is_data_too_large and data['val']['num'] * float(data['val']['price']) < 5000:
- if data["index"] not in real_position_indexes:
+ # 灏忓崟
+ if data["index"] not in real_position_indexes and data['val']['num'] not in special_volumes:
continue
# 鍏堢Щ闄�
if data['val']['orderNo'] in active_sell_nos:
# 杩囨护涓诲姩鍗�
continue
+
+ # 绉婚櫎鎴愪氦澶у崟鍦↙2涓凡鏈夌殑璁㈠崟
+ if l2.l2_data_util.L2DataUtil.is_limit_up_price_buy(data["val"]):
+ if int(data['val']['orderNo']) in deal_big_buy_order_no_dict:
+ deal_big_buy_order_no_dict.pop(int(data['val']['orderNo']))
trade_info = find_trade_index(data["index"])
if not trade_info:
@@ -229,9 +251,10 @@
deal_info = deal_list_dict.get(str(data["val"].get("orderNo")))
if deal_info and len(deal_info) >= 5:
# 鎴愪氦鏃堕棿涓嶈兘姣斿綋鍓嶇储寮曟椂闂村ぇ
- if tool.trade_time_sub_with_ms(cancel_info , latest_time_str_with_ms) <= 0:
- cancel_info = l2_huaxin_util.convert_time(deal_info[4],
- with_ms=True)
+ cancel_info = l2_huaxin_util.convert_time(deal_info[4],
+ with_ms=True)
+ if tool.trade_time_sub_with_ms(cancel_info, latest_time_str_with_ms) > 0:
+ cancel_info = None
format_data.append(cancel_info)
cancel_order_info = None
if trade_info:
@@ -251,6 +274,25 @@
format_data.append(cancel_order_info)
format_data.append(data["val"].get("orderNo"))
fdatas.append((style_int, trade_info, format_data))
+
+ if tool.is_sh_code(code) and deal_big_buy_order_no_dict:
+ # 涓婅瘉锛屾湁涓诲姩鎴愪氦鐨勫ぇ鍗�
+ active_deal_list = [deal_big_buy_order_no_dict[order_no] for order_no in deal_big_buy_order_no_dict]
+ active_deal_list.sort(key=lambda x: x[3])
+ for i in range(len(active_deal_list)):
+ d = active_deal_list[i]
+ format_data = [0]
+ format_data.append(l2_huaxin_util.convert_time(d[3], with_ms=True))
+ format_data.append('')
+ format_data.append(f"{round(d[2] / 10000, 1)}涓�")
+ format_data.append(round(d[2] / d[1], 2))
+ format_data.append(d[1] // 100)
+ format_data.append('涓诲姩涔�')
+ format_data.append(1)
+ format_data.append(l2_huaxin_util.convert_time(d[4], with_ms=True))
+ format_data.append('')
+ format_data.append(d[0])
+ fdatas.insert(i, (0, None, format_data))
logger_debug.info("寰幆缁勮鏁版嵁瀹屾垚")
return fdatas
--
Gitblit v1.8.0