From 331d8caf63a7119c8cf2d1faef28b5450b8f40f5 Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期五, 11 十月 2024 18:41:24 +0800
Subject: [PATCH] bug修复/新增加接口
---
servers/huaxin_trade_server.py | 31 ++++++++-----------------------
1 files changed, 8 insertions(+), 23 deletions(-)
diff --git a/servers/huaxin_trade_server.py b/servers/huaxin_trade_server.py
index 170af6b..cc85103 100644
--- a/servers/huaxin_trade_server.py
+++ b/servers/huaxin_trade_server.py
@@ -44,7 +44,7 @@
TargetCodePlateKeyManager
from third_data.history_k_data_util import JueJinApi
from trade import trade_manager, l2_trade_util, \
- trade_data_manager, trade_constant, radical_buy_strategy
+ trade_data_manager, trade_constant, radical_buy_strategy, radical_buy_data_manager
from trade.buy_money_count_setting import BuyMoneyAndCountSetting
from trade.huaxin import huaxin_trade_api as trade_api, huaxin_trade_api, huaxin_trade_data_update, \
@@ -791,7 +791,8 @@
async_log_util.info(logger_l2_radical_buy, f"璇ヤ唬鐮佸凡缁忔垚浜わ細{code}")
return
- can_buy_result = RedicalBuyDataManager.can_buy(code, DealAndDelegateWithBuyModeDataManager().get_deal_codes())
+ # 鍗曠エ鏄惁鍙拱
+ can_buy_result = RedicalBuyDataManager.can_buy(code)
if can_buy_result[0]:
# 鑾峰彇婵�杩涗拱鐨勬澘鍧�
result_cache = self.__radical_buy_by_blocks_result_cache.get(code)
@@ -800,6 +801,7 @@
yesterday_codes = kpl_data_manager.get_yesterday_limit_up_codes()
if yesterday_codes is None:
yesterday_codes = set()
+ # 璁＄畻鏄惁鍙互鎵叆
radical_result = RadicalBuyBlockManager.is_radical_buy(code, yesterday_codes)
async_log_util.info(logger_l2_radical_buy, f"璁＄畻鏉垮潡缁撴灉锛歿code}-{radical_result}")
result_cache = (time.time() + 3, radical_result)
@@ -813,28 +815,11 @@
# 濡傛灉鍏抽敭璇嶅寘鍚凡鎴愪氦鐨勫師鍥犲氨涓嶅啀涓嬪崟
# 鑾峰彇宸茬粡鎴愪氦浠ｇ爜鐨勬澘鍧�
try:
- # ---------------鑾峰彇宸茬粡鎴愪氦浠ｇ爜鐨勬澘鍧�----------------
- deal_reasons = set()
- for dc in deal_codes:
- # 鑾峰彇娑ㄥ仠鍘熷洜
- limit_up_reason = kpl_data_manager.LimitUpDataConstant.get_limit_up_reason_with_history(dc)
- if limit_up_reason and limit_up_reason in constant.KPL_INVALID_BLOCKS:
- limit_up_reason = None
- # 濡傛灉娑ㄥ仠鍘熷洜涓虹┖灏遍渶瑕佽幏鍙栦笂娆℃縺杩涗拱鐨勫師鍥�
- if not limit_up_reason:
- radical_buy_blocks = RadicalBuyDealCodesManager.radical_buy_blocks_dict.get(dc)
- if radical_buy_blocks:
- deal_reasons |= radical_buy_blocks
- else:
- deal_reasons.add(limit_up_reason)
- async_log_util.info(logger_l2_radical_buy, f"宸茬粡鎴愪氦鐨勬澘鍧楋細{deal_reasons}")
- # 鎴愪氦浠ｇ爜鐨勬澘鍧楀鏋滃拰鐩爣浠ｇ爜鏉垮潡鏈変氦闆嗗氨涓嶆壂
- keys_, k1_, k11_, k2_, k3_, k4_ = TargetCodePlateKeyManager().get_plate_keys(code,
- contains_today=False)
- match_blocks = keys_ & deal_reasons
- if match_blocks:
- async_log_util.info(logger_l2_radical_buy, f"鏉垮潡鏈夋垚浜わ細{code}-{match_blocks}")
+ # ---------------鍒ゆ柇鏉垮潡鏄惁杩樺彲浠ヤ拱鍏�----------------
+ f_buy_blocks = radical_buy_data_manager.is_block_can_radical_buy(code, buy_blocks, deal_codes)
+ if not f_buy_blocks:
return
+ buy_blocks = f_buy_blocks
except Exception as e:
logger_debug.exception(e)
--
Gitblit v1.8.0