From 6d7c67d50d1eb3221a114fb3eb2009d24f0c6d38 Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期一, 09 十月 2023 14:26:41 +0800
Subject: [PATCH] 交易记录改变记录位置

---
 l2/l2_data_manager_new.py |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/l2/l2_data_manager_new.py b/l2/l2_data_manager_new.py
index 99e9cb2..c36f1de 100644
--- a/l2/l2_data_manager_new.py
+++ b/l2/l2_data_manager_new.py
@@ -475,12 +475,13 @@
         def l_cancel(_buy_single_index, _buy_exec_index):
             _start_time = round(t.time() * 1000)
             try:
-                b_need_cancel, b_cancel_data = cls.__LCancelBigNumComputer.need_cancel(code,
-                                                                                       _buy_exec_index, start_index,
-                                                                                       end_index, total_data,
-                                                                                       is_first_code)
+                b_need_cancel, b_cancel_data, extra_msg = cls.__LCancelBigNumComputer.need_cancel(code,
+                                                                                                  _buy_exec_index,
+                                                                                                  start_index,
+                                                                                                  end_index, total_data,
+                                                                                                  is_first_code)
                 if b_need_cancel and b_cancel_data:
-                    return b_cancel_data, "L鎾ら攢姣斾緥瑙﹀彂闃堝��"
+                    return b_cancel_data, f"L鎾ら攢姣斾緥瑙﹀彂闃堝��({extra_msg})"
             except Exception as e:
                 async_log_util.error(logger_l2_error,
                                      f"鍙傛暟锛歜uy_single_index-{_buy_single_index} buy_exec_index-{_buy_exec_index}")
@@ -513,7 +514,7 @@
             cancel_data, cancel_msg = h_cancel(buy_single_index, buy_exec_index)
         if cancel_data:
             l2_log.debug(code, "瑙﹀彂鎾ゅ崟锛屾挙鍗曚綅缃細{} 锛屾挙鍗曞師鍥狅細{}", cancel_data["index"], cancel_msg)
-            l2_log.trade_record(code, "鎾ゅ崟", "'index':{} , 'msg':'{}'", cancel_data["index"], cancel_msg)
+
             # 鎾ゅ崟
             cls.cancel_buy(code, cancel_msg, cancel_index=cancel_data["index"])
             # 鎾ゅ崟鎴愬姛锛岀户缁绠椾笅鍗�
@@ -929,6 +930,7 @@
             cls.__LatestCancelIndexManager.set_latest_cancel_index(code, cancel_index)
             cancel_result = cls.__cancel_buy(code)
             if cancel_result:
+                l2_log.trade_record(code, "鎾ゅ崟", "'index':{} , 'msg':'{}'", cancel_index, msg)
                 trade_result_manager.real_cancel_success(code, buy_single_index, buy_exec_index, total_datas)
         l2_log.debug(code, "鎵ц鎾ゅ崟缁撴潫锛屽師鍥狅細{}", msg)
         return True

--
Gitblit v1.8.0