From 4062c0d9d4b7bc8e1d9e866a86c98db5c51f4fa0 Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期三, 15 十一月 2023 16:12:47 +0800
Subject: [PATCH] K线形态加入计算

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

diff --git a/l2/l2_data_manager_new.py b/l2/l2_data_manager_new.py
index 08892de..23ecd50 100644
--- a/l2/l2_data_manager_new.py
+++ b/l2/l2_data_manager_new.py
@@ -1119,16 +1119,21 @@
                 order_begin_pos.count = 0
                 order_begin_pos.buy_single_index = buy_single_index
                 if order_begin_pos.sell_info:
-                    if float(total_datas[buy_single_index]["val"]["price"]) >= 3 and cls.volume_rate_info[code][0] > 0.3 and sell_info[1] > 2000 * 10000:
-                        # 鏆傛椂鎵�8鎶�
-                        # order_begin_pos.threshold_money = int(sell_info[1] * 0.8)
-                        # 娣辫瘉鎬诲崠澶т簬1000涓囩殑绁紝m鍊兼墦5鎶�
-                        if code.find('00') == 0:
-                            order_begin_pos.threshold_money = int(sell_info[1] * 0.6)
-                        else:
-                            order_begin_pos.threshold_money = int(sell_info[1] * 0.8)
-                    else:
+                    k_format = code_nature_analyse.CodeNatureRecordManager().get_k_format_cache(code)
+                    if k_format and (k_format[1][0] or k_format[3][0]):
+                        # 鑲′环鏂伴珮鎴栬�呴�艰繎鍓嶉珮
                         order_begin_pos.threshold_money = int(sell_info[1])
+                    else:
+                        if float(total_datas[buy_single_index]["val"]["price"]) >= 3 and cls.volume_rate_info[code][0] > 0.3 and sell_info[1] > 2000 * 10000:
+                            # 鏆傛椂鎵�8鎶�
+                            # order_begin_pos.threshold_money = int(sell_info[1] * 0.8)
+                            # 娣辫瘉鎬诲崠澶т簬1000涓囩殑绁紝m鍊兼墦5鎶�
+                            if code.find('00') == 0:
+                                order_begin_pos.threshold_money = int(sell_info[1] * 0.6)
+                            else:
+                                order_begin_pos.threshold_money = int(sell_info[1] * 0.8)
+                        else:
+                            order_begin_pos.threshold_money = int(sell_info[1])
                 l2_log.debug(code, "鑾峰彇鍒颁拱鍏ヤ俊鍙疯捣濮嬬偣锛歿} ,璁$畻鑼冨洿锛歿}-{} 锛岄噺姣旓細{}锛屾槸鍚︽澘涓婁拱锛歿}锛屾暟鎹細{} 妯″紡锛歿}锛坽}锛�", buy_single_index,
                              compute_start_index,
                              compute_end_index, cls.volume_rate_info[code], order_begin_pos.at_limit_up,

--
Gitblit v1.8.0