dekun/crypto_monitor
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复趋势回调顺势加仓的交易记录

Browse Source
This commit is contained in:
dekun
2026-05-29 18:39:40 +08:00
parent 7af2717331
commit 81f27765ca
10 changed files with 202 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crypto_monitor_gate_bot/app.py
+16 -7
View File
@@ -54,6 +54,10 @@ from journal_chart_lib import (
trim_rows_for_trade_review,
)
from hub_auth import request_allowed as hub_request_allowed
from strategy_trade_labels import (
STRATEGY_ENTRY_REASON_OPTIONS,
trade_record_monitor_type as resolve_trade_record_monitor_type,
)
from history_window_lib import (
PRESET_CUSTOM,
PRESET_UTC_LAST24H,
@@ -944,6 +948,7 @@ ENTRY_REASON_OPTIONS = (
"趋势空头：小分歧高吸入场（左侧），确认条件：二次探顶",
"波段单：5m顺势突破，确认条件：2根k线+成交量放大+4h同向+日成交量前20",
"趋势回调",
"顺势加仓",
)
# 复盘表单「其他」选项的 value（非入库值；自定义文本走 entry_reason_custom）
ENTRY_REASON_OTHER = "__OTHER__"
@@ -2316,6 +2321,10 @@ def ensure_exchange_live_ready():
return True, ""
def trade_record_monitor_type(conn, row):
return resolve_trade_record_monitor_type(conn, row, default_manual="下单监控")
def exchange_private_api_configured():
"""仅表示已配置密钥；与是否允许下单（LIVE_TRADING_ENABLED）无关，用于只读拉仓等。"""
return bool(GATE_API_KEY and GATE_API_SECRET)
@@ -4005,7 +4014,7 @@ def reconcile_external_closes(conn, days=None):
insert_trade_record(
conn,
symbol=r["symbol"],
monitor_type="下单监控",
monitor_type=trade_record_monitor_type(conn, r),
direction=r["direction"],
trigger_price=r["trigger_price"],
stop_loss=r["stop_loss"],
@@ -4940,7 +4949,7 @@ def check_order_monitors():
insert_trade_record(
conn,
symbol=sym,
monitor_type="下单监控",
monitor_type=trade_record_monitor_type(conn, r),
direction=direction,
trigger_price=trigger_price,
stop_loss=stop_loss,
@@ -4998,7 +5007,7 @@ def check_order_monitors():
insert_trade_record(
conn,
symbol=sym,
monitor_type="下单监控",
monitor_type=trade_record_monitor_type(conn, r),
direction=direction,
trigger_price=trigger_price,
stop_loss=stop_loss,
@@ -5066,7 +5075,7 @@ def check_order_monitors():
insert_trade_record(
conn,
symbol=sym,
monitor_type="下单监控",
monitor_type=trade_record_monitor_type(conn, r),
direction=direction,
trigger_price=trigger_price,
stop_loss=stop_loss,
@@ -5131,7 +5140,7 @@ def force_close_before_reset():
insert_trade_record(
conn,
symbol=r["symbol"],
monitor_type="下单监控",
monitor_type=trade_record_monitor_type(conn, r),
direction=direction,
trigger_price=trigger_price,
stop_loss=r["stop_loss"],
@@ -6822,7 +6831,7 @@ def del_order(id):
insert_trade_record(
conn,
symbol=row["symbol"],
monitor_type="下单监控",
monitor_type=trade_record_monitor_type(conn, row),
direction=row["direction"],
trigger_price=row["trigger_price"],
stop_loss=row["stop_loss"],
@@ -6876,7 +6885,7 @@ def del_order(id):
insert_trade_record(
conn,
symbol=row["symbol"],
monitor_type="下单监控",
monitor_type=trade_record_monitor_type(conn, row),
direction=row["direction"],
trigger_price=row["trigger_price"],
stop_loss=row["stop_loss"],
crypto_monitor_gate_bot/templates/index.html
+2
View File
@@ -1224,6 +1224,8 @@ function fillJournalFromTrade(t){
syncJournalEntryReasonOtherUi();
if(String(t.monitor_type || "").trim() === "趋势回调" && JOURNAL_ENTRY_REASON_OPTIONS.includes("趋势回调")){
setJournalField("entry_reason", "趋势回调");
} else if(String(t.monitor_type || "").trim() === "顺势加仓" && JOURNAL_ENTRY_REASON_OPTIONS.includes("顺势加仓")){
setJournalField("entry_reason", "顺势加仓");
syncJournalEntryReasonOtherUi();
}
const er = String(t.result || "").trim();