From a68342e13d2f11eade054ff1ab3eb496ff266516 Mon Sep 17 00:00:00 2001 From: Administrator <admin@example.com> Date: 星期五, 01 九月 2023 17:44:48 +0800 Subject: [PATCH] 真实下单位置校验 --- third_data/code_plate_key_manager.py | 26 ++++++++++++++++---------- 1 files changed, 16 insertions(+), 10 deletions(-) diff --git a/third_data/code_plate_key_manager.py b/third_data/code_plate_key_manager.py index 8fff50b..5d4a496 100644 --- a/third_data/code_plate_key_manager.py +++ b/third_data/code_plate_key_manager.py @@ -419,6 +419,15 @@ __CodesTradeStateManager = trade_manager.CodesTradeStateManager() __can_buy_compute_result_dict = {} + @classmethod + def __remove_from_l2(cls, code, msg): + # 涓嬭繃鍗曠殑浠g爜涓嶇Щ闄� + if trade_manager.CodesTradeStateManager().get_trade_state_cache(code) != trade_manager.TRADE_STATE_NOT_TRADE: + # 鍙涓嬭繃鍗曠殑灏变笉绉婚櫎 + return + l2_trade_util.forbidden_trade(code) + logger_kpl_block_can_buy.info(msg) + # 鑾峰彇鍙互涔扮殑鏉垮潡 # current_limit_up_datas: 浠婃棩瀹炴椂娑ㄥ仠 # latest_2_day_limit_up_datas锛氭渶杩�2澶╃殑瀹炴椂娑ㄥ仠锛堜笉鍚粖鏃ワ級 @@ -436,6 +445,8 @@ else: code_limit_up_reason_dict[d[3]] = d[2] return code_limit_up_reason_dict + if current_limit_up_datas is None: + current_limit_up_datas = [] # 鑾峰彇鐩爣浠g爜鏉垮潡 keys, k1, k11, k2, k3, k4 = cls.__TargetCodePlateKeyManager.get_plate_keys(code) @@ -485,29 +496,24 @@ code_limit_up_reason_dict) if pen_limit_up_codes: # 涓绘澘寮�1 - if current_shsz_rank < len(pen_limit_up_codes) + 1 and record_shsz_rank < len( - pen_limit_up_codes) + 1: + if current_shsz_rank < len(pen_limit_up_codes) + 1 and record_shsz_rank < len(pen_limit_up_codes) + 1: # 灞炰簬榫�1,榫�2 can_buy_blocks.append((block, - f"{block}锛歵op10娑ㄥ仠鏉垮潡锛屼富鏉垮紑1({pen_limit_up_codes}),灞炰簬涓绘澘鍓嶉緳{len(pen_limit_up_codes) + 1}(瀹炴椂韬綅-{current_shsz_rank})")) + f"{tool.get_now_time_str()} {block}锛歵op10娑ㄥ仠鏉垮潡锛屼富鏉垮紑1({pen_limit_up_codes}),灞炰簬涓绘澘鍓嶉緳{len(pen_limit_up_codes) + 1}(瀹炴椂韬綅-{current_shsz_rank}/{len(current_limit_up_datas)})")) continue else: if record_shsz_rank >= len(pen_limit_up_codes) + 1: - logger_kpl_block_can_buy.info(f"{code}鏍规嵁韬綅绂佹涔板叆锛氥�恵block}銆戝巻鍙茶韩浣峽record_shsz_rank}") - # 浠婃棩宸茬粡涓嶅彲鑳戒拱鐨勭エ锛岀洿鎺ュ姞鍏ラ粦鍚嶅崟 - l2_trade_util.forbidden_trade(code) + cls.__remove_from_l2(code, f"{code}鏍规嵁韬綅绂佹涔板叆锛氥�恵block}銆戝巻鍙茶韩浣峽record_shsz_rank}") msg_list.append( f"鏉垮潡-{block}: top4娑ㄥ仠鏉垮潡锛屼富鏉垮紑1锛坽pen_limit_up_codes}锛�,涓嶄负涓绘澘鍓嶉緳{len(pen_limit_up_codes) + 1}锛堝疄鏃惰韩浣�-{current_shsz_rank},鍘嗗彶韬綅-{record_shsz_rank}锛�") continue else: if current_shsz_rank == 0 and record_shsz_rank < 2: - can_buy_blocks.append((block, f"{block}锛歵op4娑ㄥ仠鏉垮潡锛岄潪涓绘澘寮�1锛屽睘浜庨緳1")) + can_buy_blocks.append((block, f"{tool.get_now_time_str()} {block}锛歵op4娑ㄥ仠鏉垮潡锛岄潪涓绘澘寮�1锛屽睘浜庨緳1锛屽疄鏃舵定鍋滃垪琛ㄦ暟閲�({len(current_limit_up_datas)})")) continue else: if record_shsz_rank >= 2: - logger_kpl_block_can_buy.info(f"{code}鏍规嵁韬綅绂佹涔板叆锛氥�恵block}銆戝巻鍙茶韩浣峽record_shsz_rank}") - # 浠婃棩宸茬粡涓嶅彲鑳戒拱鐨勭エ锛岀洿鎺ュ姞鍏ラ粦鍚嶅崟 - l2_trade_util.forbidden_trade(code) + cls.__remove_from_l2(code, f"{code}鏍规嵁韬綅绂佹涔板叆锛氥�恵block}銆戝巻鍙茶韩浣峽record_shsz_rank}") msg_list.append( f"鏉垮潡-{block}: top4娑ㄥ仠鏉垮潡锛岄潪涓绘澘寮�1,涓嶄负涓绘澘榫�1锛堝疄鏃惰韩浣�-{current_shsz_rank},鍘嗗彶韬綅-{record_shsz_rank}锛�") -- Gitblit v1.8.0