From 3e0fbec6da243d42721781cd2e085ea9c787d304 Mon Sep 17 00:00:00 2001
From: zhiyong <yuzhiyongcn@qq.com>
Date: Mon, 12 May 2025 10:20:07 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E9=9D=99=E6=80=81=E6=96=B9=E6=B3=95is?=
 =?UTF-8?q?=5Ftrading=5Ftime?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/base_trader.py                  | 7 ++++---
 src/simulation/simulation_trader.py | 8 ++------
 src/trade_server.py                 | 4 ++--
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/base_trader.py b/src/base_trader.py
index 4f326c2..a82f37b 100644
--- a/src/base_trader.py
+++ b/src/base_trader.py
@@ -142,7 +142,7 @@ class BaseTrader(ABC):
         pass
 
     @staticmethod
-    def is_trading_time(self):
+    def is_trading_time():
         """判断当前是否为交易时间
             
         Returns:
@@ -152,7 +152,7 @@ class BaseTrader(ABC):
             now = dt.datetime.now()
             
             # 先判断是否为交易日
-            if not self.is_trading_date():
+            if not BaseTrader.is_trading_date():
                 return False
                 
             # 判断是否在交易时间段内
@@ -169,7 +169,8 @@ class BaseTrader(ABC):
             return is_morning_session or is_afternoon_session
             
         except Exception as e:
-            self.logger.error(f"判断交易时间发生错误: {str(e)}")
+            logger = get_logger("BaseTrader")
+            logger.error(f"判断交易时间发生错误: {str(e)}")
             return False
     
     @staticmethod
diff --git a/src/simulation/simulation_trader.py b/src/simulation/simulation_trader.py
index d044a48..5e0cfce 100644
--- a/src/simulation/simulation_trader.py
+++ b/src/simulation/simulation_trader.py
@@ -148,9 +148,7 @@ class SimulationTrader(BaseTrader):
         self.logger.info(message)
         return {"message": "模拟交易：查询今日委托未实现", "success": True}
 
-    def is_trading_time(self):
-        return True
-
+    
     def get_position(self, stock_code, strategy_name="default_strategy"):
         """查询指定股票代码的持仓信息
         Args:
@@ -188,6 +186,4 @@ class SimulationTrader(BaseTrader):
                 }
         return None
 
-    def is_trading_time(self):
-        return True
-
+   
diff --git a/src/trade_server.py b/src/trade_server.py
index a6a38c6..1b2fee2 100644
--- a/src/trade_server.py
+++ b/src/trade_server.py
@@ -293,7 +293,7 @@ def buy():
             }), 503
 
         # 检查是否在交易时间内
-        if not trader.is_trading_time():
+        if not BaseTrader.is_trading_time():
             logger.warning(
                 f"交易失败 - 非交易时间不能交易 - 代码: {code}, 价格: {price}, 数量: {amount}"
             )
@@ -361,7 +361,7 @@ def sell():
             }), 503
 
         # 检查是否在交易时间内
-        if not trader.is_trading_time():
+        if not BaseTrader.is_trading_time():
             logger.warning(
                 f"交易失败 - 非交易时间不能交易 - 代码: {code}, 价格: {price}, 数量: {amount}"
             )