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

---
 constant.py |  115 +++++++++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 99 insertions(+), 16 deletions(-)

diff --git a/constant.py b/constant.py
index c4206af..e4f4ba9 100644
--- a/constant.py
+++ b/constant.py
@@ -3,6 +3,9 @@
 
 from huaxin_client import constant
 
+# 鎵�鏈夌殑绁ㄧН鏋佷拱
+ALL_ACTIVE_BUY = False
+
 TEST = False
 # 鏄惁鍏佽浜ゆ槗
 TRADE_ENABLE = True
@@ -28,7 +31,7 @@
     "db": 0,
     "pwd": "Yeshi2016@"
 } if is_windows() else {
-    "host": "172.16.32.15",
+    "host": "127.0.0.1",
     "port": 6379,
     "db": 0,
     "pwd": "Yeshi2016@"
@@ -69,19 +72,29 @@
 
 CACHE_PATH = f"{'D:' if is_windows() else '/home/userzjj'}/trade_cache"
 
-# S鎾ゆ瘮渚�
-S_CANCEL_MIN_MONEY = 98
-S_CANCEL_SECOND_RATE = 0.59
-S_CANCEL_THIRD_RATE = 0.49
-# s鎾ゅ畧鎶ゆ椂闂�
-S_CANCEL_EXPIRE_TIME = 1
+# S鎾�
+S_FAST_RATE = 0.25  # S蹇牳
+S_FAST_RATE_WITH_MUST_BUY = 0.69  # S蹇牳鍔犵孩
+
+S_FAST_BIG_RATE = 0.3  # S鐚涚牳
+S_FAST_BIG_RATE_WITH_MUST_BUY = 0.6  # S鐚涚牳鍔犵孩
+
+S_SLOW_RATE = 0.49  # S鎱㈢牳
+S_SLOW_RATE_WITH_MUST_BUY = 0.79  # S鎱㈢牳鍔犵孩
 
 # H鎾ゆ瘮渚�
-H_CANCEL_RATE = 0.80
+H_CANCEL_RATE = 0.80  # H鎾ゆ瘮渚�
+H_CANCEL_RATE_WITH_MUST_BUY = 0.95  # 鍔犵孩H鎾ゆ瘮渚�
+# L鎾ゆ棤娉曠敓鏁堢殑鎾ゅ崟姣斾緥
+H_CANCEL_RATE_WITH_LDOWN_CANT_INVALID = 0.69
 H_CANCEL_MIN_MONEY = 98
 H_CANCEL_MIN_COUNT = 40
 H_CANCEL_MIN_BIG_NUM_COUNT = 3
 H_CANCEL_START_TIME = 900
+
+# J鎾ゅ崟
+J_CANCEL_RATE = 0.5
+J_CANCEL_RATE_WITH_MUST_BUY = 0.9
 
 # L2鐩戞帶鐨勬渶浣庨噾棰�
 L2_MIN_MONEY = 500000
@@ -95,8 +108,9 @@
 BUY_SCORE_RANK_3 = 260
 
 # 寮�鐩樺暒
-KPL_INVALID_BLOCKS = {"涓�瀛ｆ姤澧為暱", "浜屽鎶ュ闀�", "涓夊鎶ュ闀�", "鍥涘鎶ュ闀�", "涓氱哗澧為暱", "涓姤澧為暱", "骞存姤澧為暱", "骞存姤棰勫", "鏃�", "娆℃柊鑲�", "ST鎽樺附", "瓒呰穼",
-                      "鑲℃潈杞", "骞惰喘閲嶇粍", "鍐嶈瀺璧�", "骞存姤棰勫", " 涓撶簿鐗规柊", "澹宠祫婧�", "琛屼笟榫欏ご", "鍙傝偂閲戣瀺", "绉戝垱鏉�", "瀹炴帶浜哄彉鏇�"}
+KPL_INVALID_BLOCKS = {"涓�瀛ｆ姤澧為暱", "浜屽鎶ュ闀�", "涓夊鎶ュ闀�", "鍥涘鎶ュ闀�", "涓氱哗澧為暱", "涓姤澧為暱", "骞存姤澧為暱", "骞存姤棰勫", "鏃�", "娆℃柊鑲�", "ST鎽樺附", "ST鏉垮潡",
+                      "瓒呰穼",
+                      "鑲℃潈杞", "骞惰喘閲嶇粍", "鍐嶈瀺璧�", "骞存姤棰勫", " 涓撶簿鐗规柊", "澹宠祫婧�", "琛屼笟榫欏ご", "绉戝垱鏉�", "瀹炴帶浜哄彉鏇�"}
 # 鏄惁寮�鍚疉PI浜ゆ槗
 API_TRADE_ENABLE = True
 # 姣忓彧绁ㄤ拱鐨勯噾棰�
@@ -115,23 +129,47 @@
 # L鎾や笅鍗曚箣鍚庡涔呭紑濮嬪畧鎶�
 L_CANCEL_START_TIME = -1
 
+# L鍓嶇殑瀹堟姢鏃堕棿
+L_CANCEL_UP_EXPIRE_TIME = 3 * 60
+
 L_CANCEL_MIN_WATCH_COUNT = 10
 # 鎾ゅ崟姣斾緥
-L_CANCEL_RATE = 0.6
+L_CANCEL_RATE = 0.6  # L鍚�
+
+L_CANCEL_RATE_WITH_MUST_BUY = 0.9  # 鍔犵孩L鍚�
+
+L_CANCEL_RATE_WITH_MUST_BUY_FOR_REDICAL_BUY = 0.95  # 鎵叆鍔犵孩
+
+L_CANCEL_RATE_WITH_HALF_MUST_BUY_FOR_REDICAL_BUY = 0.85  # 鎵叆鍗婂姞绾�
+
 # L涓婃挙鍗曟瘮渚�
-L_CANCEL_RATE_UP = 0.7
+L_CANCEL_RATE_UP = 0.79  # L鍓�
+
+L_CANCEL_RATE_UP_SH = 0.69  # 涓婅瘉L鍓�
+
+L_CANCEL_RATE_UP_WITH_MUST_BUY = 0.95  # 鍔犵孩L鍓�
+
 # 澶ч噾棰�
 L_CANCEL_BIG_MONEY = 100
 # 灏忛噾棰�
 L_CANCEL_MIN_MONEY = 50
+# L鍚庣洃鍚揩閫熸垚浜ゆ挙鍗曟瘮渚�
+L_CANCEL_FAST_DEAL_RATE = 0.59
+# L鍚庣洃鍚揩閫熸垚浜ら噾棰�
+L_CANCEL_FAST_DEAL_MIN_MONEY = 99 * 10000
 
 # F鎾�
 F_CANCEL_WATCH_COUNT = 5
 
 F_CANCEL_CACEL_RATE = 0.69
 
+# G鎾ゅ崟
+G_CANCEL_RATE = 0.79
+# G鎾ゅ姞绾�
+G_CANCEL_RATE_WITH_MUST_BUY = 0.9
 
-
+# 琛屾儏濂芥椂鐨勬挙鍗曟瘮渚�
+G_CANCEL_RATE_FOR_GOOD_MARKET = 0.59
 
 # 鍗庨懌L2鐨勫崱浣嶆暟閲�
 HUAXIN_L2_MAX_CODES_COUNT = 40
@@ -148,12 +186,57 @@
 ########鍗庨懌閰嶇疆########
 if not is_windows() or True:
     # 涓嬪崟1鎵�
-    BUY_MONEY_PER_CODE = 500 if constant.IS_A else 5000
+    BUY_MONEY_PER_CODE = 500 if constant.IS_A else 40000
     L2_SOURCE_TYPE = L2_SOURCE_TYPE_HUAXIN
     JUEJIN_LOCAL_API = False
     TRADE_WAY = TRADE_WAY_HUAXIN
     TRADE_ENABLE = True
 
 # 鏈�澶х殑浠ｇ爜浠锋牸
-MAX_CODE_PRICE = 25
-MAX_SUBSCRIPT_CODE_PRICE = 40
\ No newline at end of file
+MAX_CODE_PRICE = 100
+MIN_CODE_PRICE = 2
+MAX_SUBSCRIPT_CODE_PRICE = 100
+
+# 鎵叆浠锋牸鍖洪棿
+MAX_CODE_RADICAL_BUY_PRICE = 50
+MIN_CODE_RADICAL_BUY_PRICE = 2
+
+# 鎵叆鐨勮嚜鐢辨祦閫氬競鍊煎尯闂达細[[(鑷敱娴侀�氭渶灏忓��,鑷敱娴侀�氭渶澶у��),(鑲′环鏈�灏忓��,鑲′环鏈�澶у��)]]
+RADICAL_BUY_ZYLTGB_AS_YI_RANGES = [[(30, 1000), (3, 50)], [(30, 1000), (2, 3)]]
+
+# L2鏁版嵁鏄惁杞藉叆瀹屾垚
+L2_DATA_IS_LOADED = False
+
+# 鍙拱鍏ョ殑閲戦
+AVAILABLE_BUY_MONEYS = [5000, 20000, 40000, 45000, 50000, 55000, 60000, 65000, 70000]
+
+# 鏉夸笂鏀鹃噺鏄惁鍙壂鍏�
+CAN_RADICAL_BUY_AT_LIMIT_UP = False
+
+# 姣忔鎵叆鏄惁閮介渶瑕佸ぇ鍗�
+CAN_RADICAL_BUY_NEED_BIG_ORDER_EVERYTIME = True
+
+# 甯歌涔版槸鍚︿拱鍏�
+CAN_COMMON_BUY = False
+
+# 鏍规嵁甯傚満寮哄害纭畾涔板噣娴佸叆韬綅鍓嶅嚑:[(鏈�浣庡垎,鏈�楂樺垎,涔板墠鍑�)]
+RADICAL_BUY_TOP_IN_COUNT_BY_MARKET_STRONG = [(0, 60, 20), (60, 70, 25), (70, 80, 30), (80, 90, 35), (90, 101, 40)]
+# 杈ㄨ瘑搴︾殑绁ㄦ澘鍧楁渶浣庢祦鍏ュ墠鍑�
+RADICAL_BUY_TOP_IN_INDEX_WITH_SPECIAL = 20
+
+# 鏄惁涓烘柊鐗堜笅鍗�
+IS_NEW_VERSION_PLACE_ORDER = True
+
+# 蹇界暐鏉垮潡娴佸叆鐨勫競鍦哄己搴�
+IGNORE_BLOCK_IN_MONEY_MARKET_STRONG = 101
+
+# 鏂扮増L2鐩戝惉
+IS_L2_NEW = False
+
+# 鏄惁鍙拱棣栧皝
+CAN_BUY_FIRST_LIMIT_UP = False
+
+# 鏄惁鍙互鑷姩鎷夌櫧
+CAN_AUTO_ADD_WHITE = True
+
+

--
Gitblit v1.8.0