From 2e10717c6cfec6ab2d00b61644af6b8f26c0ca4f Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期四, 18 一月 2024 18:24:30 +0800
Subject: [PATCH] bug修复
---
trade/huaxin/huaxin_trade_server.py | 4 ++++
l2/cancel_buy_strategy.py | 6 +++++-
2 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/l2/cancel_buy_strategy.py b/l2/cancel_buy_strategy.py
index 23edd1c..10b2a7a 100644
--- a/l2/cancel_buy_strategy.py
+++ b/l2/cancel_buy_strategy.py
@@ -493,6 +493,10 @@
start_compute_index = transaction_index + 1 # max(transaction_index + 1, start_compute_index)
total_datas = local_today_datas.get(code)
+ # h鎾よ绠楀繀椤昏秴杩�5s
+ if tool.trade_time_sub(total_datas[-1]["val"]["time"], total_datas[buy_single_index]["val"]) < 5:
+ l2_log.h_cancel_debug(code, "5s鍐呭泭鎷绠桯鎾�")
+ return
# -----------------璁＄畻H涓�-------------------
watch_indexes_up = set()
for i in range(real_place_order_index - 1, start_compute_index + 1, -1):
@@ -1682,7 +1686,7 @@
# 鐪熷疄涓嬪崟浣嶆敼鍙樺悗鎵嶄細鏇存柊
final_watch_indexes = origin_watch_index | watch_indexes
self.__watch_indexes_dict[code] = final_watch_indexes
- l2_log.g_cancel_debug(code,f"澶у崟鐩戝惉锛歿final_watch_indexes}")
+ l2_log.g_cancel_debug(code, f"澶у崟鐩戝惉锛歿final_watch_indexes}")
else:
l2_log.g_cancel_debug(code, f"娌℃湁澶у崟鐩戝惉锛屽紑濮嬭绠楀皬鍗曪細{start_index}-{real_order_index}")
# 娌℃湁300涓囦互涓婄殑澶у崟浜嗭紝璁＄畻澶囩敤
diff --git a/trade/huaxin/huaxin_trade_server.py b/trade/huaxin/huaxin_trade_server.py
index 16130bc..5b4acee 100644
--- a/trade/huaxin/huaxin_trade_server.py
+++ b/trade/huaxin/huaxin_trade_server.py
@@ -1238,11 +1238,15 @@
else:
total_big_num -= canceled_data["val"]["num"]
total_big_num += val["num"]
+ # 鑾峰彇褰撴棩鐨勯噺姣�
+ volume_rate = code_volumn_manager.get_volume_rate(code)
+
fdata = {"code_info": (code, code_name), "total_num": total_nums, "finish_num": deal_or_cancel_num,
"buy1_money": output_util.money_desc(buy1_money),
"big_num_count": total_big_count,
"big_num_money": output_util.money_desc(total_big_num * float(limit_up_price) * 100),
"left_count": total_left_count,
+ "volume_rate": volume_rate,
"left_money": output_util.money_desc(total_left_num * float(limit_up_price) * 100)}
fdatas.append(fdata)
result = {"code": 0, "data": fdatas}
--
Gitblit v1.8.0