fix: show risk amount only in full-margin mode across four exchanges

Co-authored-by: Cursor <cursoragent@cursor.com>

crypto_monitor_okx/app.py

@@ -87,11 +87,13 @@ from position_sizing_lib import (
     OPEN_SOURCE_MANUAL,
     assert_open_source_allowed,
     compute_full_margin_sizing,
+    format_risk_display_text,
     full_margin_requires_flat_position,
     is_full_margin_mode,
     leverage_for_full_margin,
     load_position_sizing_mode,
     mode_label_zh,
+    risk_percent_for_storage,
 )
 from key_monitor_full_margin_lib import (
     monitor_type_disallowed_in_full_margin,
@@ -6757,6 +6759,10 @@ def add_order():
     breakeven_offset_pct = float(BREAKEVEN_OFFSET_PCT)
     breakeven_step_r = float(BREAKEVEN_STEP_R) if float(BREAKEVEN_STEP_R) > 0 else 1.0
     risk_amount_final = calc_risk_amount_from_plan(direction, trigger_price, stop_loss, margin_capital, leverage) or risk_amount
+    risk_percent_db = risk_percent_for_storage(POSITION_SIZING_MODE, risk_percent)
+    risk_display = format_risk_display_text(
+        POSITION_SIZING_MODE, risk_percent, risk_amount_final, decimals=FUNDS_DECIMALS
+    )
     if direction == "short":
         breakeven_price = round(float(trigger_price) * (1 - breakeven_offset_pct / 100.0), 8)
     else:
@@ -6766,7 +6772,7 @@ def add_order():
         "INSERT INTO order_monitors (symbol, exchange_symbol, direction, trigger_price, stop_loss, initial_stop_loss, take_profit, margin_capital, leverage, trade_style, risk_percent, risk_amount, breakeven_rr_trigger, breakeven_offset_pct, breakeven_step_r, breakeven_armed, breakeven_price, breakeven_enabled, notional_value, position_ratio, base_amount, order_amount, exchange_order_id, opened_at, opened_at_ms, session_date, monitor_type) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)",
         (
             symbol, exchange_symbol, direction, trigger_price, stop_loss, stop_loss, take_profit,
-            margin_capital, leverage, trade_style, risk_percent, risk_amount_final, breakeven_rr_trigger, breakeven_offset_pct, breakeven_step_r, 0, breakeven_price,
+            margin_capital, leverage, trade_style, risk_percent_db, risk_amount_final, breakeven_rr_trigger, breakeven_offset_pct, breakeven_step_r, 0, breakeven_price,
             breakeven_enabled,
             notional_value, position_ratio, base_amount, amount, open_order_id, opened_at_bj, opened_at_ms, trading_day, "下单监控",
         )
@@ -6880,7 +6886,7 @@ def add_order():
         "🧾 订单基础信息",
         f"🔖 交易所订单 ID：{open_order_id}",
         f"📈 交易风格：{style_zh}",
-        f"⚠️ 单笔风控风险：{risk_percent}% ≈ {round(float(risk_amount_final), 2)} U",
+        f"⚠️ 单笔风控风险：{risk_display}",
         "📊 仓位配置详情",
         f"账户基数：{account_base_display} USDT",
         f"合约杠杆：{leverage} 倍",
@@ -6903,7 +6909,7 @@ def add_order():
     send_wechat_msg("\n".join(wx_lines))
 
     flash_lines = [
-        f"实盘开单成功：风格 {trade_style}；风险 {risk_percent}%≈{round(float(risk_amount_final), 2)}U；基数 {round(float(margin_capital), 2)}U，杠杆 {leverage}x，名义仓位 {format_wechat_scalar_2dp(notional_value)}U，仓位占比 {position_ratio}%，合约张数 {format_wechat_scalar_2dp(amount)}（折算标的 {base_amount}），"
+        f"实盘开单成功：风格 {trade_style}；风险 {risk_display}；基数 {round(float(margin_capital), 2)}U，杠杆 {leverage}x，名义仓位 {format_wechat_scalar_2dp(notional_value)}U，仓位占比 {position_ratio}%，合约张数 {format_wechat_scalar_2dp(amount)}（折算标的 {base_amount}），"
         f"计划RR {format_wechat_scalar_2dp(planned_rr) if planned_rr is not None else '-'}；已在交易所挂条件止盈/止损委托（非仓位绑定型）",
         f"本交易日累计开仓：{opens_today_after}",
     ]

crypto_monitor_okx/templates/index.html

@@ -530,7 +530,7 @@
                     <div class="pos-meta">
                         <span class="pos-meta-item">来源: {{ o.monitor_type|default('下单监控', true) }}{% if o.key_signal_type %} · {{ o.key_signal_type }}{% endif %}</span>
                         <span class="pos-meta-item">风格: {{ o.trade_style or 'trend' }}</span>
-                        <span class="pos-meta-item">风险: {{ o.risk_percent or '-' }}%≈{{ funds_fmt(o.risk_amount) if o.risk_amount is not none else '-' }}U</span>
+                        <span class="pos-meta-item">风险: {% if position_sizing_mode == 'full_margin' %}{{ funds_fmt(o.risk_amount) if o.risk_amount is not none else '-' }}U{% else %}{{ o.risk_percent or '-' }}%≈{{ funds_fmt(o.risk_amount) if o.risk_amount is not none else '-' }}U{% endif %}</span>
                         <span class="pos-meta-item {% if o.breakeven_enabled %}pos-meta-on{% else %}pos-meta-off{% endif %}">
                             {% if o.breakeven_enabled %}移动保本:开 {{ o.breakeven_rr_trigger or '-' }}R→{{ price_fmt(o.symbol, o.breakeven_price) }}{% else %}移动保本:关{% endif %}
                         </span>