From 2f00a0565dcf8d652b8bb5c4caefbce1c2c92d62 Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期一, 23 六月 2025 09:58:15 +0800
Subject: [PATCH] bug修复/策略完善
---
strategy/strategy_script_v6.py | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/strategy/strategy_script_v6.py b/strategy/strategy_script_v6.py
index 48bbf79..a6ca9de 100644
--- a/strategy/strategy_script_v6.py
+++ b/strategy/strategy_script_v6.py
@@ -15,7 +15,7 @@
return f"{huaxin_timestamp[0:2]}:{huaxin_timestamp[2: 4]}:{huaxin_timestamp[4: 6]}"
-def can_buy():
+def __can_buy():
"""
@return: 鏄惁鍙拱, 涓嶈兘涔扮殑鍘熷洜/鍙拱鐨勬澘鍧�, 鏄惁閲忓
"""
@@ -81,6 +81,8 @@
if sv.浠婃棩寮�鐩樹环 and (sv.浠婃棩寮�鐩樹环 - sv.鏄ㄦ棩鏀剁洏浠�) / sv.鏄ㄦ棩鏀剁洏浠� < settings.min_open_rate:
return False, f"寮�鐩樻定骞呭皬浜巤settings.min_open_rate}"
+
+
rate = (sv.褰撳墠浠� - sv.鏄ㄦ棩鏀剁洏浠�) / sv.鏄ㄦ棩鏀剁洏浠�
if rate >= settings.avaiable_rates[1] or rate < settings.avaiable_rates[0]:
return False, f"娑ㄥ箙涓嶅湪鍖洪棿鍐咃紙{settings.avaiable_rates[0]}-{settings.avaiable_rates[1]}锛�:{rate}"
@@ -95,7 +97,10 @@
return False, f"10涓氦鏄撴棩鏈�>=3杩炴澘"
if sv.娑ㄥ緱楂樻湭鏀鹃噺:
- return False, f"娑ㄥ緱楂樻湭鏀鹃噺"
+ return False, f"30涓氦鏄撴棩娑ㄥ緱楂樻湭鏀鹃噺"
+
+ if sv.娑ㄥ仠杩囨湭鏀鹃噺:
+ return False, f"7涓氦鏄撴棩鍐呮湁娑ㄥ仠/鐐告澘锛屾湭鍑虹幇杩囬珮浠�"
# if sv.褰撳墠浠� > sv.鏄ㄦ棩鏈�浣庝环 * 1.1:
# return False, f"涔板叆鏃剁殑浠锋牸蹇呴』鈮ゆ槰鏃ユ渶浣庝环*110%"
@@ -117,9 +122,9 @@
# 鐩爣绁ㄦ澘鍧楁定鍋滀釜鏁�>=2
- # 鏉垮潡鍙兘涔板叆涓�涓唬鐮�
+ # 鏉垮潡鍙兘涔板叆2涓唬鐮�
if sv.鏉垮潡鎴愪氦浠ｇ爜:
- can_buy_plates -= set(sv.鏉垮潡鎴愪氦浠ｇ爜.keys())
+ can_buy_plates -= set([p for p in sv.鏉垮潡鎴愪氦浠ｇ爜 if len(sv.鏉垮潡鎴愪氦浠ｇ爜[p]) >= settings.max_buy_codes_count_per_plate])
if not can_buy_plates:
return False, f"娌℃湁娑ㄥ仠鐨勬澘鍧�: {[(plate, sv.寮�鐩樺暒鏈�姝ｆ澘鍧楁定鍋�.get(plate)) for plate in sv.浠ｇ爜鏉垮潡 if sv.寮�鐩樺暒鏈�姝ｆ澘鍧楁定鍋淽} 杩炵画鑰侀鏉愶細{sv.杩炵画鑰侀鏉恾"
@@ -167,5 +172,4 @@
return True, f" \n\t澶у崟淇℃伅锛歿round(big_order_money / 1e4, 2)}涓囷紙涔帮細{round(big_order_money / 1e4, 2)}涓� 鍗栵細{round(big_sell_order_money / 1e4, 2)}涓囷級/{round(threshold_money / 1e4, 2)}涓� \n\t閲忓淇℃伅锛歿sv.浠婃棩閲忓淇℃伅}\n\t浠婃棩鏈�楂樹环:{sv.浠婃棩鏈�楂樹环淇℃伅} \n\t5鏃ユ渶楂樹环锛歿sv.鏃ユ渶楂樹环_5}", f"\n\t鏉垮潡淇℃伅锛歿[(p, sv.寮�鐩樺暒鏈�姝ｆ澘鍧楁定鍋�.get(p)) for p in can_buy_plates]}", can_buy_plates
-
-compute_result = can_buy()
+compute_result = __can_buy()
--
Gitblit v1.8.0