From 353e8ef9cd36018b0e2b5b3e0721f0065d587a8d Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期三, 28 二月 2024 17:02:21 +0800
Subject: [PATCH] H撤Bug修改

---
 utils/data_export_util.py |   17 +++++++++++++----
 1 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/utils/data_export_util.py b/utils/data_export_util.py
index bb25f5f..c736284 100644
--- a/utils/data_export_util.py
+++ b/utils/data_export_util.py
@@ -24,9 +24,13 @@
 
 
 # 鑾峰彇L2鐨勬暟鎹�
-def get_l2_datas(code, date=None):
-    local_today_datas = log_export.load_l2_from_log(date)
-    datas = local_today_datas[code]
+def get_l2_datas(code, today_datas=None, date=None):
+    datas = today_datas
+    if datas is None:
+        local_today_datas = log_export.load_l2_from_log(date)
+        datas = local_today_datas.get(code)
+    if not datas:
+        datas = []
     process_indexs = log_export.get_l2_process_position(code, date)
     trade_indexs = log_export.get_l2_trade_position(code, date)
     real_position_indexes = log_export.get_real_place_order_positions(code, date)
@@ -148,7 +152,12 @@
             # 涔�
             if cancel_data:
                 try:
-                    cancel_info = "{}-{}".format(cancel_data["index"],f"{cancel_data['val']['time']}") + (f".{cancel_data['val']['tms']}" if "tms" in cancel_data["val"] else '')
+                    left_num = data["val"]["num"] - cancel_data["val"]["num"]
+                    if left_num > 0:
+                        cancel_info = f"鎴愪氦:{left_num} 搴忓彿:{cancel_data['index']}"
+                    else:
+                        cancel_info = "{}-{}".format(cancel_data["index"], f"{cancel_data['val']['time']}") + (
+                            f".{cancel_data['val']['tms']}" if "tms" in cancel_data["val"] else '')
                 except Exception as e:
                     logging.exception(e)
             else:

--
Gitblit v1.8.0