From 8138f3e5c6a2f05ed58adb12569ede34ffccf167 Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期二, 02 七月 2024 13:50:00 +0800
Subject: [PATCH] 上证成交进度信息排除主动买成交数据

---
 third_data/data_server.py |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/third_data/data_server.py b/third_data/data_server.py
index 8c9973a..df774e7 100644
--- a/third_data/data_server.py
+++ b/third_data/data_server.py
@@ -380,11 +380,16 @@
             trade_progress, is_default = transaction_progress.TradeBuyQueue().get_traded_index(code)
             # 鑾峰彇姝e湪鎴愪氦, 璁$畻鎴愪氦杩涘害
             dealing_info = HuaXinBuyOrderManager.get_dealing_order_info(code)
+            dealing_active_info = HuaXinBuyOrderManager.get_dealing_active_order_info(code)
             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]):
-                    percent = int(dealing_info[1] / total_datas[trade_progress]['val']['num'])
+                    num = total_datas[trade_progress]['val']['num']
+                    if dealing_active_info and dealing_info[0] == dealing_active_info[0]:
+                        if tool.is_sh_code(code):
+                            num += dealing_active_info[1]//100
+                    percent = int(dealing_info[1] / num)
             response_data = json.dumps(
                 {"code": 0, "data": {"trade_progress": trade_progress, "is_default": is_default, "percent": percent}})
         elif url.path == "/get_l_cancel_datas":

--
Gitblit v1.8.0