From ef5b48b4e5ea139f41746c8a5462b3ed6d5d34c5 Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期二, 28 五月 2024 10:55:12 +0800
Subject: [PATCH] 输出买入/卖出点

---
 main.py |   16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/main.py b/main.py
index f4d6846..fb10b10 100644
--- a/main.py
+++ b/main.py
@@ -137,7 +137,10 @@
     elif type_ == "get_code_position_info":
         # 鏌ヨ姝や粨
         code = data.get("code")
-        results = huaxin_trade_record_manager.PositionManager().list_by_day(tool.get_now_date_str("%Y%m%d"), code)
+        if code:
+            results = huaxin_trade_record_manager.PositionManager().list_by_day(tool.get_now_date_str("%Y%m%d"), code)
+        else:
+            results = huaxin_trade_record_manager.PositionManager().get_from_cache()
         for r in results:
             cb_code = r["securityID"]
             underlying_code = target_codes_manager.get_underlying_code(cb_code)
@@ -147,7 +150,8 @@
                 r["marketInfo"] = {"code": cb_market.code, "name": r["securityName"],
                                    "rate": f"{round(cb_market.rate * 100, 2)}%",
                                    "price": cb_market.price, "lastVolume": cb_market.total_bid_volume // 100,
-                                   "buy1Money": output_util.money_desc(cb_market.buy1_price * cb_market.buy1_volume),"preClosePrice":cb_market.pre_close_price}
+                                   "buy1Money": output_util.money_desc(cb_market.buy1_price * cb_market.buy1_volume),
+                                   "preClosePrice": cb_market.pre_close_price}
             if underlying_market:
                 if not gpcode_manager.CodesNameManager().get_code_name(underlying_market.code):
                     # 寮傛璇锋眰鍚嶇О
@@ -163,8 +167,12 @@
                                              "lastVolume": underlying_market.total_bid_volume // 100,
                                              "buy1Money": output_util.money_desc(
                                                  underlying_market.buy1_price * underlying_market.buy1_volume),
-                                             "preClosePrice":underlying_market.pre_close_price}
-
+                                             "preClosePrice": underlying_market.pre_close_price}
+            # 鑾峰彇涔扮偣涓庡崠鐐�
+            buys = huaxin_trade_record_manager.DealRecordManager().list_buy_by_code_cache(cb_code)
+            sells = huaxin_trade_record_manager.DealRecordManager().list_sell_by_code_cache(cb_code)
+            r["buy_list"] = [{"price": x["price"], "tradeTime": x["tradeTime"], "volume": x["volume"]} for x in buys]
+            r["sell_list"] = [{"price": x["price"], "tradeTime": x["tradeTime"], "volume": x["volume"]} for x in sells]
         send_response({"code": 0, "data": results}, client_id, request_id)
     elif type_ == "refresh_trade_data":
         # 鍒锋柊浜ゆ槗鏁版嵁

--
Gitblit v1.8.0