From 4606c0c03f6417bf2fda4953f795eabdf2b8e679 Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期二, 15 七月 2025 18:29:02 +0800
Subject: [PATCH] 人为设置累计大单阈值时，如果不够移红/没加红的撤单率以人为的撤单率为准
---
api/outside_api_command_callback.py | 52 +++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 45 insertions(+), 7 deletions(-)
diff --git a/api/outside_api_command_callback.py b/api/outside_api_command_callback.py
index 5eaa25a..6c171fe 100644
--- a/api/outside_api_command_callback.py
+++ b/api/outside_api_command_callback.py
@@ -14,7 +14,8 @@
import constant
import inited_data
import outside_api_command_manager
-from cancel_strategy.s_l_h_cancel_strategy import SCancelBigNumComputer, LCancelRateManager
+from cancel_strategy.s_l_h_cancel_strategy import SCancelBigNumComputer, LCancelRateManager, \
+ CancelRateHumanSettingManager
from code_attribute import gpcode_manager, code_volumn_manager, zyltgb_util, code_nature_analyse
from code_attribute.code_data_util import ZYLTGBUtil
from code_attribute.code_l1_data_manager import L1DataManager
@@ -399,7 +400,13 @@
elif code_list_type == outside_api_command_manager.CODE_LIST_GREEN:
if operate == outside_api_command_manager.OPERRATE_SET:
gpcode_manager.GreenListCodeManager().add_code(code)
+ trade_record_log_util.add_green(code, "浜轰负鍔犵豢")
+
gpcode_manager.WantBuyCodesManager().add_code(code)
+ # 鍔犵櫧
+ gpcode_manager.WhiteListCodeManager().add_code(code, is_human=True)
+ trade_record_log_util.add_white_buy(code, "鍔犵豢鍔犵櫧")
+
name = gpcode_manager.get_code_name(code)
if not name:
results = HistoryKDatasUtils.get_gp_codes_names([code])
@@ -407,7 +414,7 @@
gpcode_manager.CodesNameManager.add_first_code_name(code, results[code])
elif operate == outside_api_command_manager.OPERRATE_DELETE:
gpcode_manager.GreenListCodeManager().remove_code(code)
- gpcode_manager.WantBuyCodesManager().remove_code(code)
+ gpcode_manager.WhiteListCodeManager().remove_code(code)
elif operate == outside_api_command_manager.OPERRATE_GET:
codes = gpcode_manager.GreenListCodeManager().list_codes_cache()
datas = []
@@ -1067,8 +1074,8 @@
except:
pass
# L鎾ゆ瘮渚�
- l_down_cancel_rate, must_buy = LCancelRateManager.get_cancel_rate(code,
- buy_mode=OrderBeginPosInfo.MODE_RADICAL)
+ l_down_cancel_rate, must_buy, cancel_rate_info = LCancelRateManager.get_cancel_rate(code,
+ buy_mode=OrderBeginPosInfo.MODE_RADICAL)
# 鍦ㄦ寕鐨勮窛绂绘垚浜よ繘搴︿綅閲戦/锛堣繙杩戞湡鍙傝�冮噺-鍗曞綋鏃ュ疄鏃舵垚浜ら噺锛�*100%
expire_rate = "鏈煡"
@@ -1080,8 +1087,8 @@
expire_rate = "100%"
else:
expire_rate = f"{100 - round(100 * total_left_num * 100 / (referer_volume - today_volumn), 2)}%"
- except:
- pass
+ except Exception as e:
+ logger_debug.exception(e)
fdata = {"id": orderSysID, "code_info": (code, code_name), "total_num": total_nums,
"finish_num": deal_or_cancel_num,
@@ -1107,6 +1114,7 @@
"block": '',
"trade_queue": [],
"l_down_cancel_rate": l_down_cancel_rate,
+ "l_down_cancel_rate_info": cancel_rate_info,
"expire_rate": expire_rate
}
limit_up_data = kpl_data_manager.KPLLimitUpDataRecordManager.record_code_dict.get(code)
@@ -1479,6 +1487,14 @@
client_id,
request_id)
+ elif ctype == "test_cancel_order":
+ # 鑾峰彇鐩稿悓鏉垮潡鐨勬定鍋滀唬鐮佹暟閲�
+ code = data.get("code")
+ trade_manager.start_cancel_buy(code, force=True)
+ self.send_response({"code": 0, "data": {}},
+ client_id,
+ request_id)
+
elif ctype == "set_total_deal_big_order_threshold_money":
code = data.get("code")
money = data.get("money")
@@ -1487,10 +1503,32 @@
client_id,
request_id)
return
- TotalDealBigOrderThresholdMoneyManager().set_money(code, int(money))
+ TotalDealBigOrderThresholdMoneyManager().set_money(code, int(money), trade_manager.CodesTradeStateManager().get_trade_state_cache(code))
+
+ # 濡傛灉鏄姞绾㈢姸鎬侊紝涓斿ぇ鍗曚笉澶熷氨闇�瑕佺Щ绾�
+ if gpcode_manager.MustBuyCodesManager().is_in_cache(code):
+ deal_big_order_info = radical_buy_data_manager.get_total_deal_big_order_info(code, gpcode_manager.get_limit_up_price_as_num(code))
+ if deal_big_order_info[0] > 0:
+ gpcode_manager.MustBuyCodesManager().remove_code(code)
+ trade_record_log_util.add_common_msg(code, "绉荤孩", f"澶у崟闃堝�间慨鏀癸紙{money}锛�")
self.send_response({"code": 0, "data": {}},
client_id,
request_id)
+ elif ctype == "set_l_down_rate":
+ # 璁剧疆L鍚庢挙鍗曟瘮渚�
+ code = data.get("code")
+ rate = data.get("rate")
+ if rate < 0 or rate > 1:
+ self.send_response({"code": 1, "msg": "姣斾緥鑼冨洿涓嶅湪0-1涔嬮棿"},
+ client_id,
+ request_id)
+ return
+ rate = round(rate, 2)
+ CancelRateHumanSettingManager().set_l_down(code, rate)
+ self.send_response({"code": 0, "data": {}},
+ client_id,
+ request_id)
+
except Exception as e:
logging.exception(e)
logger_debug.exception(e)
--
Gitblit v1.8.0