From a58fe22470854de1d41900fcd114d0206b6366bc Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期一, 01 九月 2025 11:19:11 +0800
Subject: [PATCH] D撤修改
---
cancel_strategy/s_l_h_cancel_strategy.py | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/cancel_strategy/s_l_h_cancel_strategy.py b/cancel_strategy/s_l_h_cancel_strategy.py
index f24ee0a..e76b004 100644
--- a/cancel_strategy/s_l_h_cancel_strategy.py
+++ b/cancel_strategy/s_l_h_cancel_strategy.py
@@ -1675,7 +1675,8 @@
for wi in watch_indexes:
data = total_data[wi]
val = data["val"]
- cancel_data = L2DataComputeUtil.is_canceled(code, wi, total_data, canceled_buyno_map, dealing_info[0] if dealing_info else None,
+ cancel_data = L2DataComputeUtil.is_canceled(code, wi, total_data, canceled_buyno_map,
+ dealing_info[0] if dealing_info else None,
deal_order_nos)
if str(wi) in after_place_order_index_dict:
# 鐪熷疄涓嬪崟浣嶇疆涔嬪悗鐨勬寜鐓ф潈閲嶆瘮渚嬫潵璁＄畻
@@ -1811,7 +1812,8 @@
dealing_info = HuaXinBuyOrderManager.get_dealing_order_info(code)
for wi in watch_indexes:
- cancel_data = L2DataComputeUtil.is_canceled(code, wi, total_data, canceled_buyno_map, dealing_info[0] if dealing_info else None,
+ cancel_data = L2DataComputeUtil.is_canceled(code, wi, total_data, canceled_buyno_map,
+ dealing_info[0] if dealing_info else None,
deal_order_nos)
if cancel_data:
if str(wi) in after_place_order_index_dict:
@@ -1969,7 +1971,7 @@
@return: 鏄惁鍙挙鍗�, 鎾ゅ崟鏁版嵁
"""
if not deal_order_list:
- return False,''
+ return False, ''
# 娣诲姞鎴愪氦閲�
if code not in self.__total_big_sell_order_list_cache:
self.__total_big_sell_order_list_cache[code] = []
@@ -2886,7 +2888,6 @@
self.__compute_watch_index(code, buy_single_index)
-
# ---------------------------------D鎾�-------------------------------
# 璁＄畻 鎴愪氦浣�->鐪熷疄涓嬪崟浣嶇疆 鎬诲叡杩樺墿涓嬪灏戞墜娌℃湁鎾ゅ崟
# 鎴愪氦浣嶅彉鍖栦箣鍚庨噸鏂拌绠�
@@ -2918,8 +2919,8 @@
return False, "闈炴定鍋滀环"
# 鏄惁灏忎簬3000w
- if buy1_info[0] * buy1_info[1] > 3000e4:
- return False, "灏佸崟棰濆ぇ浜�3000w"
+ if buy1_info[0] * buy1_info[1] > 4000e4:
+ return False, "灏佸崟棰濆ぇ浜�4000w"
# 鑾峰彇涓嬪崟鏃堕棿
place_order_index = SCancelBigNumComputer().get_real_place_order_index_cache(code)
@@ -2935,10 +2936,10 @@
volume_rate = code_volumn_manager.CodeVolumeManager().get_volume_rate(code)
if volume_rate <= 0.4 and tool.trade_time_sub(time_str, total_datas[place_order_index]['val']['time']) <= 6:
- return True, f"閲忔瘮({volume_rate})<=40%涓斿湪鎸傚崟6s鍐咃紝灏佸崟棰濃墹3000涓�"
+ return True, f"閲忔瘮({volume_rate})<=40%涓斿湪鎸傚崟6s鍐咃紝灏佸崟棰濃墹4000涓�"
- if 6 < tool.trade_time_sub(time_str, total_datas[place_order_index]['val']['time']) <= 10*60:
- return True, f"涓嬪崟鍚�10鍒嗛挓鍐咃紝灏佸崟棰濃墹3000涓�"
+ if 6 < tool.trade_time_sub(time_str, total_datas[place_order_index]['val']['time']):
+ return True, f"涓嬪崟鍚�6s锛屽皝鍗曢鈮�4000涓�"
return False, '鏃犳挙鍗曟潯浠�'
--
Gitblit v1.8.0