From cbe19ea6066a600cbd0b5110db5d43f8252d14a8 Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期四, 13 六月 2024 11:23:53 +0800
Subject: [PATCH] L撤成交进度相关改进
---
third_data/data_server.py | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/third_data/data_server.py b/third_data/data_server.py
index 09a950c..1fba80d 100644
--- a/third_data/data_server.py
+++ b/third_data/data_server.py
@@ -26,7 +26,7 @@
from urllib.parse import parse_qs
from output import code_info_output, limit_up_data_filter, output_util, kp_client_msg_manager
-from trade import bidding_money_manager, trade_manager, l2_trade_util, trade_record_log_util
+from trade import bidding_money_manager, trade_manager, l2_trade_util, trade_record_log_util, trade_constant
import concurrent.futures
# 绂佺敤http.server鐨勬棩蹇楄緭鍑�
@@ -377,7 +377,7 @@
trade_progress, is_default = transaction_progress.TradeBuyQueue().get_traded_index(code)
# 鑾峰彇姝ｅ湪鎴愪氦, 璁＄畻鎴愪氦杩涘害
dealing_info = HuaXinBuyOrderManager.get_dealing_order_info(code)
- percent = 0
+ percent = 100
if dealing_info:
total_datas = l2_data_util.local_today_datas.get(code)
if str(total_datas[trade_progress]['val']["orderNo"]) == str(dealing_info[0]):
@@ -522,7 +522,7 @@
code_info[4] = 1 if code_info[0] in want_codes else 0
# 鑾峰彇浠ｇ爜鐘舵��
if trade_manager.CodesTradeStateManager().get_trade_state_cache(
- code_info[0]) != trade_manager.TRADE_STATE_NOT_TRADE:
+ code_info[0]) != trade_constant.TRADE_STATE_NOT_TRADE:
code_info[5] = 1
response_data = json.dumps({"code": 0, "data": codes_info})
@@ -534,7 +534,7 @@
statistic = {}
for result in results:
for c in result[1]:
- if not tool.is_shsz_code(c):
+ if not tool.is_can_buy_code(c):
continue
if code and code != c:
continue
@@ -566,7 +566,7 @@
total_datas = l2_data_util.local_today_datas.get(code)
trade_state = trade_manager.CodesTradeStateManager().get_trade_state_cache(code)
- if trade_state == trade_manager.TRADE_STATE_BUY_PLACE_ORDER or trade_state == trade_manager.TRADE_STATE_BUY_DELEGATED or trade_state == trade_manager.TRADE_STATE_BUY_SUCCESS:
+ if trade_state == trade_constant.TRADE_STATE_BUY_PLACE_ORDER or trade_state == trade_constant.TRADE_STATE_BUY_DELEGATED or trade_state == trade_constant.TRADE_STATE_BUY_SUCCESS:
hcancel_datas_dict, cancel_indexes_set = HourCancelBigNumComputer().get_watch_index_dict(code)
# 鏍规嵁鏃ュ織璇诲彇瀹炴椂鐨勮绠楁暟鎹�
h_cancel_latest_compute_info = log_export.get_h_cancel_compute_info(code)
@@ -717,7 +717,7 @@
code = d[0]
limit_up_reasons[code] = d[5]
codes_set.add(code)
- if tool.is_shsz_code(code):
+ if tool.is_can_buy_code(code):
limit_up_time = time.strftime("%H:%M:%S", time.localtime(d[2]))
code_price_manager.Buy1PriceManager().set_limit_up_time(code, limit_up_time)
add_codes = codes_set - self.__latest_limit_up_codes_set
@@ -736,11 +736,11 @@
if add_codes:
for code in add_codes:
# 鏍规嵁娑ㄥ仠鍘熷洜鍒ゆ柇鏄惁鍙互涔�
- if tool.is_shsz_code(code):
+ if tool.is_can_buy_code(code):
try:
# 鍒ゆ柇鏄惁涓嬪崟
trade_state = trade_manager.CodesTradeStateManager().get_trade_state(code)
- if trade_state == trade_manager.TRADE_STATE_BUY_PLACE_ORDER or trade_state == trade_manager.TRADE_STATE_BUY_DELEGATED:
+ if trade_state == trade_constant.TRADE_STATE_BUY_PLACE_ORDER or trade_state == trade_constant.TRADE_STATE_BUY_DELEGATED:
# 濮旀墭涓殑璁㈠崟锛屽垽鏂槸鍚﹂渶瑕佹挙鍗�
if not gpcode_manager.WantBuyCodesManager().is_in_cache(code):
yesterday_codes = kpl_data_manager.get_yesterday_limit_up_codes()
--
Gitblit v1.8.0