From 736e61b89e87f7e3c224feca25e94cda459b9ae6 Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期一, 06 二月 2023 15:26:05 +0800
Subject: [PATCH] H撤完善，修改代码文件目录
---
l2/transaction_progress.py | 28 ++++++++++++++++++++++++----
1 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/l2/transaction_progress.py b/l2/transaction_progress.py
index 5d3ea7a..05ea226 100644
--- a/l2/transaction_progress.py
+++ b/l2/transaction_progress.py
@@ -8,7 +8,7 @@
import constant
import redis_manager
import tool
-import l2_data_manager
+from l2 import l2_data_manager
import l2.l2_data_util
@@ -46,10 +46,25 @@
return None
return int(val)
+ # 鏈�杩戠殑闈炴定鍋滀拱1鐨勬椂闂�
+ def __save_latest_not_limit_up_time(self, code, time_str):
+ key = "latest_not_limit_up_time-{}".format(code)
+ self.__getRedis().setex(key, tool.get_expire(), time_str)
+
+ def __get_latest_not_limit_up_time(self, code):
+ key = "latest_not_limit_up_time-{}".format(code)
+ self.__getRedis().get(key)
+
# 淇濆瓨鏁版嵁,杩斿洖淇濆瓨鏁版嵁鐨勬潯鏁�
- def save(self, code, limit_up_price, queues):
+ def save(self, code, limit_up_price, buy_1_price, buy_1_time, queues):
+ # 濡傛灉涔�1涓嶄负娑ㄥ仠浠峰氨涓嶉渶瑕佷繚瀛�
if queues == self.last_buy_queue_data.get(code):
return None
+ if abs(float(buy_1_price) - float(limit_up_price)) >= 0.01:
+ # 淇濆瓨鏈�杩戠殑娑ㄥ仠璧峰鏃堕棿
+ self.__save_latest_not_limit_up_time(code, buy_1_time)
+ return None
+
self.last_buy_queue_data[code] = queues
min_num = round(constant.L2_MIN_MONEY / (limit_up_price * 100))
num_list = []
@@ -64,8 +79,8 @@
def save_traded_index(self, code, buy1_price, buyQueueBig):
total_datas = l2_data_manager.local_today_datas.get(code)
today_num_operate_map = l2_data_manager.local_today_num_operate_map.get(code)
- index = l2.l2_data_util.L2TradeQueueUtils.find_traded_progress_index(buy1_price, total_datas, total_datas,
- today_num_operate_map, buyQueueBig)
+ index = l2.l2_data_util.L2TradeQueueUtils.find_traded_progress_index(buy1_price, total_datas,
+ today_num_operate_map, buyQueueBig,self.__get_latest_not_limit_up_time(code))
if index is not None:
# 淇濆瓨鎴愪氦杩涘害
self.__save_buy_progress_index(code, index)
@@ -77,3 +92,8 @@
index = self.__get_buy_progress_index(code)
return index
+
+if __name__ == '__main':
+
+
+ pass
--
Gitblit v1.8.0