From 0bca60accd9c3bb4d2fe6123d41db6be6ab2273d Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期六, 12 十月 2024 18:22:56 +0800
Subject: [PATCH] bug修复
---
api/outside_api_command_callback.py | 69 +++++++++++++++++++++++++++++++---
1 files changed, 62 insertions(+), 7 deletions(-)
diff --git a/api/outside_api_command_callback.py b/api/outside_api_command_callback.py
index 59c9995..d49dafc 100644
--- a/api/outside_api_command_callback.py
+++ b/api/outside_api_command_callback.py
@@ -1,3 +1,4 @@
+import base64
import concurrent.futures
import copy
import json
@@ -26,7 +27,7 @@
l2_data_source_util, cancel_buy_strategy
from l2.code_price_manager import Buy1PriceManager
-from l2.l2_data_manager import TradePointManager
+from l2.l2_data_manager import TradePointManager, OrderBeginPosInfo
from l2.l2_data_util import L2DataUtil
from l2.l2_transaction_data_manager import HuaXinBuyOrderManager, BigOrderDealManager
from log_module import async_log_util, log_export
@@ -35,7 +36,8 @@
logger_real_place_order_position, logger_device
from output import l2_output_util
from third_data import kpl_util, history_k_data_manager, huaxin_l1_data_manager, third_blocks_manager, kpl_data_manager
-from third_data.code_plate_key_manager import CodePlateKeyBuyManager, KPLCodeJXBlockManager
+from third_data.code_plate_key_manager import CodePlateKeyBuyManager, KPLCodeJXBlockManager, RealTimeKplMarketData, \
+ RadicalBuyBlockManager
from third_data.history_k_data_manager import HistoryKDataManager
from third_data.history_k_data_util import JueJinApi, HistoryKDatasUtils
from third_data.kpl_data_manager import KPLDataManager
@@ -44,6 +46,7 @@
from third_data.third_blocks_manager import CodeThirdBlocksManager, SOURCE_TYPE_KPL, BlockMapManager
from trade import trade_manager, l2_trade_util, trade_data_manager, trade_constant
import l2_data_util as l2_data_util_old
+from trade.buy_money_count_setting import BuyMoneyAndCountSetting, RadicalBuyBlockCodeCountManager
from trade.huaxin import huaxin_trade_api, huaxin_trade_data_update, \
huaxin_trade_record_manager, huaxin_trade_order_processor, huaxin_sell_util
@@ -279,10 +282,14 @@
code_list_type = data["code_list_type"]
operate = data["operate"]
code = data.get("code")
+ if code and not tool.is_can_buy_code(code):
+ raise Exception(f"涓嶆槸鍙互浜ゆ槗鐨勪唬鐮侊細{code}")
fresult = {"code": 0}
if code_list_type == outside_api_command_manager.CODE_LIST_WANT:
if operate == outside_api_command_manager.OPERRATE_SET:
gpcode_manager.WantBuyCodesManager().add_code(code)
+ # 鍔犳兂涔板崟瑕佷粠榛戝悕鍗曠Щ闄�
+ l2_trade_util.remove_from_forbidden_trade_codes(code)
name = gpcode_manager.get_code_name(code)
if not name:
results = HistoryKDatasUtils.get_gp_codes_names([code])
@@ -437,7 +444,8 @@
white = gpcode_manager.WhiteListCodeManager().is_in_cache(code)
black = l2_trade_util.is_in_forbidden_trade_codes(code)
pause_buy = gpcode_manager.PauseBuyCodesManager().is_in_cache(code)
-
+ must_buy = gpcode_manager.MustBuyCodesManager().is_in_cache(code)
+ green = gpcode_manager.GreenListCodeManager().is_in_cache(code)
desc_list = []
if want:
desc_list.append("銆愭兂涔板崟銆�")
@@ -447,6 +455,11 @@
desc_list.append("銆愰粦鍚嶅崟銆�")
if pause_buy:
desc_list.append("銆愭殏涓嶄拱銆�")
+ if must_buy:
+ desc_list.append("銆愮孩鍚嶅崟銆�")
+ if green:
+ desc_list.append("銆愮豢鍚嶅崟銆�")
+
result = {"code": 0, "data": {"code_info": (code, code_name), "desc": "".join(desc_list)}}
self.send_response(result, client_id, request_id)
except Exception as e:
@@ -864,7 +877,7 @@
# 鑾峰彇涓嬪崟浣嶇疆淇℃伅
order_begin_pos = TradePointManager().get_buy_compute_start_data_cache(code)
if order_begin_pos is None or order_begin_pos.buy_single_index is None:
- continue
+ order_begin_pos = OrderBeginPosInfo(buy_single_index=0, buy_exec_index=0)
l2_data_util.load_l2_data(code)
total_datas = l2_data_util.local_today_datas.get(code)
trade_index, is_default = transaction_progress.TradeBuyQueue().get_traded_index(code)
@@ -872,6 +885,8 @@
trade_index = 0
# 涓嬪崟浣嶇疆
place_order_index = SCancelBigNumComputer().get_real_place_order_index_cache(code)
+ if place_order_index is None:
+ place_order_index = 0
# 璁＄畻淇″彿浣嶇疆鍒扮湡瀹炰笅鍗曚綅缃殑鎬讳拱锛堜笉绠℃槸鍚﹀凡鎾わ級
total_nums = 0
for i in range(order_begin_pos.buy_single_index, place_order_index):
@@ -1229,18 +1244,19 @@
source_origin_dict = copy.deepcopy(CodeThirdBlocksManager().get_source_blocks_origin(code))
if not source_origin_dict:
source_origin_dict = {}
- kpl_blocks = KPLCodeJXBlockManager().get_jx_blocks_radical(code)
+ kpl_blocks = RadicalBuyBlockManager.get_code_kpl_blocks(code)
if kpl_blocks is None:
kpl_blocks = set()
if not kpl_blocks:
KPLCodeJXBlockManager().load_jx_blocks_radical(code)
- match_blocks, info = CodeThirdBlocksManager().get_intersection_blocks_info(code, kpl_blocks)
+
+ filter_blocks, match_blocks = RadicalBuyBlockManager.get_code_blocks(code)
source_origin_dict[SOURCE_TYPE_KPL] = kpl_blocks
source_dict[SOURCE_TYPE_KPL] = BlockMapManager().filter_blocks(kpl_blocks)
data = {
"blocks": {},
"origin_blocks": {},
- "match_blocks": list(match_blocks)
+ "match_blocks": [list(filter_blocks), list(match_blocks)]
}
for s in source_origin_dict:
data["origin_blocks"][s] = list(source_origin_dict[s])
@@ -1250,6 +1266,45 @@
self.send_response({"code": 0, "data": data, "msg": f""},
client_id,
request_id)
+ elif ctype == "set_buy_money_count_setting":
+ # 璁剧疆涔板叆閲戦鍜屾暟閲�
+ normal = data["normal"]
+ radical = data["radical"]
+ BuyMoneyAndCountSetting().set_normal_buy_data(normal[0], json.loads(normal[1]))
+ BuyMoneyAndCountSetting().set_radical_buy_data(radical[0], json.loads(radical[1]))
+ data = {
+ "normal": BuyMoneyAndCountSetting().get_normal_buy_setting(),
+ "radical": BuyMoneyAndCountSetting().get_radical_buy_setting()
+ }
+ self.send_response({"code": 0, "data": data, "msg": f""},
+ client_id,
+ request_id)
+ elif ctype == "get_buy_money_count_setting":
+ # 璁剧疆涔板叆閲戦鍜屾暟閲�
+ data = {
+ "normal": BuyMoneyAndCountSetting().get_normal_buy_setting(),
+ "radical": BuyMoneyAndCountSetting().get_radical_buy_setting(),
+ "moneys": constant.AVAILABLE_BUY_MONEYS
+ }
+ self.send_response({"code": 0, "data": data, "msg": f""},
+ client_id,
+ request_id)
+ elif ctype == "set_radical_buy_block_count_setting":
+ # 璁剧疆涔板叆閲戦鍜屾暟閲�
+ data_str = data["data"]
+ data_str = base64.b64decode(data_str).decode('utf-8')
+ setting = json.loads(data_str)
+ RadicalBuyBlockCodeCountManager().set_block_code_count(setting)
+ self.send_response({"code": 0, "data": setting, "msg": f""},
+ client_id,
+ request_id)
+ elif ctype == "get_radical_buy_block_count_setting":
+ # 璁剧疆涔板叆閲戦鍜屾暟閲�
+ data = RadicalBuyBlockCodeCountManager().get_block_code_count_settings()
+ self.send_response({"code": 0, "data": data, "msg": f""},
+ client_id,
+ request_id)
+
except Exception as e:
logging.exception(e)
logger_debug.exception(e)
--
Gitblit v1.8.0