From 2f2516749615da866e96d8d24e499b7ecbb63a3e Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期一, 23 六月 2025 12:28:52 +0800
Subject: [PATCH] 默认交易模式变更/真实下单位置计算位置修改

---
 l2/l2_data_source_util.py |   48 +++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 47 insertions(+), 1 deletions(-)

diff --git a/l2/l2_data_source_util.py b/l2/l2_data_source_util.py
index 0654460..4288c1b 100644
--- a/l2/l2_data_source_util.py
+++ b/l2/l2_data_source_util.py
@@ -129,12 +129,22 @@
             try:
                 cancel_datas.sort(key=lambda t: t["index"])
             except Exception as e:
-                print("娴嬭瘯")
+                # print("娴嬭瘯")
+                pass
             for item in cancel_datas:
                 # 鎻愬墠鍋氳绠�
                 cls.__get_buy_index_with_cancel_data(code, item, local_today_num_operate_map)
 
         return cls.__get_buy_index_with_cancel_data(code, cancel_data, local_today_num_operate_map)
+
+    # 鏍规嵁涔版挙鏁版嵁璁$畻涔板叆鏁版嵁锛堝崕閼師鐢烲2鏁版嵁閫傜敤锛�
+    @classmethod
+    def get_buy_index_with_cancel_data_v2(cls, cancel_data, buyno_map):
+        order_no = str(cancel_data["val"]["orderNo"])
+        buy_data = buyno_map.get(order_no)
+        if buy_data:
+            return buy_data["index"]
+        return None
 
     # 鑾峰彇娌℃挙鐨勭瑪鏁�
     @classmethod
@@ -163,6 +173,42 @@
             return count
         return 0
 
+        # 鑾峰彇娌℃挙鐨勭瑪鏁�
+
+    # 鑾峰彇娑ㄥ仠涔版病鏈夋挙鍗曠殑鏁伴噺
+    @classmethod
+    def get_limit_up_buy_no_canceled_count_v2(cls, code, index, total_data, canceled_buyno_map):
+        data = None
+        try:
+            data = total_data[index]
+        except Exception as e:
+            logger_l2_error.error(
+                f"鏈壘鍒颁拱鍏ョ储寮曞搴旂殑鏁版嵁锛歩ndex-{index} total_data闀垮害-{len(total_data) if total_data else 0} 閿欒鍘熷洜锛歿str(e)}")
+        val = data["val"]
+        order_no = str(val["orderNo"])
+        canceled_data = canceled_buyno_map.get(order_no)
+        if canceled_data:
+            return data["re"] - canceled_data["re"]
+        else:
+            return data["re"]
+
+    @classmethod
+    def get_limit_up_buy_canceled_data_v2(cls, code, index, total_data, canceled_buyno_map):
+        data = None
+        try:
+            data = total_data[index]
+        except Exception as e:
+            logger_l2_error.error(
+                f"鏈壘鍒颁拱鍏ョ储寮曞搴旂殑鏁版嵁锛歩ndex-{index} total_data闀垮害-{len(total_data) if total_data else 0} 閿欒鍘熷洜锛歿str(e)}")
+        val = data["val"]
+        order_no = str(val["orderNo"])
+        canceled_data = canceled_buyno_map.get(order_no)
+        if canceled_data:
+            return canceled_data
+        else:
+            return None
+
+
 # if __name__ == "__main__":
 #     code = "000925"
 #     l2_data_util.load_l2_data(code)

--
Gitblit v1.8.0