From 403f53e86f04ce0efb285d5d60c8519ab8ce1e15 Mon Sep 17 00:00:00 2001 From: Administrator <admin@example.com> Date: 星期五, 15 九月 2023 10:56:00 +0800 Subject: [PATCH] 注释下单阻止 --- l2/l2_data_source_util.py | 24 +++++++++++++----------- 1 files changed, 13 insertions(+), 11 deletions(-) diff --git a/l2/l2_data_source_util.py b/l2/l2_data_source_util.py index 85893f6..e3a2a87 100644 --- a/l2/l2_data_source_util.py +++ b/l2/l2_data_source_util.py @@ -2,6 +2,7 @@ L2鏁版嵁婧簮 """ import constant +from log_module.log import logger_l2_error from utils import tool @@ -65,7 +66,7 @@ for bd in buy_datas: # 鏍规嵁璁㈠崟鍙峰仛鍖归厤 if bd["val"]["orderNo"] == cancel_data["val"]["orderNo"]: - return bd + return bd["index"] return None # 鍚岃姳椤烘笭閬撶殑L2锛屾牴鎹拱鎾ゆ暟鎹煡鎵句拱鍏ユ暟鎹� @@ -124,13 +125,14 @@ def get_buy_index_with_cancel_data(cls, code, cancel_data, local_today_num_operate_map): key = "{}-{}-{}".format(cancel_data["val"]["num"], "1", cancel_data["val"]["price"]) cancel_datas = local_today_num_operate_map.get(key) - try: - cancel_datas.sort(key=lambda t: t["index"]) - except Exception as e: - print("娴嬭瘯") - for item in cancel_datas: - # 鎻愬墠鍋氳绠� - cls.__get_buy_index_with_cancel_data(code, item, local_today_num_operate_map) + if cancel_datas: + try: + cancel_datas.sort(key=lambda t: t["index"]) + except Exception as e: + print("娴嬭瘯") + for item in cancel_datas: + # 鎻愬墠鍋氳绠� + cls.__get_buy_index_with_cancel_data(code, item, local_today_num_operate_map) return cls.__get_buy_index_with_cancel_data(code, cancel_data, local_today_num_operate_map) @@ -140,8 +142,8 @@ data = None try: data = total_data[index] - except: - print("") + except Exception as e: + logger_l2_error.error(f"鏈壘鍒颁拱鍏ョ储寮曞搴旂殑鏁版嵁锛歩ndex-{index} total_data闀垮害-{len(total_data) if total_data else 0} 閿欒鍘熷洜锛歿str(e)}") val = data["val"] # 鍒ゆ柇褰撳墠涔版槸鍚﹀凡缁忎拱鎾� cancel_datas = local_today_num_operate_map.get( @@ -149,7 +151,6 @@ canceled = False if cancel_datas: for cancel_data in cancel_datas: - buy_index = cls.get_buy_index_with_cancel_data(code, cancel_data, local_today_num_operate_map) if buy_index == index: canceled = True @@ -162,6 +163,7 @@ return count return 0 + # if __name__ == "__main__": # code = "000925" # l2_data_util.load_l2_data(code) -- Gitblit v1.8.0