From 7c6d06136079b73c5676c716c992fdebb23cca7c Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期二, 27 五月 2025 16:15:31 +0800
Subject: [PATCH] bug修复
---
output/output_util.py | 2 +-
trade/buy_radical/radical_buy_data_manager.py | 8 +++++---
servers/data_server.py | 4 +++-
3 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/output/output_util.py b/output/output_util.py
index 968c799..286b24a 100644
--- a/output/output_util.py
+++ b/output/output_util.py
@@ -2,7 +2,7 @@
from l2 import l2_data_util
def money_desc(money):
- if abs(money) > 100000000:
+ if abs(money) >= 100000000:
return f"{round(money / 100000000, 2)}浜�"
else:
return f"{round(money / 10000, 2)}涓�"
diff --git a/servers/data_server.py b/servers/data_server.py
index 0518a99..3c5cc04 100644
--- a/servers/data_server.py
+++ b/servers/data_server.py
@@ -961,7 +961,9 @@
big_money_rate * 100 # 澶у崟鎴愪氦姣�
),
output_util.money_desc(deal_big_money_info[1]),
- output_util.money_desc(deal_big_money_info[2])]
+ output_util.money_desc(deal_big_money_info[2]),
+ output_util.money_desc(deal_big_money_info[3]),
+ ]
if len(codes) == 1:
# 鍔犺浇澶у崟璇︽儏
deal_big_order_detail_info = radical_buy_data_manager.get_l2_big_order_deal_info(code)
diff --git a/trade/buy_radical/radical_buy_data_manager.py b/trade/buy_radical/radical_buy_data_manager.py
index 720e02c..5d96c51 100644
--- a/trade/buy_radical/radical_buy_data_manager.py
+++ b/trade/buy_radical/radical_buy_data_manager.py
@@ -1765,7 +1765,7 @@
"""
鎬绘垚浜ゅぇ鍗曞晩鏄惁瓒冲
@param code:
- @return:(缂哄皯鐨勮祫閲�,鎬绘垚浜ら噾棰�, 瑕佹眰鐨勫ぇ鍗曢噾棰�)
+ @return:(缂哄皯鐨勮祫閲�, 鎬绘垚浜ら噾棰�, 瑕佹眰鐨勫ぇ鍗曢噾棰�, 璁＄畻寰楀埌鐨勫ぇ鍗曢槇鍊奸噾棰�)
"""
THRESHOLD_MONEY, is_temp_threshold_money = BeforeSubDealBigOrderManager().get_big_order_threshold_info(code)
@@ -1777,11 +1777,13 @@
if tool.is_ge_code(code):
TOTAL_BIG_DEAL_MONEY_THRESHOLD_COUNT *= 3.3
+ TOTAL_BIG_DEAL_MONEY_THRESHOLD_MONEY_WITH_COMPUTE = TOTAL_BIG_DEAL_MONEY_THRESHOLD_COUNT * THRESHOLD_MONEY
+
human_setting_money = TotalDealBigOrderThresholdMoneyManager().get_money_cache(code)
if human_setting_money is not None:
TOTAL_BIG_DEAL_MONEY_THRESHOLD_MONEY = int(human_setting_money)
else:
- TOTAL_BIG_DEAL_MONEY_THRESHOLD_MONEY = TOTAL_BIG_DEAL_MONEY_THRESHOLD_COUNT * THRESHOLD_MONEY
+ TOTAL_BIG_DEAL_MONEY_THRESHOLD_MONEY = TOTAL_BIG_DEAL_MONEY_THRESHOLD_MONEY_WITH_COMPUTE
# if is_for_buy and is_temp_threshold_money:
# # 棣栨涓婃澘涔板叆锛屽ぇ鍗曢槇鍊兼墦3鎶�
@@ -1801,7 +1803,7 @@
except Exception as e:
async_log_util.info(logger_l2_radical_buy, f"璁＄畻姝ｅ湪鎴愪氦澶у崟鍑洪敊锛歿str(e)}")
total_lack_money = max(0, int(TOTAL_BIG_DEAL_MONEY_THRESHOLD_MONEY - deal_big_order_money))
- return total_lack_money, deal_big_order_money, TOTAL_BIG_DEAL_MONEY_THRESHOLD_MONEY
+ return total_lack_money, deal_big_order_money, TOTAL_BIG_DEAL_MONEY_THRESHOLD_MONEY, TOTAL_BIG_DEAL_MONEY_THRESHOLD_MONEY_WITH_COMPUTE
def is_big_order_deal_enough(code, volume_rate, refer_total_sell_money, for_buy=False, is_almost_open_limit_up=False):
--
Gitblit v1.8.0