From d6712f00aa08564b3aabb8f41ffa7b55b1b10324 Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期一, 15 一月 2024 16:59:19 +0800
Subject: [PATCH] 增加设置真实下单位接口

---
 l2/l2_data_manager_new.py |   35 +++++++++++++++++++----------------
 1 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/l2/l2_data_manager_new.py b/l2/l2_data_manager_new.py
index 7bf7e81..35a382a 100644
--- a/l2/l2_data_manager_new.py
+++ b/l2/l2_data_manager_new.py
@@ -518,7 +518,6 @@
                 pass
             return None, ""
 
-
         # L鎾�
         def l_cancel(_buy_single_index, _buy_exec_index):
             _start_time = round(t.time() * 1000)
@@ -1026,7 +1025,6 @@
                 if code in cls.volume_rate_info and cls.volume_rate_info[code][0] < 0.15:
                     return False, True, f"寮哄娍10鍒嗛挓,涓�5涓氦鏄撴棩璺屽仠,閲忔湭杈惧埌{0.15}({cls.volume_rate_info[code][0]})"
 
-
             # 鑾峰彇閲忕殑鍙傝�冩棩鏈�
             if code in global_util.max60_volumn:
                 day = global_util.max60_volumn[code][1]
@@ -1284,23 +1282,28 @@
                 order_begin_pos.count = 0
                 order_begin_pos.buy_single_index = buy_single_index
                 if order_begin_pos.sell_info:
-                    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 and int(
-                            tool.get_now_time_str().replace(":", "")) < int("100000"):
-                            # 鏆傛椂鎵�8鎶�
-                            # order_begin_pos.threshold_money = int(sell_info[1] * 0.8)
-                            # 娣辫瘉鎬诲崠澶т簬1000涓囩殑绁紝m鍊兼墦5鎶�
-                            if code.find('00') == 0:
+                    # 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 and int(
+                        tool.get_now_time_str().replace(":", "")) < int("100000"):
+                        # 鏆傛椂鎵�8鎶�
+                        # order_begin_pos.threshold_money = int(sell_info[1] * 0.8)
+                        # 娣辫瘉鎬诲崠澶т簬1000涓囩殑绁紝m鍊兼墦5鎶�
+                        if code.find('00') == 0:
+                            # 娣卞湷棣栨涓嬪崟鎵撴姌
+                            place_order_count = trade_data_manager.PlaceOrderCountManager().get_place_order_count(code)
+                            if place_order_count is not None and place_order_count == 0:
                                 order_begin_pos.threshold_money = int(sell_info[1] * 0.6)
                             else:
-                                order_begin_pos.threshold_money = int(sell_info[1] * 0.8)
+                                order_begin_pos.threshold_money = int(sell_info[1])
                         else:
-                            order_begin_pos.threshold_money = int(sell_info[1])
+                            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