From 10b85453b37b21f297cc7d6fb50c1954d5a6acb6 Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期四, 09 一月 2025 14:55:15 +0800
Subject: [PATCH] BUG修复
---
l2/l2_transaction_data_manager.py | 45 ++++++++++++++++++++++++++++++++++++---------
1 files changed, 36 insertions(+), 9 deletions(-)
diff --git a/l2/l2_transaction_data_manager.py b/l2/l2_transaction_data_manager.py
index 3a84c7e..a5cb7c0 100644
--- a/l2/l2_transaction_data_manager.py
+++ b/l2/l2_transaction_data_manager.py
@@ -4,7 +4,7 @@
import json
import l2_data_util
-from db import redis_manager
+from db import redis_manager_delegate as redis_manager
from db.redis_manager_delegate import RedisUtils
from l2 import l2_log
from l2.huaxin import l2_huaxin_util
@@ -84,6 +84,16 @@
return 0
return int(sum([x[2] for x in self.__total_buy_datas_dict[code]]))
+ def get_total_buy_order_ids(self, code):
+ """
+ 鑾峰彇鎴愪氦澶у崟鐨勮鍗曞彿
+ @param code:
+ @return:
+ """
+ if code not in self.__total_buy_datas_dict:
+ return set()
+ return set([x[0] for x in self.__total_buy_datas_dict[code]])
+
def get_total_buy_count(self, code):
"""
鑾峰彇澶у崟鎴愪氦鐨勭瑪鏁�
@@ -112,15 +122,19 @@
"""
return self.__total_buy_datas_dict.get(code)
- def get_total_sell_money(self, code):
+ def get_total_sell_money(self, code, threshold_money=None):
"""
鑾峰彇鎬诲叡鐨勫ぇ鍗曞崠閲戦
+ @param threshold_money: 澶у崟闃堝��
@param code:
@return:
"""
if code not in self.__total_sell_datas_dict:
return 0
- return int(sum([x[2] for x in self.__total_sell_datas_dict[code]]))
+ if threshold_money:
+ return int(sum([x[2] if x[2]>=threshold_money else 0 for x in self.__total_sell_datas_dict[code]]))
+ else:
+ return int(sum([x[2] for x in self.__total_sell_datas_dict[code]]))
# 鎴愪氦鏁版嵁缁熻
@@ -200,16 +214,23 @@
# q.append((data['SecurityID'], data['TradePrice'], data['TradeVolume'],
# data['OrderTime'], data['MainSeq'], data['SubSeq'], data['BuyNo'],
# data['SellNo'], data['ExecType']))
-
+ is_limit_up = abs(data[1] - limit_up_price) < 0.0001
+ money = data[2] * data[1]
if code not in cls.__dealing_order_info_dict:
- # 鏁版嵁鏍煎紡[璁㈠崟鍙凤紝鎬昏偂鏁帮紝鎴愪氦閲戦,鎴愪氦寮�濮嬫椂闂�,鎴愪氦缁撴潫鏃堕棿]
- cls.__dealing_order_info_dict[code] = [data[6], data[2], data[2] * data[1], data[3], data[3]]
+ # 鏁版嵁鏍煎紡[璁㈠崟鍙凤紝鎬昏偂鏁帮紝鎴愪氦閲戦,鎴愪氦寮�濮嬫椂闂�,鎴愪氦缁撴潫鏃堕棿, 鏈�杩戠殑鎴愪氦浠锋牸, 鏈�杩戠殑鍗栧崟鍙�, 娑ㄥ仠浠锋垚浜ら噾棰漖
+ cls.__dealing_order_info_dict[code] = [data[6], data[2],money, data[3], data[3], data[1],
+ data[7], 0]
+ if is_limit_up:
+ cls.__dealing_order_info_dict[code][7] += money
else:
if cls.__dealing_order_info_dict[code][0] == data[6]:
# 鎴愪氦鍚屼竴涓鍗曞彿
cls.__dealing_order_info_dict[code][1] += data[2]
- cls.__dealing_order_info_dict[code][2] += data[2] * data[1]
+ cls.__dealing_order_info_dict[code][2] += money
cls.__dealing_order_info_dict[code][4] = data[3]
+ cls.__dealing_order_info_dict[code][5] = data[1]
+ cls.__dealing_order_info_dict[code][6] = data[7]
+ cls.__dealing_order_info_dict[code][7] += money
else:
# 淇濆瓨涓婁竴鏉℃暟鎹�
async_log_util.info(hx_logger_l2_transaction_desc, f"{code}#{cls.__dealing_order_info_dict[code]}")
@@ -217,13 +238,19 @@
deal_info = cls.__dealing_order_info_dict[code]
cls.__latest_deal_order_info_dict[code] = deal_info
# 鏄惁涓哄ぇ涔板崟
- if deal_info[2] >= threshold_big_money:
+ if deal_info[7] >= threshold_big_money:
+ # # 濡傛灉鏈�鍚庝竴绗旀垚浜や环鏍间笉鏄定鍋滀环灏变笉绠�
+ # if abs(deal_info[5] - limit_up_price) < 0.0001:
big_buy_datas.append(deal_info)
if deal_info[2] >= 500000:
normal_buy_datas.append(deal_info)
# 鍒濆鍖栨湰鏉℃暟鎹�
- cls.__dealing_order_info_dict[code] = [data[6], data[2], data[2] * data[1], data[3], data[3]]
+ cls.__dealing_order_info_dict[code] = [data[6], data[2], money, data[3], data[3],
+ data[1], data[7], 0]
+ if is_limit_up:
+ cls.__dealing_order_info_dict[code][7] += money
+
# 缁熻涓诲姩涔�(涔板崟鍙峰ぇ浜庡崠鍗曞彿)
try:
if data[6] > data[7]:
--
Gitblit v1.8.0