From 32203dcb2d06b93e4b6c81f9121b00531a91395e Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期五, 06 六月 2025 18:43:07 +0800
Subject: [PATCH] bug修复

---
 strategy/低吸脚本_辨识度.py |   25 ++++++++++++-------------
 1 files changed, 12 insertions(+), 13 deletions(-)

diff --git "a/strategy/\344\275\216\345\220\270\350\204\232\346\234\254_\350\276\250\350\257\206\345\272\246.py" "b/strategy/\344\275\216\345\220\270\350\204\232\346\234\254_\350\276\250\350\257\206\345\272\246.py"
index de79391..e3b9109 100644
--- "a/strategy/\344\275\216\345\220\270\350\204\232\346\234\254_\350\276\250\350\257\206\345\272\246.py"
+++ "b/strategy/\344\275\216\345\220\270\350\204\232\346\234\254_\350\276\250\350\257\206\345\272\246.py"
@@ -30,6 +30,10 @@
 
     big_order_count = 0
     if sv.浠婃棩澶у崟鏁版嵁:
+        # 10涓氦鏄撴棩鍐呮湁鐐告澘鎴栨定鍋滃氨鐪�5涓氦鏄撴棩
+        # if sv.娑ㄥ仠鏁癬10 > 0 or sv.鐐告澘鏁癬10 > 0:
+        #     big_order_count = len(set([o[0] for o in sv.浠婃棩澶у崟鏁版嵁 if sv.鏃ユ渶楂樹环_5 <= o[4] < sv.鏄ㄦ棩鏀剁洏浠� * 1.06]))
+        # else:
         big_order_count = len(set([o[0] for o in sv.浠婃棩澶у崟鏁版嵁 if sv.鏃ユ渶楂樹环_10 <= o[4] < sv.鏄ㄦ棩鏀剁洏浠� * 1.06]))
     if big_order_count < 1:  # max(1, int(round(sv.鏄ㄦ棩鎴愪氦棰� * 0.33 / 1e8))):
         return False, f"({big_order_count})灏戜簬1涓ぇ鍗�"
@@ -39,19 +43,13 @@
     can_buy_blocks = set([k for k in sv.浠g爜鏉垮潡 if sv.鏉垮潡娑ㄥ仠 and k in sv.鏉垮潡娑ㄥ仠 and len(sv.鏉垮潡娑ㄥ仠[k]) >= 1])
     if not can_buy_blocks:
         return False, "鏉垮潡灏戜簬1涓定鍋�"
-
     # 鏄惁杩樻湁鍙拱鐨勬澘鍧�
-    # can_buy_blocks = sv.浠g爜鏉垮潡 - sv.鏉垮潡鎴愪氦浠g爜.keys()
-    # if not can_buy_blocks:
-    #     return False, "娌℃湁鍙拱鐨勪唬鐮�"
+    can_buy_blocks = sv.浠g爜鏉垮潡 - sv.鏉垮潡鎴愪氦浠g爜.keys()
+    if not can_buy_blocks:
+        return False, "鏉垮潡宸叉湁鎴愪氦浠g爜"
     tr = 0.06 if target_code.find("30") != 0 else 0.12
     if (sv.浠婃棩澶у崟鏁版嵁[-1][4] - sv.鏄ㄦ棩鏀剁洏浠�) / sv.鏄ㄦ棩鏀剁洏浠� >= tr:
         return False, "娑ㄥ箙杩囬珮"
-
-    # tr = 1
-    # if sv.浠婃棩澶у崟鏁版嵁 and sv.浠婃棩澶у崟鏁版嵁[-1][4] >= sv.鏃ユ渶楂樹环_10 * 1.008 and (sv.浠婃棩澶у崟鏁版嵁[-1][4] - sv.鏄ㄦ棩鏀剁洏浠�) / sv.鏄ㄦ棩鏀剁洏浠� < tr:
-    #     return True, can_buy_blocks, ([(p, sv.鏉垮潡娑ㄥ仠.get(p)) for p in can_buy_blocks], f"澶у崟鏁伴噺锛歿big_order_count}", f"涔板叆浠凤細{sv.浠婃棩澶у崟鏁版嵁[-1][4]}")
-    # else:
     buy_money = 0
     sell_money = 0
     order_ids = set()
@@ -77,11 +75,12 @@
         # print(target_code, "鍗栧崟澶氫簬涔板崟: ", sv.浠婃棩鍗栧ぇ鍗曟暟鎹�)
         return False, "鍗栧崟澶氫簬涔板崟"
 
-    if (sv.浠婃棩澶у崟鏁版嵁[-1][4] - sv.浠婃棩澶у崟鍧囦环)/sv.鏄ㄦ棩鏀剁洏浠� > 0.03:
-        return False, "楂樹簬澶у崟鍧囦环3涓偣"
+    if (sv.浠婃棩澶у崟鏁版嵁[-1][4] - sv.浠婃棩澶у崟鍧囦环) / sv.鏄ㄦ棩鏀剁洏浠� > 0.03:
+        return False, f"楂樹簬澶у崟鍧囦环({sv.浠婃棩澶у崟鍧囦环})3涓偣"
 
-    return True, can_buy_blocks, (f"澶у崟鏁伴噺锛歿big_order_count}", f"涔板叆浠凤細{sv.浠婃棩澶у崟鏁版嵁[-1][4]}锛屾定骞咃細{round((sv.浠婃棩澶у崟鏁版嵁[-1][4] - sv.鏄ㄦ棩鏀剁洏浠�)*100 / sv.鏄ㄦ棩鏀剁洏浠�, 2)}%",
-        sv.浠婃棩澶у崟鏁版嵁[-1], [(p, sv.鏉垮潡娑ㄥ仠.get(p)) for p in can_buy_blocks])
+    return True, can_buy_blocks, (
+    f"澶у崟鏁伴噺锛歿big_order_count}", f"涔板叆浠凤細{sv.浠婃棩澶у崟鏁版嵁[-1][4]}锛屾定骞咃細{round((sv.浠婃棩澶у崟鏁版嵁[-1][4] - sv.鏄ㄦ棩鏀剁洏浠�) * 100 / sv.鏄ㄦ棩鏀剁洏浠�, 2)}%",
+    sv.浠婃棩澶у崟鏁版嵁[-1], [(p, sv.鏉垮潡娑ㄥ仠.get(p)) for p in can_buy_blocks])
 
 
 compute_result = can_buy()

--
Gitblit v1.8.0