From a00da3062c6c825b585f82275823ac45cdeb6502 Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期五, 19 一月 2024 19:16:20 +0800
Subject: [PATCH] L后成交太快撤单
---
l2/l2_data_manager_new.py | 1154 +++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 871 insertions(+), 283 deletions(-)
diff --git a/l2/l2_data_manager_new.py b/l2/l2_data_manager_new.py
index 8be557b..ee7e1d3 100644
--- a/l2/l2_data_manager_new.py
+++ b/l2/l2_data_manager_new.py
@@ -1,39 +1,39 @@
-import io
+import copy
import logging
-import threading
+import random
import time as t
from code_attribute import big_money_num_manager, code_volumn_manager, code_data_util, industry_codes_sort, \
- limit_up_time_manager, global_data_loader, gpcode_manager
+ limit_up_time_manager, global_data_loader, gpcode_manager, code_nature_analyse
import constant
+from code_attribute.code_nature_analyse import HighIncreaseCodeManager
from db.redis_manager_delegate import RedisUtils
from l2.huaxin import l2_huaxin_util, huaxin_delegate_postion_manager
-from log_module import async_log_util
-from third_data import kpl_data_manager, block_info
-from trade.deal_big_money_manager import DealComputeProgressManager
-from utils import global_util, ths_industry_util, tool
+from l2.l2_sell_manager import L2MarketSellManager, L2LimitUpSellManager
+from l2.transaction_progress import TradeBuyQueue
+from log_module import async_log_util, log_export
+from third_data import kpl_data_manager, block_info, history_k_data_util
+from third_data.history_k_data_util import HistoryKDatasUtils
+from utils import global_util, ths_industry_util, tool, buy_condition_util
import l2_data_util
from db import redis_manager_delegate as redis_manager
-from third_data.code_plate_key_manager import CodePlateKeyBuyManager
+from third_data.code_plate_key_manager import CodePlateKeyBuyManager, KPLCodeJXBlockManager, LimitUpCodesPlateKeyManager
from trade import trade_manager, trade_queue_manager, l2_trade_factor, l2_trade_util, \
- trade_result_manager, current_price_process_manager, trade_data_manager, trade_huaxin
-from l2 import safe_count_manager, l2_data_manager, l2_log, l2_data_source_util, code_price_manager, \
- transaction_progress, cancel_buy_strategy
+ trade_result_manager, current_price_process_manager, trade_data_manager, trade_huaxin, trade_record_log_util
+from l2 import l2_data_manager, l2_log, l2_data_source_util, code_price_manager, \
+ transaction_progress, cancel_buy_strategy, l2_data_log
from l2.cancel_buy_strategy import SecondCancelBigNumComputer, HourCancelBigNumComputer, DCancelBigNumComputer, \
- LCancelBigNumComputer
-from l2.l2_data_manager import L2DataException
+ LCancelBigNumComputer, LatestCancelIndexManager, LCancelRateManager, GCancelBigNumComputer
+from l2.l2_data_manager import L2DataException, OrderBeginPosInfo
from l2.l2_data_util import local_today_datas, L2DataUtil, local_today_num_operate_map, local_today_buyno_map, \
- local_latest_datas
+ local_latest_datas, local_today_canceled_buyno_map
import l2.l2_data_util
-from log_module.log import logger_l2_trade_buy, logger_l2_process, logger_l2_error, logger_profile, logger_debug
+from log_module.log import logger_l2_trade_buy, logger_l2_process, logger_l2_error, logger_debug, \
+ logger_l2_not_buy_reasons
-from trade.trade_data_manager import CodeActualPriceProcessor
+from trade.trade_data_manager import CodeActualPriceProcessor, PlaceOrderCountManager
-from line_profiler import LineProfiler
-
-import dask
-
-from trade.trade_manager import TradeTargetCodeModeManager, AccountAvailableMoneyManager
+from trade.trade_manager import TradeTargetCodeModeManager, AccountAvailableMoneyManager, MarketSituationManager
class L2DataManager:
@@ -174,9 +174,9 @@
# 濡傛灉鏄定鍋滀拱鎾や俊鍙烽渶瑕佺湅鏁版嵁浣嶇疆鏄惁姣斿紑濮嬪鐞嗘椂闂存棭
if L2DataUtil.is_limit_up_price_buy_cancel(data["val"]):
# 鑾峰彇涔板叆淇″彿
- buy_index = l2_data_source_util.L2DataSourceUtils.get_buy_index_with_cancel_data(code, total_datas[i],
- local_today_num_operate_map.get(
- code))
+ buy_index = l2_data_source_util.L2DataSourceUtils.get_buy_index_with_cancel_data_v2(total_datas[i],
+ local_today_buyno_map.get(
+ code))
if buy_index is not None and buy_index < begin_pos:
continue
@@ -207,21 +207,23 @@
class L2TradeDataProcessor:
unreal_buy_dict = {}
volume_rate_info = {}
+ # 鏈�杩戠殑闂數涓嬪崟浣嶇疆,鏍煎紡涓簕code:(鎬诲崠鏃堕棿,鎬诲崠棰�)}
+ __latest_fast_place_order_info_dict = {}
__codeActualPriceProcessor = CodeActualPriceProcessor()
__ths_l2_trade_queue_manager = trade_queue_manager.thsl2tradequeuemanager()
__thsBuy1VolumnManager = trade_queue_manager.THSBuy1VolumnManager()
- __buyL2SafeCountManager = safe_count_manager.BuyL2SafeCountManager()
__l2PlaceOrderParamsManagerDict = {}
__last_buy_single_dict = {}
__TradeBuyQueue = transaction_progress.TradeBuyQueue()
__latest_process_order_unique_keys = {}
- __latest_process_not_order_unique_keys = {}
+ __latest_process_not_order_unique_keys_count = {}
+ __trade_log_placr_order_info_dict = {} # 涓嬪崟淇℃伅淇濆瓨
# 鍒濆鍖�
__TradePointManager = l2_data_manager.TradePointManager()
__SecondCancelBigNumComputer = SecondCancelBigNumComputer()
__HourCancelBigNumComputer = HourCancelBigNumComputer()
__LCancelBigNumComputer = LCancelBigNumComputer()
- __DCancelBigNumComputer = DCancelBigNumComputer()
+ __GCancelBigNumComputer = GCancelBigNumComputer()
__TradeStateManager = trade_manager.TradeStateManager()
__CodesTradeStateManager = trade_manager.CodesTradeStateManager()
__PauseBuyCodesManager = gpcode_manager.PauseBuyCodesManager()
@@ -229,12 +231,17 @@
__AccountAvailableMoneyManager = AccountAvailableMoneyManager()
__TradeBuyDataManager = trade_data_manager.TradeBuyDataManager()
__LimitUpTimeManager = limit_up_time_manager.LimitUpTimeManager()
- __BlackListCodeManager = l2_trade_util.BlackListCodeManager()
- __WhiteListCodeManager = l2_trade_util.WhiteListCodeManager()
+ __BlackListCodeManager = gpcode_manager.BlackListCodeManager()
+ __WhiteListCodeManager = gpcode_manager.WhiteListCodeManager()
__WantBuyCodesManager = gpcode_manager.WantBuyCodesManager()
__TradeTargetCodeModeManager = TradeTargetCodeModeManager()
- __DealComputeProgressManager = DealComputeProgressManager()
__TradeOrderIdManager = trade_huaxin.TradeOrderIdManager()
+ __LatestCancelIndexManager = LatestCancelIndexManager()
+ __L2MarketSellManager = L2MarketSellManager()
+ __L2LimitUpSellManager = L2LimitUpSellManager()
+ __PlaceOrderCountManager = PlaceOrderCountManager()
+ __CodeNatureRecordManager = code_nature_analyse.CodeNatureRecordManager()
+ __MarketSituationManager = MarketSituationManager()
# 鑾峰彇浠ｇ爜璇勫垎
@classmethod
@@ -288,72 +295,73 @@
cls.unreal_buy_dict.pop(code)
@classmethod
- def set_real_place_order_index(cls, code, index, buy_single_index):
- cancel_buy_strategy.set_real_place_position(code, index, buy_single_index)
+ def set_real_place_order_index(cls, code, index, order_begin_pos: OrderBeginPosInfo):
+ trade_record_log_util.add_real_place_order_position_log(code, index, order_begin_pos.buy_single_index)
+ l2_log.debug(code, "璁剧疆鐪熷疄涓嬪崟浣嶏細{}", index)
+ cancel_buy_strategy.set_real_place_position(code, index, order_begin_pos.buy_single_index)
# 澶勭悊鍗庨懌L2鏁版嵁
@classmethod
def process_huaxin(cls, code, origin_datas):
- print("process_huaxin", code, len(origin_datas))
datas = None
- origin_start_time = round(t.time() * 1000)
try:
+ l2_data_log.l2_time_log(code, "寮�濮嬪姞杞藉巻鍙叉暟鎹�")
# 鍔犺浇鍘嗗彶鐨凩2鏁版嵁
is_normal = l2.l2_data_util.load_l2_data(code, load_latest=False)
if not is_normal:
- print("鍘嗗彶鏁版嵁寮傚父:", code)
# 鏁版嵁涓嶆甯搁渶瑕佺姝氦鏄�
l2_trade_util.forbidden_trade(code, msg="L2鍘嗗彶鏁版嵁寮傚父")
- origin_start_time = round(t.time() * 1000)
# 杞崲鏁版嵁鏍煎紡
_start_index = 0
total_datas = local_today_datas.get(code)
if total_datas:
_start_index = total_datas[-1]["index"] + 1
+ l2_data_log.l2_time_log(code, "寮�濮嬫牸寮忓寲鍘熷鏁版嵁")
datas = l2_huaxin_util.get_format_l2_datas(code, origin_datas,
gpcode_manager.get_limit_up_price(code), _start_index)
__start_time = round(t.time() * 1000)
+ l2_data_log.l2_time_log(code, "寮�濮嬪鐞嗘暟鎹�")
if len(datas) > 0:
cls.process_add_datas(code, datas, 0, __start_time)
- else:
- pass
- # lp = LineProfiler()
- # lp.enable()
- # lp_wrap = lp(cls.process_add_datas)
- # lp_wrap(code, datas, 0, __start_time)
- # output = io.StringIO()
- # lp.print_stats(stream=output)
- # lp.disable()
- # with open(f"/home/logs/profile/{code}_{datas[0]['index']}_{datas[-1]['index']}.txt", 'w') as f:
- # f.write(output.getvalue())
- # lp.dump_stats(f"/home/logs/profile/{code}_{round(t.time() * 1000)}.txt")
except Exception as e:
- async_log_util.error(logger_l2_error,f"code:{code}")
- async_log_util.exception(logger_l2_error, e)
+ async_log_util.error(logger_l2_error, f"code:{code}")
+ # async_log_util.exception(logger_l2_error, e)
+ logger_l2_error.exception(e)
finally:
- # l2_data_log.l2_time(code, round(t.time() * 1000) - origin_start_time,
- # "l2鏁版嵁澶勭悊鎬昏�楁椂",
- # True)
if datas:
+ l2_data_log.l2_time_log(code, "寮�濮嬩繚瀛樻暟鎹�")
l2.l2_data_util.save_l2_data(code, None, datas)
+ origin_datas.clear()
@classmethod
def process_add_datas(cls, code, add_datas, capture_timestamp, __start_time):
now_time_str = tool.get_now_time_str()
if len(add_datas) > 0:
+ if code not in cls.__trade_log_placr_order_info_dict:
+ cls.__trade_log_placr_order_info_dict[code] = trade_record_log_util.PlaceOrderInfo()
# 鎷兼帴鏁版嵁
local_today_datas[code].extend(add_datas)
l2.l2_data_util.load_num_operate_map(local_today_num_operate_map, code, add_datas)
l2.l2_data_util.load_buy_no_map(local_today_buyno_map, code, add_datas)
+ l2.l2_data_util.load_canceled_buy_no_map(local_today_canceled_buyno_map, code, add_datas)
+ l2_data_log.l2_time_log(code, "process_add_datas 鍔犺浇瀹屾暟鎹�")
if constant.L2_SOURCE_TYPE == constant.L2_SOURCE_TYPE_HUAXIN:
try:
- # 鑾峰彇涓嬪崟浣嶇疆
- place_order_index = huaxin_delegate_postion_manager.get_l2_place_order_position(code, add_datas)
- if place_order_index:
- buy_single_index, buy_exec_index, buy_compute_index, num, count, max_num_set, buy_volume_rate = cls.__get_order_begin_pos(
- code)
- cls.set_real_place_order_index(code, place_order_index, buy_single_index)
- async_log_util.info(logger_l2_process, "code:{} 鑾峰彇鍒颁笅鍗曠湡瀹炰綅缃細{}", code, place_order_index)
+ if constant.TEST:
+ pass
+ # order_begin_pos = cls.__get_order_begin_pos(code)
+ # if order_begin_pos.buy_exec_index and order_begin_pos.buy_exec_index>=0:
+ # place_order_index = add_datas[-1]["index"]
+ # cls.set_real_place_order_index(code, place_order_index, order_begin_pos.buy_single_index)
+ else:
+ # 鑾峰彇涓嬪崟浣嶇疆
+ place_order_index = huaxin_delegate_postion_manager.get_l2_place_order_position(code, float(
+ gpcode_manager.get_limit_up_price(code)), add_datas)
+ if place_order_index:
+ order_begin_pos = cls.__get_order_begin_pos(
+ code)
+ cls.set_real_place_order_index(code, place_order_index, order_begin_pos)
+ async_log_util.info(logger_l2_process, "code:{} 鑾峰彇鍒颁笅鍗曠湡瀹炰綅缃細{}", code, place_order_index)
except:
async_log_util.error(logger_l2_error, f"{code} 澶勭悊鐪熷疄涓嬪崟浣嶇疆鍑洪敊")
# 绗�1鏉℃暟鎹槸鍚︿负09:30:00
@@ -370,17 +378,22 @@
# __start_time = l2_data_log.l2_time(code, round(t.time() * 1000) - __start_time,
# "l2鏁版嵁棰勫鐞嗘椂闂�")
- if len(add_datas) > 0:
+ # 9:29:55寮�濮嬪鐞嗘暟鎹�
+ if len(add_datas) > 0 and int(tool.get_now_time_str().replace(":", "")) > int("092955"):
# 鏄惁涓洪鏉夸唬鐮�
is_first_code = True # gpcode_manager.FirstCodeManager().is_in_first_record(code)
# 璁＄畻閲�
- volume_rate = code_volumn_manager.get_volume_rate(code)
+ current_sell = cls.__L2MarketSellManager.get_current_total_sell_data(code)
+ total_sell_volume = 0
+ if current_sell and len(current_sell) > 2:
+ total_sell_volume = current_sell[2]
+ volume_rate = code_volumn_manager.get_volume_rate(code, total_sell_volume=total_sell_volume)
volume_rate_index = code_volumn_manager.get_volume_rate_index(volume_rate)
# 璁＄畻鍒嗗��
limit_up_time = cls.__LimitUpTimeManager.get_limit_up_time_cache(code)
if limit_up_time is None:
limit_up_time = tool.get_now_time_str()
- # score = first_code_score_manager.get_score(code, volume_rate, limit_up_time, True)
+
score = None
cls.__l2PlaceOrderParamsManagerDict[code] = l2_trade_factor.L2PlaceOrderParamsManager(code, is_first_code,
volume_rate,
@@ -396,27 +409,31 @@
# "l2鏁版嵁鍑嗗鏃堕棿")
# 鏃堕棿宸笉鑳藉お澶ф墠鑳藉鐞�
if not l2_trade_util.is_in_forbidden_trade_codes(code):
+ # 璁＄畻鏉夸笂鍗�,褰撴暟鎹皯鏃舵墠璁＄畻锛屽惁鍒欎笉璁＄畻
+ try:
+ if len(add_datas) < 20:
+ has_limit_up_sell = False
+ for d in add_datas:
+ if L2DataUtil.is_limit_up_price_sell(d["val"]):
+ if d["val"]["num"] * float(d["val"]["price"]) < 5000:
+ continue
+ cls.__L2LimitUpSellManager.add_limit_up_sell(code, d["index"])
+ has_limit_up_sell = True
+ if has_limit_up_sell:
+ LCancelRateManager.compute_big_num_deal_rate(code)
+ # elif L2DataUtil.is_limit_up_price_sell_cancel(d["val"]):
+ # cls.__L2LimitUpSellManager.add_limit_up_sell(code, d["index"])
+ except Exception as e:
+ async_log_util.error(logger_l2_error, f"璁＄畻鏉夸笂鍗栧嚭閿欙細{str(e)}")
+
# 鍒ゆ柇鏄惁宸茬粡鎸傚崟
state = cls.__CodesTradeStateManager.get_trade_state_cache(code)
start_index = len(total_datas) - len(add_datas)
end_index = len(total_datas) - 1
+ l2_data_log.l2_time_log(code, "process_add_datas 寮�濮嬪鐞�")
if state == trade_manager.TRADE_STATE_BUY_DELEGATED or state == trade_manager.TRADE_STATE_BUY_PLACE_ORDER or state == trade_manager.TRADE_STATE_BUY_SUCCESS:
# 宸叉寕鍗�
- if True: # len(add_datas) < 10:
- cls.__process_order(code, start_index, end_index, capture_timestamp, is_first_code)
- else:
- pass
- # lp = LineProfiler()
- # lp.enable()
- # lp_wrap = lp(cls.__process_order)
- # lp_wrap(code, start_index, end_index, capture_timestamp, is_first_code)
- # output = io.StringIO()
- # lp.print_stats(stream=output)
- # lp.disable()
- # with open(
- # f"/home/logs/profile/{code}_process_order_{add_datas[0]['index']}_{add_datas[-1]['index']}.txt",
- # 'w') as f:
- # f.write(output.getvalue())
+ cls.__process_order(code, start_index, end_index, capture_timestamp, is_first_code)
else:
# 鏈寕鍗�,鏃堕棿鐩稿樊涓嶅ぇ鎵嶈兘鎸傚崟
if l2.l2_data_util.L2DataUtil.is_same_time(now_time_str, latest_time):
@@ -426,8 +443,6 @@
add_datas[0]["index"],
add_datas[-1]["index"], round(t.time() * 1000) - __start_time,
capture_timestamp)
- # __start_time = l2_data_log.l2_time(code, round(t.time() * 1000) - __start_time,
- # "l2鏁版嵁澶勭悊鏃堕棿")
# 澶勭悊鏈寕鍗�
@classmethod
@@ -435,21 +450,7 @@
__start_time = round(t.time() * 1000)
# 鑾峰彇闃堝��
threshold_money, msg = cls.__get_threshmoney(code)
- # if round(t.time() * 1000) - __start_time > 10:
- # __start_time = l2_data_log.l2_time(code, round(t.time() * 1000) - __start_time,
- # "鑾峰彇m鍊兼暟鎹�楁椂")
- if True: # end_index - start_index < 10:
- cls.__start_compute_buy(code, start_index, end_index, threshold_money, capture_time, is_first_code)
- else:
- # pass
- lp = LineProfiler()
- lp.enable()
- lp_wrap = lp(cls.__start_compute_buy)
- lp_wrap(code, start_index, end_index, threshold_money, capture_time, is_first_code)
- output = io.StringIO()
- lp.print_stats(stream=output)
- lp.disable()
- logger_profile.info(output.getvalue())
+ cls.__start_compute_buy(code, start_index, end_index, threshold_money, capture_time, is_first_code)
# 娴嬭瘯涓撶敤
@classmethod
@@ -484,7 +485,8 @@
return b_cancel_data, "S澶у崟鎾ら攢姣斾緥瑙﹀彂闃堝��"
except Exception as e:
logging.exception(e)
- async_log_util.error(logger_l2_error, f"鍙傛暟锛歜uy_single_index-{_buy_single_index} buy_exec_index-{_buy_exec_index}")
+ async_log_util.error(logger_l2_error,
+ f"S鎾ゅ嚭閿� 鍙傛暟锛歜uy_single_index-{_buy_single_index} buy_exec_index-{_buy_exec_index}")
async_log_util.exception(logger_l2_error, e)
finally:
# l2_data_log.l2_time(code, round(t.time() * 1000) - _start_time,
@@ -499,17 +501,19 @@
b_need_cancel, b_cancel_data = cls.__HourCancelBigNumComputer.need_cancel(code, _buy_single_index,
_buy_exec_index, start_index,
end_index, total_data,
- local_today_num_operate_map.get(
- code),
code_volumn_manager.get_volume_rate_index(
- buy_volume_rate),
+ order_begin_pos.buy_volume_rate),
cls.volume_rate_info[code][1],
is_first_code)
if b_need_cancel and b_cancel_data:
- return b_cancel_data, "H鎾ら攢姣斾緥瑙﹀彂闃堝��"
+ return b_cancel_data, "H鎾�"
except Exception as e:
- async_log_util.error(logger_l2_error, f"鍙傛暟锛歜uy_single_index-{_buy_single_index} buy_exec_index-{_buy_exec_index}")
+ if constant.TEST:
+ logging.exception(e)
+ async_log_util.error(logger_l2_error,
+ f"H鎾ゅ嚭閿� 鍙傛暟锛歜uy_single_index-{_buy_single_index} buy_exec_index-{_buy_exec_index} {str(e)}")
async_log_util.exception(logger_l2_error, e)
+ # logger_l2_error.exception(e)
finally:
# l2_data_log.l2_time(code, round(t.time() * 1000) - _start_time, "宸蹭笅鍗�-H鎾ゅぇ鍗曡绠�")
pass
@@ -519,15 +523,36 @@
def l_cancel(_buy_single_index, _buy_exec_index):
_start_time = round(t.time() * 1000)
try:
- b_need_cancel, b_cancel_data = cls.__LCancelBigNumComputer.need_cancel(code,
- _buy_exec_index, start_index,
- end_index, total_data,
- local_today_num_operate_map.get(
- code), is_first_code)
+ b_need_cancel, b_cancel_data, extra_msg = cls.__LCancelBigNumComputer.need_cancel(code,
+ _buy_exec_index,
+ start_index,
+ end_index, total_data,
+ is_first_code)
if b_need_cancel and b_cancel_data:
- return b_cancel_data, "L鎾ら攢姣斾緥瑙﹀彂闃堝��"
+ return b_cancel_data, f"L鎾�({extra_msg})"
except Exception as e:
- async_log_util.error(logger_l2_error, f"鍙傛暟锛歜uy_single_index-{_buy_single_index} buy_exec_index-{_buy_exec_index}")
+ async_log_util.error(logger_l2_error,
+ f"L鎾ゅ嚭閿� 鍙傛暟锛歜uy_single_index-{_buy_single_index} buy_exec_index-{_buy_exec_index} 閿欒鍘熷洜锛歿str(e)}")
+ # logger_l2_error.exception(e)
+ async_log_util.exception(logger_l2_error, e)
+ finally:
+ # l2_data_log.l2_time(code, round(t.time() * 1000) - _start_time, "宸蹭笅鍗�-L鎾ゅぇ鍗曡绠�")
+ pass
+ return None, ""
+
+ # G鎾�
+ def g_cancel(_buy_single_index, _buy_exec_index):
+ try:
+ b_need_cancel, b_cancel_data, extra_msg = cls.__GCancelBigNumComputer.need_cancel(code,
+ _buy_exec_index,
+ start_index,
+ end_index)
+ if b_need_cancel and b_cancel_data:
+ return b_cancel_data, f"G鎾�({extra_msg})"
+ except Exception as e:
+ async_log_util.error(logger_l2_error,
+ f"G鎾ゅ嚭閿� 鍙傛暟锛歜uy_single_index-{_buy_single_index} buy_exec_index-{_buy_exec_index} 閿欒鍘熷洜锛歿str(e)}")
+ # logger_l2_error.exception(e)
async_log_util.exception(logger_l2_error, e)
finally:
# l2_data_log.l2_time(code, round(t.time() * 1000) - _start_time, "宸蹭笅鍗�-L鎾ゅぇ鍗曡绠�")
@@ -542,32 +567,30 @@
total_data = local_today_datas.get(code)
_start_time = tool.get_now_timestamp()
# 鑾峰彇涔板叆淇″彿璧峰鐐�
- buy_single_index, buy_exec_index, buy_compute_index, num, count, max_num_set, buy_volume_rate = cls.__get_order_begin_pos(
+ order_begin_pos = cls.__get_order_begin_pos(
code)
# 榛樿閲忎负0.2
- if buy_volume_rate is None:
+ if order_begin_pos.buy_volume_rate is None:
buy_volume_rate = 0.2
+ cancel_data, cancel_msg = None, ""
+ if not cancel_data:
+ cancel_data, cancel_msg = g_cancel(order_begin_pos.buy_single_index, order_begin_pos.buy_exec_index)
# 渚濇澶勭悊
- cancel_data, cancel_msg = l_cancel(buy_single_index, buy_exec_index)
if not cancel_data:
- cancel_data, cancel_msg = s_cancel(buy_single_index, buy_exec_index)
+ cancel_data, cancel_msg = l_cancel(order_begin_pos.buy_single_index, order_begin_pos.buy_exec_index)
+ # 鏆傛椂鍙栨秷S鎾�
+ # if not cancel_data:
+ # cancel_data, cancel_msg = s_cancel(buy_single_index, buy_exec_index)
if not cancel_data:
- cancel_data, cancel_msg = h_cancel(buy_single_index, buy_exec_index)
- # l2_log.debug(code, "鎾ゅ崟璁＄畻缁撴潫")
- # _start_time = l2_data_log.l2_time(code, tool.get_now_timestamp() - _start_time,
- # "宸蹭笅鍗�-鎾ゅ崟 鍒ゆ柇鏄惁闇�瑕佹挙鍗�")
+ cancel_data, cancel_msg = h_cancel(order_begin_pos.buy_single_index, order_begin_pos.buy_exec_index)
if cancel_data:
l2_log.debug(code, "瑙﹀彂鎾ゅ崟锛屾挙鍗曚綅缃細{} 锛屾挙鍗曞師鍥狅細{}", cancel_data["index"], cancel_msg)
- l2_log.trade_record(code, "鎾ゅ崟", "'index':{} , 'msg':'{}'", cancel_data["index"], cancel_msg)
+
# 鎾ゅ崟
- cls.cancel_buy(code, cancel_msg)
- # _start_time = l2_data_log.l2_time(code, tool.get_now_timestamp() - _start_time,
- # "宸蹭笅鍗�-鎾ゅ崟 鑰楁椂")
+ cls.cancel_buy(code, cancel_msg, cancel_index=cancel_data["index"])
# 鎾ゅ崟鎴愬姛锛岀户缁绠椾笅鍗�
cls.__process_not_order(code, cancel_data["index"] + 1, end_index, capture_time, is_first_code)
- # _start_time = l2_data_log.l2_time(code, tool.get_now_timestamp() - _start_time,
- # "澶勭悊鍓╀綑鏁版嵁 鑰楁椂")
else:
pass
@@ -585,12 +608,14 @@
if code in cls.unreal_buy_dict:
cls.unreal_buy_dict.pop(code)
- buy_single_index, buy_exec_index, buy_compute_index, num, count, max_num_set, buy_volume_rate = cls.__get_order_begin_pos(
+ order_begin_pos = cls.__get_order_begin_pos(
code)
if not can:
l2_log.debug(code, "涓嶅彲浠ヤ笅鍗曪紝鍘熷洜锛歿}", reason)
+ trade_record_log_util.add_cant_place_order_log(code, reason)
if need_clear_data:
- trade_result_manager.real_cancel_success(code, buy_single_index, buy_exec_index,
+ trade_result_manager.real_cancel_success(code, order_begin_pos.buy_single_index,
+ order_begin_pos.buy_exec_index,
local_today_datas.get(code))
return False
else:
@@ -598,19 +623,48 @@
try:
l2_log.debug(code, "寮�濮嬫墽琛屼拱鍏�")
trade_manager.start_buy(code, capture_timestamp, last_data,
- last_data_index)
+ last_data_index, order_begin_pos.mode)
l2_log.debug(code, "鎵ц涔板叆鎴愬姛")
################涓嬪崟鎴愬姛澶勭悊################
trade_result_manager.real_buy_success(code, cls.__TradePointManager)
+ l2_log.debug(code, "澶勭悊涔板叆鎴愬姛1")
cancel_buy_strategy.set_real_place_position(code, local_today_datas.get(code)[-1]["index"],
- buy_single_index)
- l2_log.debug(code, "澶勭悊涔板叆鎴愬姛")
+ order_begin_pos.buy_single_index)
+ l2_log.debug(code, "澶勭悊涔板叆鎴愬姛2")
params_desc = cls.__l2PlaceOrderParamsManagerDict[code].get_buy_rank_desc()
l2_log.debug(code, params_desc)
- l2_log.trade_record(code, "涓嬪崟",
- "'buy_start_index':{} ,'buy_exec_index':{},'volume_reate':{},'desc':'{}'",
- buy_single_index, buy_exec_index, cls.volume_rate_info[code][0],
- params_desc)
+ ############璁板綍涓嬪崟鏃剁殑鏁版嵁############
+ try:
+ jx_blocks, jx_blocks_by = KPLCodeJXBlockManager().get_jx_blocks_cache(
+ code), KPLCodeJXBlockManager().get_jx_blocks_cache(code, by=True)
+ if jx_blocks:
+ jx_blocks = jx_blocks[0]
+ if jx_blocks_by:
+ jx_blocks_by = jx_blocks_by[0]
+
+ info = cls.__trade_log_placr_order_info_dict[code]
+ info.mode = order_begin_pos.mode
+ info.set_buy_index(order_begin_pos.buy_single_index, order_begin_pos.buy_exec_index)
+ if jx_blocks:
+ info.set_kpl_blocks(list(jx_blocks))
+ elif jx_blocks_by:
+ info.set_kpl_blocks(list(jx_blocks_by))
+ else:
+ info.set_kpl_blocks([])
+ can_buy_result = CodePlateKeyBuyManager.can_buy(code)
+ if can_buy_result:
+ if not can_buy_result[0] and can_buy_result[1]:
+ info.set_kpl_match_blocks(["鐙嫍"])
+ elif not can_buy_result[0] and not can_buy_result[1]:
+ info.set_kpl_match_blocks(["闈炵嫭鑻椾笉婊¤冻韬綅"])
+ else:
+ info.set_kpl_match_blocks(can_buy_result[0])
+ trade_record_log_util.add_place_order_log(code, info)
+ except Exception as e:
+ async_log_util.error(logger_l2_error, f"鍔犲叆涔板叆璁板綍鏃ュ織鍑洪敊锛歿str(e)}")
+
+
+
except Exception as e:
async_log_util.exception(logger_l2_error, e)
l2_log.debug(code, "鎵ц涔板叆寮傚父:{}", str(e))
@@ -693,10 +747,9 @@
if sell1_time is not None and sell1_volumn > 0:
# 鑾峰彇鎵ц浣嶄俊鎭�
- buy_single_index, buy_exec_index, buy_compute_index, num, count, max_num_set, buy_volume_rate = cls.__get_order_begin_pos(
- code)
- buy_nums = num
- for i in range(buy_exec_index + 1, total_datas[-1]["index"] + 1):
+ order_begin_pos = cls.__get_order_begin_pos(code)
+ buy_nums = order_begin_pos.num
+ for i in range(order_begin_pos.buy_exec_index + 1, total_datas[-1]["index"] + 1):
_val = total_datas[i]["val"]
# 娑ㄥ仠涔�
if L2DataUtil.is_limit_up_price_buy(_val):
@@ -796,29 +849,60 @@
limit_up_price = gpcode_manager.get_limit_up_price(code)
if float(limit_up_price) >= constant.MAX_CODE_PRICE:
+ # HighIncreaseCodeManager().add_code(code)
return False, True, f"鑲′环澶т簬{constant.MAX_CODE_PRICE}鍧�"
+ # place_order_count = cls.__PlaceOrderCountManager.get_place_order_count(code)
+ # if place_order_count and place_order_count >= 10:
+ # l2_trade_util.forbidden_trade(code, msg="褰撴棩涓嬪崟娆℃暟宸茶揪10娆�")
+ # return False, True, f"褰撴棩涓嬪崟娆℃暟宸茶揪10娆�"
+
+ # ---------鍧囦环绾︽潫-------------
+ average_rate = cls.__Buy1PriceManager.get_average_rate(code)
+ if average_rate and average_rate <= 0.01:
+ return False, True, f"鍧囦环娑ㄥ箙({average_rate})灏忎簬1%"
+
+ total_data = local_today_datas.get(code)
if constant.L2_SOURCE_TYPE == constant.L2_SOURCE_TYPE_HUAXIN:
trade_price = current_price_process_manager.get_trade_price(code)
if trade_price is None:
return False, True, f"灏氭湭鑾峰彇鍒板綋鍓嶆垚浜や环"
- if float(limit_up_price) - float(trade_price) > 0.04001:
- return False, False, f"褰撳墠鎴愪氦浠凤紙{trade_price}锛夊皻鏈湪4妗ｅ強浠ュ唴"
-
+ if False and float(limit_up_price) - float(trade_price) > 0.00001:
+ # 璁＄畻淇″彿璧峰浣嶇疆鍒板綋鍓嶇殑鎵嬫暟
+ order_begin_pos = cls.__get_order_begin_pos(
+ code)
+ num_operate_map = local_today_num_operate_map.get(code)
+ total_num = 0
+ for i in range(order_begin_pos.buy_single_index, total_data[-1]["index"] + 1):
+ data = total_data[i]
+ val = data["val"]
+ if not L2DataUtil.is_limit_up_price_buy(val):
+ continue
+ left_count = l2_data_source_util.L2DataSourceUtils.get_limit_up_buy_no_canceled_count_v2(code,
+ data[
+ "index"],
+ total_data,
+ local_today_canceled_buyno_map.get(
+ code))
+ total_num += left_count * val["num"]
+ m_base_val = l2_trade_factor.L2PlaceOrderParamsManager.get_base_m_val(code)
+ thresh_hold_num = m_base_val // (float(gpcode_manager.get_limit_up_price(code)) * 100)
+ if total_num < thresh_hold_num * 2:
+ return False, False, f"褰撳墠鎴愪氦浠凤紙{trade_price}锛夊皻鏈湪0妗ｅ強浠ュ唴 涓� 绾拱棰�({total_num})灏忎簬2鍊峂鍊�({thresh_hold_num * 2})"
# 鍒ゆ柇鎴愪氦杩涘害鏄惁璺濈鎴戜滑鐨勪綅缃緢杩�
- total_data = local_today_datas.get(code)
trade_index, is_default = cls.__TradeBuyQueue.get_traded_index(code)
if False and not is_default and trade_index:
not_cancel_num = 0
num_operate_map = local_today_num_operate_map.get(code)
for i in range(trade_index + 1, total_data[-1]["index"] + 1):
if L2DataUtil.is_limit_up_price_buy(total_data[i]["val"]):
- left_count = l2_data_source_util.L2DataSourceUtils.get_limit_up_buy_no_canceled_count(code,
- total_data[
- i][
- "index"],
- total_data,
- num_operate_map)
+ left_count = l2_data_source_util.L2DataSourceUtils.get_limit_up_buy_no_canceled_count_v2(code,
+ total_data[
+ i][
+ "index"],
+ total_data,
+ local_today_canceled_buyno_map.get(
+ code))
if left_count > 0:
not_cancel_num += total_data[i]["val"]["num"]
m_base_val = l2_trade_factor.L2PlaceOrderParamsManager.get_base_m_val(code)
@@ -842,79 +926,222 @@
return False, True, f"鑷敱娴侀��200浜夸互涓婏紝涔�1鍓╀綑妗ｆ暟澶т簬10妗ｏ紝涔颁竴锛坽buy1_price}锛夋定鍋滐紙{limit_up_price}锛�"
open_limit_up_lowest_price = cls.__Buy1PriceManager.get_open_limit_up_lowest_price(code)
- price_pre_close = gpcode_manager.CodePrePriceManager.get_price_pre_cache(code)
- if open_limit_up_lowest_price and (
- float(open_limit_up_lowest_price) - price_pre_close) / price_pre_close < 0.05:
- return False, True, f"鐐告澘鍚庢渶浣庝环璺岃嚦5%浠ヤ笅"
+ # price_pre_close = gpcode_manager.CodePrePriceManager.get_price_pre_cache(code)
+ # if open_limit_up_lowest_price and (
+ # float(open_limit_up_lowest_price) - price_pre_close) / price_pre_close < 0.05:
+ # return False, True, f"鐐告澘鍚庢渶浣庝环璺岃嚦5%浠ヤ笅"
- # limit_up_info = cls.__Buy1PriceManager.get_limit_up_info(code)
- # if limit_up_info[0] is None and False:
- # total_data = local_today_datas.get(code)
- # buy_single_index, buy_exec_index, buy_compute_index, num, count, max_num_set, buy_volume_rate = cls.__get_order_begin_pos(
- # code)
- # # 涔嬪墠娌℃湁娑ㄥ仠杩�
- # # 缁熻涔板叆淇″彿浣嶅埌褰撳墠浣嶇疆娌℃湁鎾ょ殑澶у崟閲戦
- # min_money_w = l2_data_util.get_big_money_val(float(total_data[buy_single_index]["val"]["price"])) // 10000
- # left_big_num = cls.__SecondCancelBigNumComputer.compute_left_big_num(code,
- # buy_single_index,
- # buy_exec_index,
- # total_data[-1][
- # "index"],
- # total_data,
- # 0, min_money_w)
- # if left_big_num > 0:
- # # 閲嶆柊鑾峰彇鍒嗘暟涓庡垎鏁扮储寮�
- # limit_up_time = cls.__LimitUpTimeManager.get_limit_up_time_cache(code)
- # if limit_up_time is None:
- # limit_up_time = tool.get_now_time_str()
- # score = first_code_score_manager.get_score(code, cls.volume_rate_info[code][0], limit_up_time, True,
- # left_big_num)
- # cls.__l2PlaceOrderParamsManagerDict[code].set_score(score)
-
- # logger_place_order_score.info("code={},data='score_index':{},'score_info':{}", code,
- # cls.__l2PlaceOrderParamsManagerDict[code].score_index,
- # cls.__l2PlaceOrderParamsManagerDict[code].score_info)
-
+ # 鍥炲皝鐨勭エ锛屼笅13:15涔板叆闇�瑕佸垽鏂澘鍧楁槸鍚︿负鐙嫍
+ # if open_limit_up_lowest_price and int(total_data[-1]["val"]["time"].replace(":", "")) > 131500:
+ # # 鑾峰彇褰撳墠绁ㄧ殑娑ㄥ仠鍘熷洜
+ # if code in LimitUpCodesPlateKeyManager.today_total_limit_up_reason_dict:
+ # limit_up_reason = kpl_data_manager.KPLLimitUpDataRecordManager.get_current_block(code)
+ # if limit_up_reason and limit_up_reason not in constant.KPL_INVALID_BLOCKS:
+ # # 鍒ゆ柇鏄惁鏄嫭鑻�
+ # codes = kpl_data_manager.KPLLimitUpDataRecordManager.get_current_codes_by_block(limit_up_reason)
+ # if codes:
+ # codes = copy.deepcopy(codes)
+ # codes.discard(code)
+ # if not codes:
+ # return False, True, f"13:15浠ュ悗鐐告澘涔嬪悗涓嬪崟锛岋紙{limit_up_reason}锛� 涓虹嫭鑻�"
+ # 鏆傛椂娉ㄩ噴鎯充拱鍗曞姛鑳�
if not cls.__WantBuyCodesManager.is_in_cache(code):
- if cls.__TradeTargetCodeModeManager.get_mode_cache() == TradeTargetCodeModeManager.MODE_ONLY_BUY_WANT_CODES:
- return False, True, f"鍙拱鎯充拱鍗曚腑鐨勪唬鐮�"
- score_index = None # cls.__l2PlaceOrderParamsManagerDict[code].score_index
- score = None # cls.__l2PlaceOrderParamsManagerDict[code].score
- score_info = None # cls.__l2PlaceOrderParamsManagerDict[code].score_info
-
- # lp = LineProfiler()
- # lp.enable()
- # lp_wrap = lp(cls.can_buy_first)
- # results = lp_wrap(code, limit_up_price, score_index, score, score_info, cls.volume_rate_info[code])
- # output = io.StringIO()
- # lp.print_stats(stream=output)
- # lp.disable()
- # with open(f"{constant.get_path_prefix()}/logs/profile/{code}_can_buy_first.txt", 'w') as f:
- # f.write(output.getvalue())
- # return results
+ # if cls.__TradeTargetCodeModeManager.get_mode_cache() == TradeTargetCodeModeManager.MODE_ONLY_BUY_WANT_CODES:
+ # return False, True, f"鍙拱鎯充拱鍗曚腑鐨勪唬鐮�"
return cls.can_buy_first(code, limit_up_price)
else:
- return True, False, "鍦ㄦ兂涔板悕鍗曚腑"
+ return True, False, "鍦ㄦ兂涔板崟涓�"
+ # 鑾峰彇鍙互涔扮殑鏉垮潡
@classmethod
- def can_buy_first(cls, code, limit_up_price):
- # 鍒ゆ柇鏉垮潡
+ def __get_can_buy_block(cls, code):
can_buy_result = CodePlateKeyBuyManager.can_buy(code)
if can_buy_result is None:
async_log_util.warning(logger_debug, "娌℃湁鑾峰彇鍒版澘鍧楃紦瀛橈紝灏嗚幏鍙栨澘鍧�")
- yesterday_codes = kpl_data_manager.get_yesterday_limit_up_codes()
+ latest_current_limit_up_records = kpl_data_manager.get_latest_current_limit_up_records()
CodePlateKeyBuyManager.update_can_buy_blocks(code,
kpl_data_manager.KPLLimitUpDataRecordManager.latest_origin_datas,
kpl_data_manager.KPLLimitUpDataRecordManager.total_datas,
- yesterday_codes,
- block_info.get_before_blocks_dict())
+ latest_current_limit_up_records,
+ block_info.get_before_blocks_dict(),
+ kpl_data_manager.KPLLimitUpDataRecordManager.get_current_reason_codes_dict())
can_buy_result = CodePlateKeyBuyManager.can_buy(code)
+ return can_buy_result
+ @classmethod
+ def can_buy_first(cls, code, limit_up_price):
+ now_timestamp = int(tool.get_now_time_str().replace(":", ""))
+ # 鍒ゆ柇鏉垮潡
+ # (鍙互涔扮殑鏉垮潡鍒楄〃, 鏄惁鏄嫭鑻�, 娑堟伅绠�浠�,鍙拱鐨勫己鍔夸富绾�, 鏉垮潡鍏抽敭璇�)
+ can_buy_result = cls.__get_can_buy_block(code)
+ l2_log.debug(code, "鑾峰彇鍒扮殑鏉垮潡淇℃伅锛歿}", can_buy_result)
if can_buy_result is None:
return False, True, "灏氭湭鑾峰彇鍒版澘鍧椾俊鎭�"
- if not can_buy_result[0]:
- return False, True, can_buy_result[1]
- return True, False, can_buy_result[1]
+ # -------閲忕殑绾︽潫--------
+ volume_rate_thresholds = buy_condition_util.get_volume_rate_by_level(
+ 1), buy_condition_util.get_volume_rate_by_level(2)
+
+ k_format = code_nature_analyse.CodeNatureRecordManager().get_k_format_cache(code)
+ # 鏄惁鏈夎鲸璇嗗害
+ is_special = True if k_format and k_format[8][0] else False
+ # 涓�5涓氦鏄撴棩鏈夌偢鏉夸箣鍚�
+ has_open_limit_up_in_5 = True if k_format and len(k_format) >= 11 and k_format[10] else False
+ # 涓�5涓氦鏄撴棩鏈夎穼鍋�
+ has_limit_down_in_5 = True if k_format and len(k_format) >= 13 and k_format[12] else False
+ # 鏄惁鏄己鍔�10鍒嗛挓
+ is_in_strong_time = now_timestamp <= int("094000")
+ # 鏄惁鏄己鍔�30鍒嗛挓
+ is_in_strong_time_30 = now_timestamp <= int("100000")
+
+ # 閲忓弬鑰冩槸鍚﹀湪鏈�杩�30澶�
+ # is_refer_volume_date_in_30_days = False
+ # try:
+ # volume_refer_date, volume_refer_date_distance = code_volumn_manager.get_volume_refer_date(code)
+ # if volume_refer_date_distance < 30:
+ # is_refer_volume_date_in_30_days = True
+ # except:
+ # pass
+
+ # 鑾峰彇甯傚満琛屾儏
+ situation = cls.__MarketSituationManager.get_situation_cache()
+ zylt_threshold_as_yi = buy_condition_util.get_zyltgb_threshold(situation)
+ zyltgb_as_yi = round(global_util.zyltgb_map.get(code) / 100000000, 2)
+
+ if zyltgb_as_yi >= zylt_threshold_as_yi[1]:
+ return False, True, f"{zylt_threshold_as_yi[1]}浜夸互涓婄殑閮戒笉涔帮紙{zyltgb_as_yi}锛�"
+
+ if zyltgb_as_yi < zylt_threshold_as_yi[0]:
+ return False, True, f"{zylt_threshold_as_yi[0]}浜夸互涓嬬殑閮戒笉涔帮紙{zyltgb_as_yi}锛�"
+
+ # 鏈�浼樺競鍊�
+ is_best_zylt = True if zylt_threshold_as_yi[4] <= zyltgb_as_yi <= zylt_threshold_as_yi[5] else False
+
+ if is_special:
+ # 鍏锋湁杈ㄨ瘑搴︼紝绠椾綔鏈�浼樺競鍊�
+ zyltgb_as_yi = zylt_threshold_as_yi[2] + 1
+
+ # 鏄惁鏄渶浼樿嚜鐢辨祦閫氬競鍊�
+ is_better_zylt = True if zylt_threshold_as_yi[2] <= zyltgb_as_yi <= zylt_threshold_as_yi[3] else False
+
+ if is_in_strong_time_30 and is_best_zylt and can_buy_result[0]:
+ # 寮哄娍30鍒嗛挓锛屾渶浼樺競鍊�, 鏈夊彲浠ヤ笅鍗曠殑鏉垮潡锛屼笉鐪嬮噺
+ return True, False, can_buy_result[2]
+
+ if k_format and (k_format[1][0] or k_format[3][0]) and len(k_format) >= 12 and k_format[11]:
+ # 鐮村墠楂�/鎺ヨ繎鍓嶉珮涓�30澶╁唴鏈夋定鍋�
+ if code in cls.volume_rate_info and cls.volume_rate_info[code][0] < volume_rate_thresholds[1]:
+ return False, True, f"鑲′环鍒涙柊楂樻垨鑰呴�艰繎鍓嶉珮涓�30澶╁唴鏈夋定鍋�,褰撴棩閲忔瘮({cls.volume_rate_info[code][0]})灏忎簬{volume_rate_thresholds[1]}"
+
+ if HighIncreaseCodeManager().is_in(code):
+ if code in cls.volume_rate_info and cls.volume_rate_info[code][0] < 0.8:
+ return False, True, f"5澶╁唴3娆℃定鍋滐紝閲忔湭杈惧埌80%锛坽cls.volume_rate_info[code][0]}锛�"
+ msg_list = []
+ if is_in_strong_time:
+ msg_list.append("寮哄娍10鍒嗛挓")
+ # 涓�5涓氦鏄撴棩鏈夌偢鏉夸箣鍚�
+ if has_open_limit_up_in_5:
+ if code in cls.volume_rate_info and cls.volume_rate_info[code][0] < 0.15:
+ return False, True, f"寮哄娍10鍒嗛挓,涓�5涓氦鏄撴棩鐐告澘,閲忔湭杈惧埌{0.15}({cls.volume_rate_info[code][0]})"
+
+ # 涓�5涓氦鏄撴棩鏈夎穼鍋�
+ if has_limit_down_in_5:
+ if code in cls.volume_rate_info and cls.volume_rate_info[code][0] < 0.15:
+ return False, True, f"寮哄娍10鍒嗛挓,涓�5涓氦鏄撴棩璺屽仠,閲忔湭杈惧埌{0.15}({cls.volume_rate_info[code][0]})"
+
+ # 鑾峰彇閲忕殑鍙傝�冩棩鏈�
+ if code in global_util.max60_volumn:
+ day = global_util.max60_volumn[code][1]
+ if day in HistoryKDatasUtils.get_latest_trading_date_cache(5):
+ if code in cls.volume_rate_info and cls.volume_rate_info[code][0] < 0.15 and not is_special:
+ return False, True, f"寮哄娍10鍒嗛挓锛屽弬鑰冮噺鍦ㄦ渶杩�5澶╋紝鏃犺鲸璇嗗害锛岄噺鏈揪鍒�0.15({cls.volume_rate_info[code][0]})"
+
+ # 鐙嫍
+ if not can_buy_result[0] and can_buy_result[1]:
+ msg_list.append("鐙嫍")
+ if not is_best_zylt:
+ # 濡傛灉娌℃湁杈ㄨ瘑搴︽墠涓嶄拱
+ if not is_special:
+ return False, True, f"寮哄娍10鍒嗛挓锛屾棤杈ㄨ瘑搴︼紝 鐙嫍锛坽can_buy_result[4]}锛変笉涓嬪崟锛坽can_buy_result[4]}锛夎嚜鐢辨祦閫氬競鍊硷紙{zyltgb_as_yi}锛変笉鏄壒浼樺競鍊�"
+ if k_format and (k_format[1][0] or k_format[3][0]):
+ msg_list.append("鑲′环鍒涙柊楂樻垨鑰呴�艰繎鍓嶉珮")
+ # 鑲′环鍒涙柊楂樻垨鑰呴�艰繎鍓嶉珮
+ if code in cls.volume_rate_info and cls.volume_rate_info[code][0] < volume_rate_thresholds[1]:
+ return False, True, f"寮哄娍10鍒嗛挓锛岀嫭鑻楋紙{can_buy_result[4]}锛夛紝鑲′环鍒涙柊楂樻垨鑰呴�艰繎鍓嶉珮,褰撴棩閲忔瘮({cls.volume_rate_info[code][0]})灏忎簬{volume_rate_thresholds[1]}"
+ else:
+ if code in cls.volume_rate_info and cls.volume_rate_info[code][0] < volume_rate_thresholds[
+ 0] and not is_special:
+ return False, True, f"寮哄娍10鍒嗛挓锛屾棤杈ㄨ瘑搴︼紝鐙嫍锛坽can_buy_result[4]}锛�,褰撴棩閲忔瘮({cls.volume_rate_info[code][0]})灏忎簬{volume_rate_thresholds[0]}"
+ else:
+ msg_list.append("闈炵嫭鑻�")
+ if not is_better_zylt:
+ msg_list.append("涓嶆弧瓒宠嚜鐢辨祦閫�")
+ if k_format and (k_format[1][0] or k_format[3][0]):
+ # 鑲′环鍒涙柊楂樻垨鑰呴�艰繎鍓嶉珮
+ if code in cls.volume_rate_info and cls.volume_rate_info[code][0] < volume_rate_thresholds[1]:
+ return False, True, f"寮哄娍10鍒嗛挓锛屽悗鎺掞紝涓嶆弧瓒宠嚜鐢卞競鍊硷紝鑲′环鍒涙柊楂樻垨鑰呴�艰繎鍓嶉珮,褰撴棩閲忔瘮({cls.volume_rate_info[code][0]})灏忎簬{volume_rate_thresholds[1]}"
+ else:
+ if code in cls.volume_rate_info and cls.volume_rate_info[code][0] < volume_rate_thresholds[
+ 0] and not is_special:
+ return False, True, f"寮哄娍10鍒嗛挓锛屽悗鎺�,鏃犺鲸璇嗗害锛屼笉婊¤冻鑷敱甯傚�硷紝褰撴棩閲忔瘮({cls.volume_rate_info[code][0]})灏忎簬{volume_rate_thresholds[0]}"
+ else:
+ msg_list.append("婊¤冻鑷敱娴侀��")
+ # 鍚庢帓锛屾弧瓒宠嚜鐢辨祦閫氬競鍊奸渶瑕佷笅鍗�
+ return True, False, can_buy_result[2]
+ return True, False, can_buy_result[2]
+ else:
+
+ # 涓�5涓氦鏄撴棩鏈夌偢鏉夸箣鍚�
+ if has_open_limit_up_in_5:
+ if code in cls.volume_rate_info and cls.volume_rate_info[code][0] < 0.29:
+ return False, True, f"寮哄娍10鍒嗛挓,涓�5涓氦鏄撴棩鐐告澘,閲忔湭杈惧埌{0.29}({cls.volume_rate_info[code][0]})"
+
+ # 涓�5涓氦鏄撴棩鏈夎穼鍋�
+ if has_limit_down_in_5:
+ if code in cls.volume_rate_info and cls.volume_rate_info[code][0] < 0.29:
+ return False, True, f"寮哄娍10鍒嗛挓,涓�5涓氦鏄撴棩璺屽仠,閲忔湭杈惧埌{0.29}({cls.volume_rate_info[code][0]})"
+
+ # 鑾峰彇閲忕殑鍙傝�冩棩鏈�
+ if code in global_util.max60_volumn:
+ day = global_util.max60_volumn[code][1]
+ if day in HistoryKDatasUtils.get_latest_trading_date_cache(5):
+ if code in cls.volume_rate_info and cls.volume_rate_info[code][0] < 0.29 and not is_special:
+ return False, True, f"鍙傝�冮噺鍦ㄦ渶杩�5澶╋紝鏃犺鲸璇嗗害锛岄噺鏈揪鍒�0.29({cls.volume_rate_info[code][0]})"
+
+ # 闈炲己鍔�10鍒嗛挓鍙拱涓荤嚎
+ if not can_buy_result[0] and can_buy_result[1]:
+ if not is_special and not is_best_zylt:
+ return False, True, f"闈炲己鍔�10鍒嗛挓锛屾棤杈ㄨ瘑搴︼紝闈炵壒浼樺競鍊�,鐙嫍锛坽can_buy_result[4]}锛変笉涓嬪崟"
+ if can_buy_result[3]:
+ # 寮哄娍涓荤嚎
+ if not is_better_zylt:
+ if k_format and (k_format[1][0] or k_format[3][0]):
+ # 鑲′环鍒涙柊楂樻垨鑰呴�艰繎鍓嶉珮
+ if code in cls.volume_rate_info and cls.volume_rate_info[code][0] < volume_rate_thresholds[1]:
+ return False, True, f"闈炲己鍔�10鍒嗛挓锛屽己鍔夸富绾垮悗鎺掞紝涓嶆弧瓒宠嚜鐢卞競鍊硷紝鑲′环鍒涙柊楂樻垨鑰呴�艰繎鍓嶉珮,褰撴棩閲忔瘮({cls.volume_rate_info[code][0]})灏忎簬{volume_rate_thresholds[1]}"
+ else:
+ if code in cls.volume_rate_info and cls.volume_rate_info[code][0] < volume_rate_thresholds[
+ 0] and not is_special:
+ return False, True, f"闈炲己鍔�10鍒嗛挓锛屽己鍔夸富绾垮悗鎺�,涓嶆弧瓒宠嚜鐢卞競鍊硷紝鏃犺鲸璇嗗害锛屽綋鏃ラ噺姣�({cls.volume_rate_info[code][0]})灏忎簬{volume_rate_thresholds[0]}"
+ else:
+ if k_format and (k_format[1][0] or k_format[3][0]):
+ if code in cls.volume_rate_info and cls.volume_rate_info[code][0] < volume_rate_thresholds[0]:
+ return False, True, f"闈炲己鍔�10鍒嗛挓锛屽己鍔夸富绾垮悗鎺�,婊¤冻鑷敱甯傚�硷紝鑲′环鍒涙柊楂樻垨鑰呴�艰繎鍓嶉珮, 褰撴棩閲忔瘮({cls.volume_rate_info[code][0]})灏忎簬{volume_rate_thresholds[0]}"
+ else:
+ # 闈炲己鍔夸富绾�
+ if not is_better_zylt:
+ if code in cls.volume_rate_info and cls.volume_rate_info[code][0] < volume_rate_thresholds[
+ 1] and not is_special:
+ return False, True, f"闈炲己鍔�10鍒嗛挓锛岄潪寮哄娍涓荤嚎鍚庢帓銆愪富绾垮悗鎺掋�戯紝涓嶆弧瓒宠嚜鐢卞競鍊�,鏃犺鲸璇嗗害锛� 褰撴棩閲忔瘮({cls.volume_rate_info[code][0]})灏忎簬{volume_rate_thresholds[1]}"
+ else:
+ if k_format and (k_format[1][0] or k_format[3][0]):
+ # 鑲′环鍒涙柊楂樻垨鑰呴�艰繎鍓嶉珮
+ if code in cls.volume_rate_info and cls.volume_rate_info[code][0] < volume_rate_thresholds[1]:
+ return False, True, f"闈炲己鍔�10鍒嗛挓锛岄潪寮哄娍涓荤嚎鍚庢帓銆愪富绾垮悗鎺掋�戯紝婊¤冻鑷敱甯傚�硷紝鑲′环鍒涙柊楂樻垨鑰呴�艰繎鍓嶉珮, 褰撴棩閲忔瘮({cls.volume_rate_info[code][0]})灏忎簬{volume_rate_thresholds[1]}"
+ else:
+ if code in cls.volume_rate_info and cls.volume_rate_info[code][0] < volume_rate_thresholds[
+ 0] and not is_special:
+ return False, True, f"闈炲己鍔�10鍒嗛挓锛岄潪寮哄娍涓荤嚎鍚庢帓銆愪富绾垮悗鎺掋��, 婊¤冻鑷敱甯傚�硷紝鏃犺鲸璇嗗害锛屽綋鏃ラ噺姣�({cls.volume_rate_info[code][0]})灏忎簬{volume_rate_thresholds[0]}"
+ return True, False, can_buy_result[2]
@classmethod
def __cancel_buy(cls, code):
@@ -931,22 +1158,25 @@
pass
@classmethod
- def cancel_buy(cls, code, msg=None, source="l2"):
+ def cancel_buy(cls, code, msg=None, source="l2", cancel_index=None):
# 鏄惁鏄氦鏄撻槦鍒楄Е鍙�
- buy_single_index, buy_exec_index, buy_compute_index, num, count, max_num_set, buy_volume_rate = cls.__get_order_begin_pos(
+ order_begin_pos = cls.__get_order_begin_pos(
code)
- total_datas = local_today_datas[code]
+ total_datas = local_today_datas.get(code)
+ if not total_datas:
+ return False
if source == "trade_queue":
# 浜ゆ槗闃熷垪瑙﹀彂鐨勯渶瑕佷笅鍗曞悗5s
- if buy_exec_index is not None and buy_exec_index > 0:
+ if order_begin_pos.buy_exec_index is not None and order_begin_pos.buy_exec_index > 0:
now_time_str = tool.get_now_time_str()
- if tool.trade_time_sub(now_time_str, total_datas[buy_exec_index]["val"]["time"]) < 5:
+ if tool.trade_time_sub(now_time_str, total_datas[order_begin_pos.buy_exec_index]["val"]["time"]) < 5:
return False
if code in cls.unreal_buy_dict:
cls.unreal_buy_dict.pop(code)
# 鍙栨秷涔板叆鏍囪瘑
- trade_result_manager.virtual_cancel_success(code, buy_single_index, buy_exec_index, total_datas)
+ trade_result_manager.virtual_cancel_success(code, order_begin_pos.buy_single_index,
+ order_begin_pos.buy_exec_index, total_datas)
else:
can_cancel, reason = cls.__can_cancel(code)
if not can_cancel:
@@ -954,9 +1184,15 @@
l2_log.cancel_debug(code, "鎾ゅ崟涓柇锛屽師鍥狅細{}", reason)
l2_log.debug(code, "鎾ゅ崟涓柇锛屽師鍥狅細{}", reason)
return False
+ if cancel_index is None:
+ cancel_index = total_datas[-1]["index"]
+ cls.__LatestCancelIndexManager.set_latest_cancel_index(code, cancel_index)
+ # 娣诲姞鎾ゅ崟鏃ュ織璁板綍
+ trade_record_log_util.add_cancel_msg_log(code, msg)
cancel_result = cls.__cancel_buy(code)
if cancel_result:
- trade_result_manager.real_cancel_success(code, buy_single_index, buy_exec_index, total_datas)
+ trade_result_manager.real_cancel_success(code, order_begin_pos.buy_single_index,
+ order_begin_pos.buy_exec_index, total_datas)
l2_log.debug(code, "鎵ц鎾ゅ崟缁撴潫锛屽師鍥狅細{}", msg)
return True
@@ -966,61 +1202,147 @@
cls.unreal_buy_dict[code] = (buy_exec_index, capture_time)
trade_result_manager.virtual_buy_success(code)
+ # 鏄惁鏄湪鏉夸笂涔�
+ @classmethod
+ def __is_at_limit_up_buy(cls, code_):
+ # 鎬诲崠涓�0锛屽綋鍓嶆垚浜や环涓烘定鍋滀环灏卞垽鏂负鏉夸笂涔�
+ current_sell_data = cls.__L2MarketSellManager.get_current_total_sell_data(code_)
+ if current_sell_data and tool.trade_time_sub(tool.get_now_time_str(), current_sell_data[0]) < 5:
+ # 5s鍐呯殑鏁版嵁鎵嶆湁鏁�
+ if current_sell_data[1] <= 0:
+ # 鎬诲崠涓�0
+ trade_price = current_price_process_manager.get_trade_price(code_)
+ limit_up_price = gpcode_manager.get_limit_up_price(code_)
+ if trade_price and limit_up_price and abs(float(trade_price) - float(limit_up_price)) <= 0.001:
+ # 褰撳墠鎴愪氦浠蜂负娑ㄥ仠浠�
+ return True
+ return False
+
@classmethod
def __start_compute_buy(cls, code, compute_start_index, compute_end_index, threshold_money, capture_time,
is_first_code,
new_add=True):
+
if compute_end_index < compute_start_index:
return
- unique_key = f"{compute_start_index}-{compute_end_index}"
- if cls.__latest_process_not_order_unique_keys.get(code) == unique_key:
- async_log_util.error(logger_l2_error, f"閲嶅澶勭悊鏁版嵁锛歝ode-{code} start_index-{compute_start_index} end_index-{compute_end_index}")
+ unique_key = f"{code}-{compute_start_index}-{compute_end_index}"
+ if cls.__latest_process_not_order_unique_keys_count.get(
+ unique_key) and cls.__latest_process_not_order_unique_keys_count.get(unique_key) > 2:
+ async_log_util.error(logger_l2_error,
+ f"閲嶅澶勭悊鏁版嵁锛歝ode-{code} start_index-{compute_start_index} end_index-{compute_end_index}")
return
- cls.__latest_process_not_order_unique_keys[code] = unique_key
+ if unique_key not in cls.__latest_process_not_order_unique_keys_count:
+ cls.__latest_process_not_order_unique_keys_count[unique_key] = 0
+ cls.__latest_process_not_order_unique_keys_count[unique_key] += 1
_start_time = tool.get_now_timestamp()
total_datas = local_today_datas[code]
- # 澶勭悊瀹夊叏绗旀暟
- # cls.__buyL2SafeCountManager.compute_left_rate(code, compute_start_index, compute_end_index, total_datas,
- # local_today_num_operate_map.get(code))
# 鑾峰彇涔板叆淇″彿璁＄畻璧峰浣嶇疆
- buy_single_index, buy_exec_index, buy_compute_index, num, count, max_num_set, buy_volume_rate = cls.__get_order_begin_pos(
+ order_begin_pos = cls.__get_order_begin_pos(
code)
# 鏄惁涓烘柊鑾峰彇鍒扮殑浣嶇疆
new_get_single = False
+ buy_single_index = order_begin_pos.buy_single_index
if buy_single_index is None:
- continue_count = cls.__l2PlaceOrderParamsManagerDict[code].get_begin_continue_buy_count()
- # 鏈変拱鍏ヤ俊鍙�
- has_single, _index = cls.__compute_order_begin_pos(code, max(
- (compute_start_index - continue_count - 1) if new_add else compute_start_index, 0), continue_count,
- compute_end_index)
+ # 灏濊瘯璁＄畻蹇�熸垚浜や俊鍙�
+ has_single, _index, sell_info = cls.__compute_fast_order_begin_pos(code, compute_start_index,
+ compute_end_index)
+ fast_msg = None
+ if has_single:
+ order_begin_pos.mode = OrderBeginPosInfo.MODE_FAST
+ order_begin_pos.sell_info = sell_info
+ elif _index is not None and _index < 0:
+ fast_msg = sell_info
+ continue_count = cls.__l2PlaceOrderParamsManagerDict[code].get_begin_continue_buy_count()
+ # 鏈変拱鍏ヤ俊鍙�
+ has_single, _index = cls.__compute_order_begin_pos(code, max(
+ (compute_start_index - continue_count - 1) if new_add else compute_start_index, 0), continue_count,
+ compute_end_index)
+ order_begin_pos.mode = OrderBeginPosInfo.MODE_NORMAL
# 濡傛灉涔板叆淇″彿涓庝笂娆＄殑涔板叆淇″彿涓�鏍峰氨涓嶈兘绠楁柊鐨勪俊鍙�
if cls.__last_buy_single_dict.get(code) == _index:
has_single = None
_index = None
-
buy_single_index = _index
if has_single:
+ # 鍒ゆ柇鏄惁鏄澘涓婁拱
+ order_begin_pos.at_limit_up = cls.__is_at_limit_up_buy(code)
+ # -------------璁＄畻淇″彿浣嶅埌鎴愪氦浣嶇殑绾拱棰濓紙杩囪繙鍒欎负鏃犳晥浣嶇疆锛�-------------------
+ if order_begin_pos.at_limit_up:
+ # 鑾峰彇鎴愪氦杩涘害浣嶇疆
+ trade_index, is_default = TradeBuyQueue().get_traded_index(code)
+ if trade_index and not is_default:
+ m_base_val = l2_trade_factor.L2PlaceOrderParamsManager.get_base_m_val(code)
+ thresh_hold_num = m_base_val * 4 // (float(gpcode_manager.get_limit_up_price(code)) * 100)
+ # 鐪熷疄涓嬪崟浣嶅埌鎴愪氦浣嶇疆鐨勭函涔伴 * 3
+ total_num = 0
+ for i in range(trade_index + 1, buy_single_index):
+ data = total_datas[i]
+ val = data["val"]
+ if not L2DataUtil.is_limit_up_price_buy(val):
+ continue
+ left_count = l2_data_source_util.L2DataSourceUtils.get_limit_up_buy_no_canceled_count_v2(
+ code,
+ data["index"],
+ total_datas,
+ local_today_canceled_buyno_map.get(
+ code))
+ total_num += left_count * val["num"]
+ if total_num > thresh_hold_num:
+ break
+ if total_num > thresh_hold_num:
+ # 璺濈鎴愪氦杩涘害浣嶇疆杩囪繙
+ l2_log.debug(code,
+ f"鑾峰彇鐨勪俊鍙蜂綅鏃犳晥锛堟澘涓婁拱锛岃寖鍥达細{trade_index + 1}-{order_begin_pos.buy_single_index} 鏈垚浜ゆ�绘墜{total_num}/闃堝�納thresh_hold_num}锛�")
+ return None
+
cls.__last_buy_single_dict[code] = buy_single_index
new_get_single = True
- num = 0
- count = 0
- l2_log.debug(code, "鑾峰彇鍒颁拱鍏ヤ俊鍙疯捣濮嬬偣锛歿} ,璁＄畻鑼冨洿锛歿}-{} 锛岄噺姣旓細{}锛屾暟鎹細{}", buy_single_index, compute_start_index,
- compute_end_index, cls.volume_rate_info[code], total_datas[buy_single_index])
+ order_begin_pos.num = 0
+ order_begin_pos.count = 0
+ order_begin_pos.buy_single_index = buy_single_index
+ if order_begin_pos.sell_info:
+ # k_format = code_nature_analyse.CodeNatureRecordManager().get_k_format_cache(code)
+ # if k_format and (k_format[1][0] or k_format[3][0]):
+ # # 鑲′环鏂伴珮鎴栬�呴�艰繎鍓嶉珮
+ # order_begin_pos.threshold_money = int(sell_info[1])
+ # else:
+ if float(total_datas[buy_single_index]["val"]["price"]) >= 3 and cls.volume_rate_info[code][
+ 0] > 0.3 and sell_info[1] > 2000 * 10000 and int(
+ tool.get_now_time_str().replace(":", "")) < int("100000"):
+ # 鏆傛椂鎵�8鎶�
+ # order_begin_pos.threshold_money = int(sell_info[1] * 0.8)
+ # 娣辫瘉鎬诲崠澶т簬1000涓囩殑绁紝m鍊兼墦5鎶�
+ if code.find('00') == 0:
+ # 娣卞湷棣栨涓嬪崟鎵撴姌
+ place_order_count = trade_data_manager.PlaceOrderCountManager().get_place_order_count(code)
+ if place_order_count is not None and place_order_count == 0:
+ order_begin_pos.threshold_money = int(sell_info[1] * 0.6)
+ else:
+ order_begin_pos.threshold_money = int(sell_info[1])
+ else:
+ order_begin_pos.threshold_money = int(sell_info[1] * 0.8)
+ else:
+ order_begin_pos.threshold_money = int(sell_info[1])
+ l2_log.debug(code, "鑾峰彇鍒颁拱鍏ヤ俊鍙疯捣濮嬬偣锛歿} ,璁＄畻鑼冨洿锛歿}-{} 锛岄噺姣旓細{}锛屾槸鍚︽澘涓婁拱锛歿}锛屾暟鎹細{} 妯″紡锛歿}锛坽}锛�", buy_single_index,
+ compute_start_index,
+ compute_end_index, cls.volume_rate_info[code], order_begin_pos.at_limit_up,
+ total_datas[buy_single_index],
+ order_begin_pos.mode, fast_msg)
# _start_time = l2_data_log.l2_time(code, tool.get_now_timestamp() - _start_time, "涓嬪崟淇″彿璁＄畻鏃堕棿")
- if buy_single_index is None:
+ if order_begin_pos.buy_single_index is None:
# 鏈幏鍙栧埌涔板叆淇″彿锛岀粓姝㈢▼搴�
return None
# 寮�濮嬭绠楃殑浣嶇疆
- start_process_index = max(buy_single_index, compute_start_index)
+ start_process_index = max(order_begin_pos.buy_single_index, compute_start_index)
if new_get_single:
- start_process_index = buy_single_index
+ start_process_index = order_begin_pos.buy_single_index
# _start_time = l2_data_log.l2_time(code, tool.get_now_timestamp() - _start_time, "璁＄畻m鍊煎ぇ鍗�")
@@ -1029,16 +1351,31 @@
# _start_time = l2_data_log.l2_time(code, tool.get_now_timestamp() - _start_time, "m鍊奸槇鍊艰绠�")
# 涔板叆绾拱棰濈粺璁�
- new_buy_exec_index, buy_nums, buy_count, rebegin_buy_pos, max_num_set_new = cls.__sum_buy_num_for_order_3(code,
- start_process_index,
- compute_end_index,
- num,
- count,
- threshold_money,
- buy_single_index,
- max_num_set)
- # _start_time = l2_data_log.l2_time(code, tool.get_now_timestamp() - _start_time, "绾拱棰濈粺璁℃椂闂�")
+ new_buy_exec_index, buy_nums, buy_count, rebegin_buy_pos, max_num_set_new, not_buy_msg = None, None, None, None, [], ""
+ if order_begin_pos.mode == OrderBeginPosInfo.MODE_FAST:
+ threshold_money = order_begin_pos.threshold_money
+ new_buy_exec_index, buy_nums, buy_count, rebegin_buy_pos, threshold_money_new, not_buy_msg = cls.__sum_buy_num_for_order_fast(
+ code,
+ start_process_index,
+ compute_end_index,
+ order_begin_pos.num,
+ order_begin_pos.count,
+ threshold_money,
+ order_begin_pos.buy_single_index)
+ threshold_money = threshold_money_new
+ order_begin_pos.threshold_money = threshold_money
+ else:
+ new_buy_exec_index, buy_nums, buy_count, rebegin_buy_pos, max_num_set_new, not_buy_msg = cls.__sum_buy_num_for_order_3(
+ code,
+ start_process_index,
+ compute_end_index,
+ order_begin_pos.num,
+ order_begin_pos.count,
+ threshold_money,
+ order_begin_pos.buy_single_index,
+ order_begin_pos.max_num_set,
+ order_begin_pos.at_limit_up)
l2_log.debug(code, "m鍊�-{} 閲忔瘮:{} rebegin_buy_pos:{}", threshold_money, cls.volume_rate_info[code][0],
rebegin_buy_pos)
@@ -1050,17 +1387,29 @@
return
if new_buy_exec_index is not None:
- l2_log.debug(code, "鑾峰彇鍒颁拱鍏ユ墽琛屼綅缃細{} m鍊硷細{} 绾拱鎵嬫暟锛歿} 绾拱鍗曟暟锛歿} 鏁版嵁锛歿} ,閲忔瘮:{} ", new_buy_exec_index, threshold_money,
+ l2_log.debug(code, "鑾峰彇鍒颁拱鍏ユ墽琛屼綅缃細{} m鍊硷細{} 绾拱鎵嬫暟锛歿} 绾拱鍗曟暟锛歿} 鏄惁鏉夸笂涔帮細{} 鏁版嵁锛歿} ,閲忔瘮:{} ,涓嬪崟妯″紡锛歿}", new_buy_exec_index,
+ threshold_money,
buy_nums,
- buy_count, total_datas[new_buy_exec_index], cls.volume_rate_info[code])
- cls.__save_order_begin_data(code, buy_single_index, new_buy_exec_index, new_buy_exec_index,
- buy_nums, buy_count, max_num_set_new,
- cls.volume_rate_info[code][0])
+ buy_count, order_begin_pos.at_limit_up, total_datas[new_buy_exec_index],
+ cls.volume_rate_info[code], order_begin_pos.mode)
+ cls.__save_order_begin_data(code, OrderBeginPosInfo(buy_single_index=buy_single_index,
+ buy_exec_index=new_buy_exec_index,
+ buy_compute_index=new_buy_exec_index,
+ num=buy_nums, count=buy_count,
+ max_num_set=max_num_set_new,
+ buy_volume_rate=cls.volume_rate_info[code][0],
+ mode=order_begin_pos.mode,
+ sell_info=order_begin_pos.sell_info,
+ threshold_money=threshold_money))
cls.__LimitUpTimeManager.save_limit_up_time(code, total_datas[new_buy_exec_index]["val"]["time"])
- cls.__TradePointManager.delete_buy_cancel_point(code)
l2_log.debug(code, "delete_buy_cancel_point")
# 鐩存帴涓嬪崟
- ordered = cls.__buy(code, capture_time, total_datas[new_buy_exec_index], new_buy_exec_index, is_first_code)
+ ordered = cls.__buy(code, capture_time, total_datas[-1], total_datas[-1]["index"], is_first_code)
+
+ # 淇濆瓨闂數涓嬪崟鐨勪拱鍏ヤ俊鎭�
+ if order_begin_pos.mode == OrderBeginPosInfo.MODE_FAST:
+ cls.__latest_fast_place_order_info_dict[code] = (
+ order_begin_pos.sell_info[0], order_begin_pos.sell_info[1])
# 鏁版嵁鏄惁澶勭悊瀹屾瘯
if new_buy_exec_index < compute_end_index:
@@ -1074,31 +1423,34 @@
else:
# 鏈揪鍒颁笅鍗曟潯浠讹紝淇濆瓨绾拱棰濓紝璁剧疆绾拱棰�
# 璁板綍涔板叆淇″彿浣嶇疆
- cls.__save_order_begin_data(code, buy_single_index, -1, compute_end_index, buy_nums, buy_count,
- max_num_set_new, None)
- print("淇濆瓨澶у崟鏃堕棿", round((t.time() - _start_time) * 1000))
+ cls.__save_order_begin_data(code, OrderBeginPosInfo(buy_single_index=buy_single_index, buy_exec_index=-1,
+ buy_compute_index=compute_end_index, num=buy_nums,
+ count=buy_count,
+ max_num_set=max_num_set_new, mode=order_begin_pos.mode,
+ sell_info=order_begin_pos.sell_info,
+ threshold_money=threshold_money))
+ # 璁板綍娌′笅鍗曞師鍥�
+ async_log_util.info(logger_l2_not_buy_reasons, f"{code}#{not_buy_msg}")
_start_time = t.time()
- pass
+ l2_data_log.l2_time_log(code, "__start_compute_buy 缁撴潫")
# 鑾峰彇涓嬪崟璧峰淇″彿
@classmethod
- def __get_order_begin_pos(cls, code):
- buy_single_index, buy_exec_index, compute_index, num, count, max_num_set, volume_rate = cls.__TradePointManager.get_buy_compute_start_data_cache(
+ def __get_order_begin_pos(cls, code) -> OrderBeginPosInfo:
+ order_begin_pos = cls.__TradePointManager.get_buy_compute_start_data_cache(
code)
- return buy_single_index, buy_exec_index, compute_index, num, count, max_num_set, volume_rate
+ return order_begin_pos
# 淇濆瓨涓嬪崟璧峰淇″彿
@classmethod
- def __save_order_begin_data(cls, code, buy_single_index, buy_exec_index, compute_index, num, count, max_num_set,
- volume_rate):
- cls.__TradePointManager.set_buy_compute_start_data(code, buy_single_index, buy_exec_index, compute_index, num,
- count,
- max_num_set, volume_rate)
+ def __save_order_begin_data(cls, code, info: OrderBeginPosInfo):
+ cls.__TradePointManager.set_buy_compute_start_data_v2(code, info)
# 璁＄畻涓嬪崟璧峰淇″彿
# compute_data_count 鐢ㄤ簬璁＄畻鐨刲2鏁版嵁鏁伴噺
@classmethod
def __compute_order_begin_pos(cls, code, start_index, continue_count, end_index):
+
second_930 = 9 * 3600 + 30 * 60 + 0
# 鍊掓暟100鏉℃暟鎹煡璇�
datas = local_today_datas[code]
@@ -1123,7 +1475,12 @@
continue
if L2DataUtil.is_limit_up_price_buy(_val):
-
+ # 閲戦瑕佸ぇ浜�50涓�
+ if _val["num"] * float(_val["price"]) < 5000:
+ continue
+ # 瀵绘壘鍓嶉潰continue_count-1涓定鍋滀拱
+ # for j in range(start_index - 1, -1, -1):
+ # if datas[j]["val"]
if last_index is None or (datas[last_index]["val"]["time"] == datas[i]["val"]["time"]):
if start is None:
start = i
@@ -1145,13 +1502,70 @@
return False, None
+ # 蹇�熶拱鍏ユ硶鐨勪俊鍙蜂綅缃煡鎵�
+ @classmethod
+ def __compute_fast_order_begin_pos(cls, code, start_index, end_index):
+ limit_up_price = gpcode_manager.get_limit_up_price(code)
+ # if float(limit_up_price) < 3:
+ # return False, -1, "鑲′环灏忎簬3鍧�"
+ total_datas = local_today_datas[code]
+ start_time_str = total_datas[start_index]["val"]["time"]
+ # if tool.trade_time_sub(start_time_str, "13:00:00") > 0:
+ # return False, -1, "瓒呰繃瑙勫畾鏃堕棿"
+ refer_sell_data = cls.__L2MarketSellManager.get_refer_sell_data(code, start_time_str)
+ if refer_sell_data is None:
+ return False, -1, "鎬诲崠涓虹┖"
+ if cls.__L2MarketSellManager.is_refer_sell_time_used(code, refer_sell_data[0]):
+ return False, -1, "鎬诲崠缁熻鏃堕棿宸茶浣跨敤"
+ # 鏄惁澶т簬500涓�
+ if refer_sell_data[1] <= 500 * 10000:
+ return False, -1, "鎬诲崠灏忎簬鎸囧畾閲戦"
+ # 缁熻涔嬪墠鐨勫崠
+ threshold_money = refer_sell_data[1]
+ for i in range(start_index - 1, -1, -1):
+ val = total_datas[i]["val"]
+ if tool.compare_time(val["time"], refer_sell_data[0]) <= 0:
+ break
+ if L2DataUtil.is_sell(val):
+ threshold_money += val["num"] * int(float(val["price"]) * 100)
+ elif L2DataUtil.is_sell_cancel(val):
+ threshold_money -= val["num"] * int(float(val["price"]) * 100)
+ # 鏄惁涓烘湰绉掔殑绗竴涓定鍋滀拱
+ for i in range(start_index, end_index + 1):
+ data = total_datas[i]
+ val = data['val']
+ if not L2DataUtil.is_limit_up_price_buy(val):
+ # 瑕佺粺璁″崠涓庡崠鎾�
+ if L2DataUtil.is_sell(val):
+ threshold_money += val["num"] * int(float(val["price"]) * 100)
+ elif L2DataUtil.is_sell_cancel(val):
+ threshold_money -= val["num"] * int(float(val["price"]) * 100)
+ continue
+ # 50 涓囦互涓嬬殑涓嶉渶瑕�
+ if val["num"] * float(val["price"]) < 5000:
+ continue
+ # 鏄惁涓烘湰s鐨勭涓�娆℃定鍋�
+ is_first_limit_up = True
+ for j in range(i - 1, -1, -1):
+ temp_val = total_datas[j]["val"]
+ if temp_val["time"] == val["time"]:
+ if L2DataUtil.is_limit_up_price_buy(temp_val) and temp_val["num"] * float(
+ temp_val["price"]) >= 5000:
+ is_first_limit_up = True
+ break
+ else:
+ break
+ if is_first_limit_up:
+ return True, i, [refer_sell_data[0], threshold_money]
+ return False, None, None
+
@classmethod
def __get_threshmoney(cls, code):
- m,msg = cls.__l2PlaceOrderParamsManagerDict[code].get_m_val()
+ m, msg = cls.__l2PlaceOrderParamsManagerDict[code].get_m_val()
if trade_manager.CodesTradeStateManager().get_trade_state_cache(code) == trade_manager.TRADE_STATE_NOT_TRADE:
# 棣栨涓嬪崟m鍊兼墿澶�1.5鍊�
m = int(m * 1.5)
- return m,msg
+ return m, msg
# 璁＄畻涓囨墜鍝ョ瑪鏁�
@classmethod
@@ -1167,7 +1581,7 @@
# 缁熻涔板叆鍑�涔伴噺锛屼笉璁＄畻鍦ㄤ拱鍏ヤ俊鍙蜂箣鍓嶇殑涔版挙鍗�
@classmethod
def __sum_buy_num_for_order_3(cls, code, compute_start_index, compute_end_index, origin_num, origin_count,
- threshold_money, buy_single_index, max_num_set):
+ threshold_money, buy_single_index, max_num_set, at_limit_up=False):
_start_time = t.time()
total_datas = local_today_datas[code]
# is_first_code = gpcode_manager.FirstCodeManager().is_in_first_record_cache(code)
@@ -1177,22 +1591,37 @@
limit_up_price = gpcode_manager.get_limit_up_price(code)
if limit_up_price is None:
raise Exception("娑ㄥ仠浠锋棤娉曡幏鍙�")
- # 鐩爣鎵嬫暟
- threshold_num = round(threshold_money / (limit_up_price * 100))
+
+ threshold_num = None
# 澶х洰鏍囨墜鏁帮紙婊¤冻杩欎釜灏变笉闇�瑕佺湅瀹夊叏绗旀暟锛�
- threshold_max_num = int(threshold_num * 1.2)
+ threshold_max_num = None
+ # ----------------璋冩暣鏉夸笂涓嬪崟鐨刴鍊间笌瀹夊叏绗旀暟----------------
+ if at_limit_up:
+ # 鏉夸笂涔帮紝鑾峰彇鏈�杩戜竴娆￠棯鐢典笅鍗曠殑鎬诲崠棰�
+ sell_data = cls.__latest_fast_place_order_info_dict.get(code)
+ if sell_data:
+ # 鏈夎繃闂數涓嬪崟
+ # 鎬诲崠鐨勪竴鍗婁綔涓簃鍊�
+ threshold_num = int(sell_data[1] / (limit_up_price * 100)) // 2
+ threshold_max_num = 1
+
+ if not threshold_num:
+ # 鐩爣鎵嬫暟
+ threshold_num = round(threshold_money / (limit_up_price * 100))
+ if not threshold_max_num:
+ threshold_max_num = int(threshold_num * 1.2)
# place_order_count = trade_data_manager.PlaceOrderCountManager().get_place_order_count(code)
# 鐩爣璁㈠崟鏁伴噺
threshold_count = cls.__l2PlaceOrderParamsManagerDict[code].get_safe_count()
- buy_single_time_seconds = L2DataUtil.get_time_as_second(total_datas[buy_single_index]["val"]["time"])
+ # buy_single_time_seconds = L2DataUtil.get_time_as_second(total_datas[buy_single_index]["val"]["time"])
# 鍙互瑙﹀彂涔帮紝褰撴湁娑ㄥ仠涔颁俊鍙锋椂鎵嶄細瑙﹀彂涔�
trigger_buy = True
- # 闂撮殧鏈�澶ф椂闂翠緷娆′负锛�3,9,27,81
- max_space_time = cls.__l2PlaceOrderParamsManagerDict[code].get_time_range()
+ # 鏈�澶ч棿闅旀椂闂磎s
+ max_space_time_ms = cls.__l2PlaceOrderParamsManagerDict[code].get_time_range() * 1000
# 鏈�澶т拱閲�
max_buy_num = 0
max_buy_num_set = set(max_num_set)
@@ -1203,21 +1632,22 @@
# 杈冨ぇ鍗曠殑鎵嬫暟
bigger_num = round(5000 / limit_up_price)
+ not_buy_msg = ""
for i in range(compute_start_index, compute_end_index + 1):
data = total_datas[i]
_val = total_datas[i]["val"]
trigger_buy = False
# 蹇呴』涓鸿繛缁�2绉掑唴鐨勬暟鎹�
- if L2DataUtil.get_time_as_second(_val["time"]) - buy_single_time_seconds + 1 > max_space_time:
+ if L2DataUtil.time_sub_as_ms(_val, total_datas[buy_single_index]["val"]) > max_space_time_ms:
cls.__TradePointManager.delete_buy_point(code)
if i == compute_end_index:
# 鏁版嵁澶勭悊瀹屾瘯
- return None, buy_nums, buy_count, None, max_buy_num_set
+ return None, buy_nums, buy_count, None, max_buy_num_set, f"銆恵i}銆戜俊鍙蜂笉杩炵画锛屽泭鎷椂闂�-{max_space_time_ms}ms"
else:
# 璁＄畻涔板叆淇″彿锛屼笉鑳藉悓涓�鏃堕棿寮�濮嬭绠�
for ii in range(buy_single_index + 1, compute_end_index + 1):
if total_datas[buy_single_index]["val"]["time"] != total_datas[ii]["val"]["time"]:
- return None, buy_nums, buy_count, ii, max_buy_num_set
+ return None, buy_nums, buy_count, ii, max_buy_num_set, f"銆恵i}銆戜俊鍙蜂笉杩炵画锛屽泭鎷椂闂�-{max_space_time_ms}ms"
# 娑ㄥ仠涔�
if L2DataUtil.is_limit_up_price_buy(_val):
if l2_data_util.is_big_money(_val):
@@ -1235,10 +1665,9 @@
# 鍙粺璁�59涓囦互涓婄殑閲戦
# 娑ㄥ仠涔版挙
# 鍒ゆ柇涔板叆浣嶇疆鏄惁鍦ㄤ拱鍏ヤ俊鍙蜂箣鍓�
- buy_index = l2_data_source_util.L2DataSourceUtils.get_buy_index_with_cancel_data(code,
- total_datas[i],
- local_today_num_operate_map.get(
- code))
+ buy_index = l2_data_source_util.L2DataSourceUtils.get_buy_index_with_cancel_data_v2(total_datas[i],
+ local_today_buyno_map.get(
+ code))
if buy_index is not None:
# 鎵惧埌涔版挙鏁版嵁鐨勪拱鍏ョ偣
if buy_index >= buy_single_index:
@@ -1267,24 +1696,183 @@
max_buy_num_set_count = 0
for i1 in max_buy_num_set:
max_buy_num_set_count += total_datas[i1]["re"]
- # 鏈夋挙鍗曚俊鍙凤紝涓斿皬浜庨槇鍊�
- if buy_nums >= threshold_num and buy_count >= threshold_count and trigger_buy and max_buy_num_set_count >= big_num_count:
- return i, buy_nums, buy_count, None, max_buy_num_set
+
+ if buy_nums < threshold_num:
+ not_buy_msg = f"銆恵i}銆戠函涔伴涓嶈冻锛寋buy_nums}/{threshold_num}"
+ continue
+
+ if buy_count < threshold_count:
+ not_buy_msg = f"銆恵i}銆戝畨鍏ㄧ瑪鏁颁笉澶燂紝{buy_count}/{threshold_count}"
+ continue
+
+ if not trigger_buy:
+ not_buy_msg = f"銆恵i}銆戞病鏈変拱鍗曡Е鍙�"
+ continue
+
+ if max_buy_num_set_count < big_num_count:
+ not_buy_msg = f"銆恵i}銆戝ぇ鍗曟暟閲忎笉瓒筹紝{max_buy_num_set_count}/{big_num_count}"
+ continue
+
+ try:
+ info = cls.__trade_log_placr_order_info_dict[code]
+ info.set_trade_factor(threshold_money, threshold_count, list(max_buy_num_set))
+ except Exception as e:
+ async_log_util.error(logger_l2_error, f"璁板綍浜ゆ槗鍥犲瓙鍑洪敊锛歿str(e)}")
+
+ return i, buy_nums, buy_count, None, max_buy_num_set, "鍙互涓嬪崟"
l2_log.buy_debug(code, "灏氭湭鑾峰彇鍒颁拱鍏ユ墽琛岀偣锛岃捣濮嬭绠椾綅缃細{} 缁熻绾拱鎵嬫暟锛歿} 鐩爣绾拱鎵嬫暟锛歿} 缁熻绾拱鍗曟暟锛歿} 鐩爣绾拱鍗曟暟锛歿} 澶у崟鏁伴噺锛歿} 鐩爣澶у崟鏁伴噺锛歿}",
compute_start_index,
buy_nums,
threshold_num, buy_count, threshold_count, max_buy_num_set_count, big_num_count)
- return None, buy_nums, buy_count, None, max_buy_num_set
+ return None, buy_nums, buy_count, None, max_buy_num_set, not_buy_msg
+
+ # 杩斿洖(涔板叆鎵ц鐐�, 鎬绘墜, 鎬荤瑪鏁�, 浠庢柊璁＄畻璧风偣, 绾拱棰濋槇鍊�)
+ # 璁＄畻蹇�熶拱鍏�
+ @classmethod
+ def __sum_buy_num_for_order_fast(cls, code, compute_start_index, compute_end_index, origin_num, origin_count,
+ threshold_money_origin, buy_single_index):
+ _start_time = t.time()
+ total_datas = local_today_datas[code]
+ # is_first_code = gpcode_manager.FirstCodeManager().is_in_first_record_cache(code)
+
+ buy_nums = origin_num
+ buy_count = origin_count
+ limit_up_price = gpcode_manager.get_limit_up_price(code)
+ if limit_up_price is None:
+ raise Exception("娑ㄥ仠浠锋棤娉曡幏鍙�")
+ limit_up_price = float(limit_up_price)
+
+ threshold_money = threshold_money_origin
+ # 鐩爣鎵嬫暟
+ threshold_num = round(threshold_money / (limit_up_price * 100))
+
+ # buy_single_time_seconds = L2DataUtil.get_time_as_second(total_datas[buy_single_index]["val"]["time"])
+
+ # 鍙互瑙﹀彂涔帮紝褰撴湁娑ㄥ仠涔颁俊鍙锋椂鎵嶄細瑙﹀彂涔�
+ trigger_buy = True
+ # 闂撮殧鏈�澶ф椂闂翠负3s
+ max_space_time_ms = 3 * 1000
+ # 涓嶄笅鍗曠殑淇℃伅
+ not_buy_msg = ""
+ for i in range(compute_start_index, compute_end_index + 1):
+ data = total_datas[i]
+ _val = total_datas[i]["val"]
+ trigger_buy = False
+ # 蹇呴』涓鸿繛缁�2绉掑唴鐨勬暟鎹�
+ if L2DataUtil.time_sub_as_ms(_val, total_datas[buy_single_index]["val"]) > max_space_time_ms:
+ cls.__TradePointManager.delete_buy_point(code)
+ if i == compute_end_index:
+ # 鏁版嵁澶勭悊瀹屾瘯
+ return None, buy_nums, buy_count, None, threshold_money, f"銆恵i}銆戜俊鍙蜂笉杩炵画锛屽泭鎷椂闂�-{max_space_time_ms}ms"
+ else:
+ # 璁＄畻涔板叆淇″彿锛屼笉鑳藉悓涓�鏃堕棿寮�濮嬭绠�
+ for ii in range(buy_single_index + 1, compute_end_index + 1):
+ if total_datas[buy_single_index]["val"]["time"] != total_datas[ii]["val"]["time"]:
+ return None, buy_nums, buy_count, ii, threshold_money, f"銆恵i}銆戜俊鍙蜂笉杩炵画锛屽泭鎷椂闂�-{max_space_time_ms}ms"
+ if L2DataUtil.is_sell(_val):
+ threshold_money += _val["num"] * int(float(_val["price"]) * 100)
+ threshold_num = round(threshold_money / (limit_up_price * 100))
+ elif L2DataUtil.is_sell_cancel(_val):
+ threshold_money -= _val["num"] * int(float(_val["price"]) * 100)
+ threshold_num = round(threshold_money / (limit_up_price * 100))
+ # 娑ㄥ仠涔�
+ elif L2DataUtil.is_limit_up_price_buy(_val):
+ trigger_buy = True
+ # 鍙粺璁�59涓囦互涓婄殑閲戦
+ buy_nums += int(_val["num"]) * int(total_datas[i]["re"])
+ buy_count += int(total_datas[i]["re"])
+ if buy_nums >= threshold_num:
+ async_log_util.info(logger_l2_trade_buy,
+ f"{code}鑾峰彇鍒颁拱鍏ユ墽琛岀偣(蹇�熶拱鍏�)锛歿i} 缁熻绾拱鎵嬫暟锛歿buy_nums} 鐩爣绾拱鎵嬫暟锛歿threshold_num} 缁熻绾拱鍗曟暟锛歿buy_count}")
+ elif L2DataUtil.is_limit_up_price_buy_cancel(_val):
+ # 鍒ゆ柇涔板叆浣嶇疆鏄惁鍦ㄤ拱鍏ヤ俊鍙蜂箣鍓�
+ buy_index = l2_data_source_util.L2DataSourceUtils.get_buy_index_with_cancel_data_v2(total_datas[i],
+ local_today_buyno_map.get(
+ code))
+ if buy_index is not None:
+ # 鎵惧埌涔版挙鏁版嵁鐨勪拱鍏ョ偣
+ if buy_index >= buy_single_index:
+ buy_nums -= int(_val["num"]) * int(data["re"])
+ buy_count -= int(data["re"])
+ l2_log.buy_debug(code, "{}鏁版嵁鍦ㄤ拱鍏ヤ俊鍙蜂箣鍚� 鎾や拱绾拱鎵嬫暟锛歿} 鐩爣鎵嬫暟锛歿}", i, buy_nums, threshold_num)
+ else:
+ l2_log.buy_debug(code, "{}鏁版嵁鍦ㄤ拱鍏ヤ俊鍙蜂箣鍓嶏紝涔板叆浣嶏細{}", i, buy_index)
+ if total_datas[buy_single_index]["val"]["time"] == total_datas[buy_index]["val"]["time"]:
+ # 鍚屼竴绉�,褰撲綔涔板叆淇″彿涔嬪悗澶勭悊
+ buy_nums -= int(_val["num"]) * int(data["re"])
+ buy_count -= int(data["re"])
+ # 澶у崟鎾ら攢
+ l2_log.buy_debug(code, "{}鏁版嵁涔板叆浣嶄笌棰勪及涔板叆浣嶅湪鍚屼竴绉�", i)
+ else:
+ # 鏈壘鍒颁拱鎾ゆ暟鎹殑涔板叆鐐�
+ l2_log.buy_debug(code, "鏈壘鍒颁拱鎾ゆ暟鎹殑涔板叆鐐�: 浣嶇疆-{} 鏁版嵁-{}", i, data)
+ buy_nums -= int(_val["num"]) * int(total_datas[i]["re"])
+ buy_count -= int(total_datas[i]["re"])
+ l2_log.buy_debug(code, "浣嶇疆-{}锛屾�绘墜鏁帮細{}锛岀洰鏍囨墜鏁帮細{}", i,
+ buy_nums, threshold_num)
+ # 绾拱棰濊冻澶燂紝涓旂瑪鏁板ぇ浜�5绗�
+ if buy_nums < threshold_num:
+ not_buy_msg = f"銆恵i}銆戠函涔伴涓嶅锛寋buy_nums}/{threshold_num}"
+ continue
+ if not trigger_buy:
+ not_buy_msg = f"銆恵i}銆戞病鏈変拱鍗曡Е鍙�"
+ continue
+ if buy_count < 5:
+ not_buy_msg = f"銆恵i}銆戝畨鍏ㄧ瑪鏁颁笉瓒筹紝{buy_count}/{5}"
+ continue
+ try:
+ info = cls.__trade_log_placr_order_info_dict[code]
+ info.set_trade_factor(threshold_money, 0, [])
+ except Exception as e:
+ async_log_util.error(logger_l2_error, f"璁板綍浜ゆ槗鍥犲瓙鍑洪敊锛歿str(e)}")
+
+ return i, buy_nums, buy_count, None, threshold_money, "鍙互涓嬪崟"
+
+ l2_log.buy_debug(code, "灏氭湭鑾峰彇鍒颁拱鍏ユ墽琛岀偣(蹇�熶拱鍏�)锛岃捣濮嬭绠椾綅缃細{} 缁熻绾拱鎵嬫暟锛歿} 鐩爣绾拱鎵嬫暟锛歿} 缁熻绾拱鍗曟暟锛歿}",
+ compute_start_index,
+ buy_nums,
+ threshold_num, buy_count)
+
+ return None, buy_nums, buy_count, None, threshold_money, not_buy_msg
+
+
+def test_trade_record():
+ code = "000333"
+ __trade_log_placr_order_info_dict = {code: trade_record_log_util.PlaceOrderInfo()}
+ try:
+ jx_blocks, jx_blocks_by = KPLCodeJXBlockManager().get_jx_blocks_cache(
+ code), KPLCodeJXBlockManager().get_jx_blocks_cache(code, by=True)
+ info = __trade_log_placr_order_info_dict[code]
+ info.set_buy_index(0, 1)
+ if jx_blocks:
+ info.set_kpl_blocks(list(jx_blocks))
+ elif jx_blocks_by:
+ info.set_kpl_blocks(list(jx_blocks_by))
+ else:
+ info.set_kpl_blocks([])
+
+ trade_record_log_util.add_place_order_log(code, info)
+ except:
+ pass
if __name__ == "__main__":
+ # test_trade_record()
# yesterday_limit_up_data_records = kpl_data_manager.get_current_limit_up_data_records(1)[0][1]
# yesterday_codes = set([x[0] for x in yesterday_limit_up_data_records])
# print(yesterday_codes)
- code = "002137"
- l2.l2_data_util.load_l2_data(code)
- start_index = 200
- end_index = 259
+ code = "603003"
+ datas = log_export.load_l2_from_log()
+ datas = datas.get(code)
+ if datas is None:
+ datas = []
+ l2.l2_data_util.local_today_datas[code] = datas[:191]
+ l2.l2_data_util.load_buy_no_map(l2.l2_data_util.local_today_buyno_map, code,
+ l2.l2_data_util.local_today_datas[code])
+ l2.l2_data_util.load_canceled_buy_no_map(l2.l2_data_util.local_today_canceled_buyno_map, code,
+ l2.l2_data_util.local_today_datas[code])
+ start_index = 73
+ end_index = 190
LCancelBigNumComputer().compute_watch_index(code, start_index, end_index)
--
Gitblit v1.8.0