From 64e7f086c38401b061b8fe6a70a376857a8fa01f Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期三, 26 三月 2025 11:01:19 +0800
Subject: [PATCH] bug修复

---
 api/outside_api_command_callback.py |   55 +++++++++++++++++++++++++++++++++----------------------
 1 files changed, 33 insertions(+), 22 deletions(-)

diff --git a/api/outside_api_command_callback.py b/api/outside_api_command_callback.py
index b8050ec..33e1218 100644
--- a/api/outside_api_command_callback.py
+++ b/api/outside_api_command_callback.py
@@ -14,7 +14,7 @@
 import constant
 import inited_data
 import outside_api_command_manager
-from cancel_strategy.s_l_h_cancel_strategy import SCancelBigNumComputer
+from cancel_strategy.s_l_h_cancel_strategy import SCancelBigNumComputer, LCancelRateManager
 from code_attribute import gpcode_manager, code_volumn_manager, zyltgb_util
 from code_attribute.code_data_util import ZYLTGBUtil
 from code_attribute.code_l1_data_manager import L1DataManager
@@ -36,7 +36,8 @@
     logger_trade, logger_trade_position_api_request, logger_request_api, \
     logger_real_place_order_position, logger_device
 from output import l2_output_util
-from third_data import kpl_util, history_k_data_manager, huaxin_l1_data_manager, third_blocks_manager, kpl_data_manager
+from third_data import kpl_util, history_k_data_manager, huaxin_l1_data_manager, third_blocks_manager, kpl_data_manager, \
+    history_k_data_util
 from third_data.code_plate_key_manager import KPLCodeJXBlockManager, RealTimeKplMarketData
 from third_data.history_k_data_manager import HistoryKDataManager
 from third_data.history_k_data_util import JueJinApi, HistoryKDatasUtils
@@ -45,10 +46,10 @@
 from third_data.kpl_limit_up_data_manager import CodeLimitUpSequenceManager
 from third_data.kpl_util import KPLDataType
 from third_data.third_blocks_manager import CodeThirdBlocksManager, SOURCE_TYPE_KPL, BlockMapManager
-from trade import trade_manager, l2_trade_util, trade_data_manager, trade_constant
+from trade import trade_manager, l2_trade_util, trade_data_manager, trade_constant, trade_record_log_util
 import l2_data_util as l2_data_util_old
 from trade.buy_money_count_setting import BuyMoneyAndCountSetting, RadicalBuyBlockCodeCountManager
-from trade.buy_radical import block_special_codes_manager
+from trade.buy_radical import block_special_codes_manager, radical_buy_data_manager
 
 from trade.huaxin import huaxin_trade_api, huaxin_trade_data_update, \
     huaxin_trade_record_manager, huaxin_trade_order_processor, huaxin_sell_util
@@ -291,6 +292,7 @@
             fresult = {"code": 0}
             if code_list_type == outside_api_command_manager.CODE_LIST_WANT:
                 if operate == outside_api_command_manager.OPERRATE_SET:
+                    trade_record_log_util.add_want_buy(code)
                     gpcode_manager.WantBuyCodesManager().add_code(code)
                     if l2_trade_util.is_in_forbidden_trade_codes(code):
                         l2_trade_util.remove_from_forbidden_trade_codes(code)
@@ -302,6 +304,7 @@
                         if results:
                             gpcode_manager.CodesNameManager.add_first_code_name(code, results[code])
                 elif operate == outside_api_command_manager.OPERRATE_DELETE:
+                    trade_record_log_util.remove_want_buy(code)
                     gpcode_manager.WantBuyCodesManager().remove_code(code)
                 elif operate == outside_api_command_manager.OPERRATE_GET:
                     codes = gpcode_manager.WantBuyCodesManager().list_code_cache()
@@ -374,6 +377,7 @@
             elif code_list_type == outside_api_command_manager.CODE_LIST_MUST_BUY:
                 if operate == outside_api_command_manager.OPERRATE_SET:
                     gpcode_manager.MustBuyCodesManager().add_code(code)
+                    trade_record_log_util.add_must_buy(code, "鎵嬪姩鎷夌孩")
                     name = gpcode_manager.get_code_name(code)
                     if not name:
                         results = HistoryKDatasUtils.get_gp_codes_names([code])
@@ -487,7 +491,8 @@
         try:
             fdata = {}
             try:
-                date = HistoryKDatasUtils.get_trading_dates(tool.date_sub(tool.get_now_date_str(), 10) ,tool.get_now_date_str())
+                date = HistoryKDatasUtils.get_trading_dates(tool.date_sub(tool.get_now_date_str(), 10),
+                                                            tool.get_now_date_str())
                 if date:
                     fdata["juejin"] = 1
             except Exception as e:
@@ -544,21 +549,11 @@
 
             # 鑾峰彇浠婃棩K绾跨殑鏇存柊鏁伴噺
             try:
-                dates = HistoryKDatasUtils.get_latest_trading_date_cache(5)
-                latest_trading_date = None
-                if dates:
-                    latest_trading_date = dates[0]
-                if latest_trading_date is None:
-                    raise Exception("娌℃湁鑾峰彇鍒颁笂涓�涓氦鏄撴棩鐨勬棩鏈�")
-                # 4鐐逛箣鍚庢敼涓鸿幏鍙栦粖鏃ョ殑鏁版嵁
-                if tool.get_now_time_as_int()>160000:
-                    latest_trading_date = tool.get_now_date_str()
+                latest_trading_date = history_k_data_util.get_k_bar_dead_date()
                 codes = HistoryKDataManager().get_history_bars_codes(latest_trading_date)
                 count = len(codes)
-                logger_debug.info(f"K绾夸唬鐮佹暟閲忥細{count}")
                 fdata["today_history_k_bar_count"] = count
             except Exception as e:
-                logger_debug.exception(e)
                 fdata["today_history_k_bar_count"] = -1
 
             # 鑾峰彇鏁版嵁鏈嶅姟鍣ㄦ槸鍚﹁仈閫�
@@ -1067,6 +1062,8 @@
                                             break
                             except:
                                 pass
+                            # L鎾ゆ瘮渚�
+                            l_down_cancel_rate, must_buy = LCancelRateManager.get_cancel_rate(code, buy_mode = OrderBeginPosInfo.MODE_RADICAL)
                             fdata = {"id": orderSysID, "code_info": (code, code_name), "total_num": total_nums,
                                      "finish_num": deal_or_cancel_num,
                                      "buy1_money": output_util.money_desc(buy1_money),
@@ -1089,7 +1086,8 @@
                                      "limit_up_price": gpcode_manager.get_limit_up_price_as_num(code),
                                      "is_near_big_order": is_near_big_order,
                                      "block": '',
-                                     "trade_queue": []
+                                     "trade_queue": [],
+                                     "l_down_cancel_rate":l_down_cancel_rate
                                      }
                             limit_up_data = kpl_data_manager.KPLLimitUpDataRecordManager.record_code_dict.get(code)
                             # 鑾峰彇褰撳墠鏉垮潡
@@ -1354,8 +1352,9 @@
                 data = {
                     "radical_buy": {"price": (constant.MIN_CODE_RADICAL_BUY_PRICE, constant.MAX_CODE_RADICAL_BUY_PRICE),
                                     "zyltgb": constant.RADICAL_BUY_ZYLTGB_AS_YI_RANGES,
-                                    "top_block_count_by_market_strong":constant.RADICAL_BUY_TOP_IN_COUNT_BY_MARKET_STRONG,
-                                    "special_codes_max_block_in_rank": constant.RADICAL_BUY_TOP_IN_INDEX_WITH_SPECIAL
+                                    "top_block_count_by_market_strong": constant.RADICAL_BUY_TOP_IN_COUNT_BY_MARKET_STRONG,
+                                    "special_codes_max_block_in_rank": constant.RADICAL_BUY_TOP_IN_INDEX_WITH_SPECIAL,
+                                    "ignore_block_in_money_market_strong":constant.IGNORE_BLOCK_IN_MONEY_MARKET_STRONG
                                     }}
                 self.send_response({"code": 0, "data": data, "msg": f""},
                                    client_id,
@@ -1368,11 +1367,13 @@
                     constant.MAX_CODE_RADICAL_BUY_PRICE = radical_buy["price"][1]
                     constant.RADICAL_BUY_ZYLTGB_AS_YI_RANGES = radical_buy["zyltgb"]
                     if radical_buy.get("top_block_count_by_market_strong"):
-                        constant.RADICAL_BUY_TOP_IN_COUNT_BY_MARKET_STRONG = radical_buy.get("top_block_count_by_market_strong")
+                        constant.RADICAL_BUY_TOP_IN_COUNT_BY_MARKET_STRONG = radical_buy.get(
+                            "top_block_count_by_market_strong")
                     if radical_buy.get("special_codes_max_block_in_rank"):
                         constant.RADICAL_BUY_TOP_IN_INDEX_WITH_SPECIAL = radical_buy.get(
                             "special_codes_max_block_in_rank")
-
+                    if radical_buy.get('ignore_block_in_money_market_strong') is not None:
+                        constant.IGNORE_BLOCK_IN_MONEY_MARKET_STRONG = radical_buy.get('ignore_block_in_money_market_strong')
                 self.send_response({"code": 0, "data": {}, "msg": f""},
                                    client_id,
                                    request_id)
@@ -1411,7 +1412,7 @@
                     fblocks, before_fblocks = RadicalBuyBlockManager.get_code_blocks(code)
                     # 鑾峰彇鏉垮潡鍘嗗彶娑ㄥ仠
                     for b in fblocks:
-                        codes =  LimitUpDataConstant.get_history_limit_up_block_codes(b)
+                        codes = LimitUpDataConstant.get_history_limit_up_block_codes(b)
                         if codes:
                             if code not in block_codes:
                                 block_codes[code] = {}
@@ -1420,6 +1421,16 @@
                                    client_id,
                                    request_id)
 
+            elif ctype == "test_place_order":
+                # 鑾峰彇鐩稿悓鏉垮潡鐨勬定鍋滀唬鐮佹暟閲�
+                code = data.get("code")
+                # total_datas = l2_data_util.local_today_datas.get(code)
+                # trade_manager.test_order(code, total_datas[-1], total_datas[-1]["index"])
+                # radical_buy_data_manager.pull_pre_deal_big_orders(code)
+                self.send_response({"code": 0, "data": {}},
+                                   client_id,
+                                   request_id)
+
 
 
         except Exception as e:

--
Gitblit v1.8.0