From d424997fce8151bb020ed7d33a0fa6fb74e5be9c Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期四, 09 一月 2025 14:47:46 +0800
Subject: [PATCH] BUG修复
---
third_data/kpl_data_constant.py | 4 +++-
trade/trade_manager.py | 25 ++++++++++++++-----------
2 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/third_data/kpl_data_constant.py b/third_data/kpl_data_constant.py
index e42055b..05afea7 100644
--- a/third_data/kpl_data_constant.py
+++ b/third_data/kpl_data_constant.py
@@ -2,6 +2,7 @@
import constant
from db import redis_manager_delegate as redis_manager
from db.redis_manager_delegate import RedisUtils
+from third_data import kpl_util
from third_data.third_blocks_manager import BlockMapManager
from utils import tool
@@ -139,7 +140,8 @@
# 鍙栨定鍋滄鏁版渶澶氱殑鍜屾渶杩戞定鍋滅殑
blocks.add(block_infos[0][0])
blocks -= constant.KPL_INVALID_BLOCKS
- return blocks
+ # 鍘婚櫎渚嬪姒傚康杩欎簺娉涙寚璇�
+ return set([kpl_util.filter_block(x) for x in blocks])
def get_limit_up_reasons(self, code):
"""
diff --git a/trade/trade_manager.py b/trade/trade_manager.py
index c49f5bb..add8ec3 100644
--- a/trade/trade_manager.py
+++ b/trade/trade_manager.py
@@ -580,12 +580,14 @@
if trade_gui is not None:
trade_gui.THSBuyWinManagerNew.cancel_distribute_win_for_code(code)
# 浜ゆ槗鎴愬姛鏃堕棿杩囧幓3s涔嬪悗锛屼笖褰撳墠濮旀墭鍒楄〃閲岄潰杩樻湁璇ヤ唬鐮佹暟鎹氨鍐嶆鎵ц鎾ゅ崟
- if tool.trade_time_sub(tool.get_now_time_str(), _time) > 3:
- # 鑾峰彇鍒板綋鍓嶆槸鍚﹀鎵�
- for dd in latest_trade_delegate_data:
- if dd["code"] == code:
- logger_trade.info("{}浜ゆ槗鎴愬姛瑙﹀彂锛岄噸澶嶄笅鍗曟挙鍗�".format(code))
- start_cancel_buy(code, True)
+ # 鏂扮増涓嬪崟涓嶅鐞�
+ if not constant.IS_NEW_VERSION_PLACE_ORDER:
+ if tool.trade_time_sub(tool.get_now_time_str(), _time) > 3:
+ # 鑾峰彇鍒板綋鍓嶆槸鍚﹀鎵�
+ for dd in latest_trade_delegate_data:
+ if dd["code"] == code:
+ logger_trade.info("{}浜ゆ槗鎴愬姛瑙﹀彂锛岄噸澶嶄笅鍗曟挙鍗�".format(code))
+ start_cancel_buy(code, True)
# 澶勭悊濮旀墭鎴愬姛鏁版嵁
@@ -596,7 +598,6 @@
latest_trade_delegate_data.extend(datas)
codes = []
for data in datas:
-
code = data["code"]
if code is not None:
codes.append(code)
@@ -665,10 +666,12 @@
RadicalBuyDealCodesManager().add_deal_code(code)
# 鍙杝娑堟墍鏈夌殑鎸傚崟
if constant.API_TRADE_ENABLE:
- if constant.TRADE_WAY == constant.TRADE_WAY_JUEJIN:
- trade_juejin.cancel_order(code)
- elif constant.TRADE_WAY == constant.TRADE_WAY_HUAXIN:
- trade_huaxin.cancel_order(code)
+ if not constant.IS_NEW_VERSION_PLACE_ORDER:
+ # 鏂扮増鏈媶鍗曚笅鍗曚笉鎾ゅ崟
+ if constant.TRADE_WAY == constant.TRADE_WAY_JUEJIN:
+ trade_juejin.cancel_order(code)
+ elif constant.TRADE_WAY == constant.TRADE_WAY_HUAXIN:
+ trade_huaxin.cancel_order(code)
else:
guiTrade.cancel_buy(code)
--
Gitblit v1.8.0