From 245979e3907d34bcd88ac0c4547f399bf33a44de Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期三, 18 六月 2025 18:13:30 +0800
Subject: [PATCH] bug修复/策略完善
---
strategy/strategy_manager.py | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/strategy/strategy_manager.py b/strategy/strategy_manager.py
index d6acfb3..a9c585c 100644
--- a/strategy/strategy_manager.py
+++ b/strategy/strategy_manager.py
@@ -16,7 +16,7 @@
from strategy.strategy_variable_factory import DataLoader, StrategyVariableFactory
import constant
from third_data import kpl_util
-from trade.trade_manager import DealCodesManager
+from trade.trade_manager import DealCodesManager, PlatePlaceOrderManager
from utils import huaxin_util, tool
@@ -391,10 +391,14 @@
# 娉ㄥ叆鏉垮潡娴佸叆淇℃伅
if self.current_block_in_datas:
sv.璧勯噾娴佸叆鏉垮潡 = self.current_block_in_datas
- # 娉ㄥ叆宸叉垚浜や唬鐮�
- place_order_plate_codes = DealCodesManager().get_place_order_plate_codes()
+ # 娉ㄥ叆宸叉垚浜や唬鐮�,鎴愪氦浠ｇ爜浠ュ鎵樻暟鎹潵璁＄畻
+ place_order_plate_codes = PlatePlaceOrderManager().get_plate_codes()
sv.鏉垮潡鎴愪氦浠ｇ爜 = place_order_plate_codes
- sv.鎴愪氦浠ｇ爜 = DealCodesManager().get_deal_codes()
+
+ code_sets = [set(lst) for lst in place_order_plate_codes.values()]
+ # 2. 浣跨敤 set.union() 姹傚苟闆�
+ union_code_sets = set().union(*code_sets)
+ sv.鎴愪氦浠ｇ爜 = union_code_sets
global_dict = {
"sv": sv,
"target_code": code,
@@ -407,8 +411,11 @@
return
# 鍙互涓嬪崟
# 鍒ゆ柇鏄惁鍙互涔�
+ order_ref = huaxin_util.create_order_ref()
+ price = tool.get_buy_max_price(sv.褰撳墠浠�)
+ volume = 100
+ DealCodesManager().place_order(set(compute_result[3]), code, order_ref, price, volume)
for b in compute_result[3]:
- DealCodesManager().place_order(b, code)
async_log_util.info(logger_trade, f"{code}涓嬪崟锛屾澘鍧楋細{compute_result[3]}")
--
Gitblit v1.8.0