From 4bd794d517a60ecd91dda4cb8236453582180649 Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期日, 25 六月 2023 18:31:19 +0800
Subject: [PATCH] 结构优化/初步完成D撤与L撤/H撤策略修改

---
 l2/l2_data_manager_new.py |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/l2/l2_data_manager_new.py b/l2/l2_data_manager_new.py
index 8ed7309..2a65e1b 100644
--- a/l2/l2_data_manager_new.py
+++ b/l2/l2_data_manager_new.py
@@ -15,6 +15,7 @@
 from db import redis_manager
 import ths_industry_util
 import tool
+from l2.huaxin import l2_huaxin_util
 from third_data.code_plate_key_manager import CodePlateKeyBuyManager
 from trade import trade_manager, trade_queue_manager, l2_trade_factor, l2_trade_util, \
     trade_result_manager, first_code_score_manager
@@ -22,7 +23,7 @@
 from l2.cancel_buy_strategy import SecondCancelBigNumComputer, HourCancelBigNumComputer, L2LimitUpMoneyStatisticUtil, \
     L2LimitUpSellStatisticUtil
 from l2.l2_data_manager import L2DataException, TradePointManager
-from l2.l2_data_util import local_today_datas, L2DataUtil, local_today_num_operate_map, local_latest_datas
+from l2.l2_data_util import local_today_datas, L2DataUtil, local_today_num_operate_map,local_today_buyno_map, local_latest_datas
 import l2.l2_data_util
 from log import logger_l2_trade_buy, logger_l2_process, \
     logger_place_order_score
@@ -195,7 +196,9 @@
                     # 鏁版嵁涓嶆甯搁渶瑕佺姝氦鏄�
                     l2_trade_util.forbidden_trade(code)
                 # 绾犳鏁版嵁
-                datas = l2.l2_data_util.L2DataUtil.correct_data(code, local_latest_datas.get(code), datas)
+                if constant.L2_SOURCE_TYPE == constant.L2_SOURCE_TYPE_THS:
+                    # 鍚岃姳椤洪渶瑕佺籂姝f暟鎹紝鍏朵粬娓犻亾涓嶉渶瑕�
+                    datas = l2.l2_data_util.L2DataUtil.correct_data(code, local_latest_datas.get(code), datas)
                 _start_index = 0
                 if local_today_datas.get(code) is not None and len(
                         local_today_datas[code]) > 0:
@@ -224,6 +227,7 @@
             # 鎷兼帴鏁版嵁
             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)
 
             # 绗�1鏉℃暟鎹槸鍚︿负09:30:00
             if add_datas[0]["val"]["time"] == "09:30:00":

--
Gitblit v1.8.0