From a6db14d8bf83be51d61b285a86f16ffe7b4ce5cf Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期四, 12 九月 2024 00:08:14 +0800
Subject: [PATCH] 激进买策略修复

---
 servers/huaxin_trade_server.py |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/servers/huaxin_trade_server.py b/servers/huaxin_trade_server.py
index bd403b9..802e42f 100644
--- a/servers/huaxin_trade_server.py
+++ b/servers/huaxin_trade_server.py
@@ -49,6 +49,7 @@
 from trade.huaxin import huaxin_trade_api as trade_api, huaxin_trade_api, huaxin_trade_data_update, \
     huaxin_trade_record_manager, huaxin_sell_util
 from api.outside_api_command_callback import OutsideApiCommandCallback
+from trade.radical_buy_data_manager import RedicalBuyDataManager
 from trade.sell.sell_rule_manager import TradeRuleManager
 from trade.trade_data_manager import RadicalBuyDealCodesManager
 from trade.trade_manager import CodesTradeStateManager
@@ -441,7 +442,8 @@
                 need_cancel, rule_id = DCancelBigNumComputer().need_cancel(code, buy_1_volume)
                 if need_cancel:
                     try:
-                        l2_data_manager_new.L2TradeDataProcessor.cancel_buy(code, f"鐩皝鍗曟挙:{time_str}-{buy_1_volume}", cancel_type=trade_constant.CANCEL_TYPE_D)
+                        l2_data_manager_new.L2TradeDataProcessor.cancel_buy(code, f"鐩皝鍗曟挙:{time_str}-{buy_1_volume}",
+                                                                            cancel_type=trade_constant.CANCEL_TYPE_D)
                     finally:
                         TradeRuleManager().excuted(rule_id)
         except Exception as e:
@@ -777,8 +779,8 @@
                 async_log_util.info(logger_l2_radical_buy, f"璇ヤ唬鐮佸凡缁忔垚浜わ細{code}")
                 return
 
-            k_format = code_nature_analyse.CodeNatureRecordManager().get_k_format_cache(code)
-            if k_format and k_format[13] and not k_format[14]:
+            can_buy_result = RedicalBuyDataManager.can_buy(code)
+            if can_buy_result[0]:
                 # 鑾峰彇婵�杩涗拱鐨勬澘鍧�
                 result_cache = self.__radical_buy_by_blocks_result_cache.get(code)
                 if not result_cache or result_cache[0] < time.time():
@@ -871,7 +873,9 @@
                                 time.time() + 3, buy_no)
                 else:
                     volume_rate = code_volumn_manager.get_volume_rate(code)
-                    async_log_util.info(logger_l2_radical_buy, f"鍥惧舰涓嶇鍚堣姹傦細{code},閲忔瘮锛歿volume_rate}")
+                    async_log_util.info(logger_l2_radical_buy, f"娌℃湁鍙壂鍏ョ殑鏉垮潡锛歿code},閲忔瘮锛歿volume_rate}")
+            else:
+                async_log_util.info(logger_l2_radical_buy, f"鐩墠浠g爜涓嶅彲浜ゆ槗锛歿code}-{can_buy_result[1]}")
         except Exception as e:
             async_log_util.info(logger_debug, f"婵�杩涗拱璁$畻寮傚父锛歿str(e)}")
 

--
Gitblit v1.8.0