From 8677d39f64869de0b0a6dcb58f61597d6041a056 Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期四, 04 七月 2024 18:45:28 +0800
Subject: [PATCH] 策略修改

---
 main.py |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/main.py b/main.py
index 7e91f1d..d1db388 100644
--- a/main.py
+++ b/main.py
@@ -280,10 +280,13 @@
                 async_log_util.info(logger_trade, f"姝h偂娑ㄥ仠锛屽噯澶囦拱鍏ュ彲杞�猴細{result}")
                 # 鑾峰彇鍙互涔扮殑浠g爜
                 code, trade_time = result[0], result[1]
+                buy_info = result[3]
+                # 绛栫暐绫诲瀷
+                strategy_type = buy_info[1]
 
                 # 鑾峰彇鑲$エ浠g爜鐨勫彲杞�轰唬鐮�
                 cb_code = target_codes_manager.get_cb_code(code)
-                if CodeTradeStateManager().get_trade_state(cb_code) == CodeTradeStateManager.TRADE_STATE_ALREADY_BUY:
+                if CodeTradeStateManager().get_trade_state(cb_code, strategy_type) == CodeTradeStateManager.TRADE_STATE_ALREADY_BUY:
                     async_log_util.info(logger_trade, f"宸茬粡涓嬪崟杩囷細{result}")
                     continue
                 # 鑾峰彇鍙浆鍊虹殑娑ㄥ仠浠�
@@ -300,7 +303,8 @@
                     async_log_util.info(logger_trade, f"鍑嗗涓嬪崟锛歿cb_code}-{buy_price}")
                     # 涔板叆20鑲�
                     result = huaxin_trade_api.order(1, cb_code, volume, buy_price, blocking=True)
-                    CodeTradeStateManager().set_trade_state(cb_code, CodeTradeStateManager.TRADE_STATE_ALREADY_BUY)
+                    CodeTradeStateManager().set_trade_state(cb_code, strategy_type,
+                                                            CodeTradeStateManager.TRADE_STATE_ALREADY_BUY)
                     async_log_util.info(logger_trade, f"鍙浆鍊轰笅鍗曠粨鏋滐細{result}")
                     huaxin_trade_data_update.add_position_list()
                     huaxin_trade_data_update.add_money_list()

--
Gitblit v1.8.0