From 6f261784e09576a0433bae869994f6a63c6726d8 Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期三, 08 一月 2025 15:28:10 +0800
Subject: [PATCH] 大单接口输出

---
 servers/data_server.py |   17 +++++++++++------
 1 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/servers/data_server.py b/servers/data_server.py
index d31cb2a..c98f783 100644
--- a/servers/data_server.py
+++ b/servers/data_server.py
@@ -788,7 +788,8 @@
                 deals_month = trade_data_manager.AccountMoneyManager().get_deal_count_info(start_date, end_date)
                 cost_month = sum([round(0.1 * x[1], 2) for x in delegates_month])
                 make_month = 0
-                make_month += max(1 * deals_month[0][1], deals_month[0][2] * 1.854/10000) + 1 * deals_month[1][1] + 0 * deals_month[2][1]
+                make_month += max(1 * deals_month[0][1], deals_month[0][2] * 1.854 / 10000) + 1 * deals_month[1][
+                    1] + 0 * deals_month[2][1]
                 fdata["month_commission"] = round(make_month - cost_month, 2)
                 # 璁$畻褰撴棩鎵嬬画璐硅鎯�
                 delegates = trade_data_manager.AccountMoneyManager().get_delegated_count_info()
@@ -916,18 +917,22 @@
                     for code in codes:
                         deal_big_order_detail_info = None
                         try:
-                            # 鑾峰彇鎴愪氦澶у崟锛�(鍙傝�冨ぇ鍗曢噾棰�,宸叉垚浜ゅぇ鍗曢噾棰�,澶у崟瑕佹眰閲戦)
+                            # 鑾峰彇鎴愪氦澶у崟锛�(鍙傝�冨ぇ鍗曢噾棰�,宸叉垚浜ゅぇ鍗曢噾棰�,澶у崟瑕佹眰閲戦, 宸叉垚浜ゆ定鍋滀拱閲戦, 宸叉垚浜ゆ定鍋滃崠閲戦)
                             th = BeforeSubDealBigOrderManager().get_big_order_threshold(code)
                             deal_big_money_info = radical_buy_data_manager.get_total_deal_big_order_info(
                                 code, gpcode_manager.get_limit_up_price_as_num(code))
                             # 澶у崟鎴愪氦淇℃伅
-                            deal_big_order_info = (
+                            deal_big_order_info = [
                                 output_util.money_desc(th), output_util.money_desc(deal_big_money_info[1]),
-                                output_util.money_desc(deal_big_money_info[2]))
-                            if len(codes) ==1:
+                                output_util.money_desc(deal_big_money_info[2])]
+                            if len(codes) == 1:
                                 # 鍔犺浇澶у崟璇︽儏
                                 deal_big_order_detail_info = radical_buy_data_manager.get_l2_big_order_deal_info(code)
-
+                                # 鍔犺浇娑ㄥ仠澶у崟璇︽儏
+                                limit_up_big_order_detail = radical_buy_data_manager.get_total_detal_big_order_details(code)
+                                deal_big_order_info.append(output_util.money_desc(limit_up_big_order_detail[0]+limit_up_big_order_detail[1]))
+                                deal_big_order_info.append(
+                                    output_util.money_desc(limit_up_big_order_detail[2] + limit_up_big_order_detail[3]))
                         except:
                             deal_big_order_info = None
                         code_name = gpcode_manager.get_code_name(code)

--
Gitblit v1.8.0