修复滚仓

strategy_register.py

@@ -66,7 +66,12 @@ def register_strategy_trading(app: Flask, cfg: dict[str, Any]) -> None:
     @app.route("/strategy/roll/execute", methods=["POST"])
     def strategy_roll_execute():
         data = request.form
-        ok, msg = _roll_execute(cfg, data)
+        try:
+            ok, msg = _roll_execute(cfg, data)
+        except Exception as e:
+            fe = cfg.get("friendly_error")
+            msg = fe(e) if callable(fe) else str(e)
+            ok = False
         flash(msg)
         return redirect(url_for("strategy_trading_page"))
 
@@ -170,31 +175,35 @@ def _roll_preview_response(cfg: dict, data: dict, json_mode: bool = False) -> di
 
 
 def _roll_execute(cfg: dict, data: dict) -> tuple[bool, str]:
-    ok_live, reason = cfg["ensure_live_ready"]()
-    if not ok_live:
-        return False, reason or "实盘未就绪"
-    prev = _roll_preview_response(cfg, data)
-    if not prev.get("ok"):
-        return False, prev.get("msg") or "预览失败"
-    preview = prev["preview"]
-    symbol = cfg["normalize_symbol_input"](data.get("symbol") or "")
-    direction = preview["direction"]
-    ex_sym = cfg["normalize_exchange_symbol"](symbol)
-    add_mode = preview["add_mode"]
-    amount = cfg["amount_to_precision"](ex_sym, float(preview["add_amount_raw"]))
-    if amount is None or amount <= 0:
-        return False, "加仓张数低于交易所最小精度"
-    leverage = int(data.get("leverage") or 0) or int(cfg.get("default_leverage", lambda s: 5)(symbol))
-    conn = get_db()
-    init_strategy_tables(conn)
-    mon = _get_active_monitor(conn, cfg, symbol, direction)
-    if not mon:
-        conn.close()
-        return False, "监控单已不存在"
-    rg, legs_done = _get_or_create_roll_group_meta(conn, mon)
-    new_sl = float(preview["new_stop_loss"])
-    tp0 = float(preview["initial_take_profit"])
+    get_db = cfg["get_db"]
+    conn = None
     try:
+        ok_live, reason = cfg["ensure_live_ready"]()
+        if not ok_live:
+            return False, reason or "实盘未就绪"
+        prev = _roll_preview_response(cfg, data)
+        if not prev.get("ok"):
+            return False, prev.get("msg") or "预览失败"
+        preview = prev["preview"]
+        symbol = cfg["normalize_symbol_input"](data.get("symbol") or "")
+        direction = preview["direction"]
+        ex_sym = cfg["normalize_exchange_symbol"](symbol)
+        add_mode = preview["add_mode"]
+        amount = cfg["amount_to_precision"](ex_sym, float(preview["add_amount_raw"]))
+        if amount is None or amount <= 0:
+            return False, "加仓张数低于交易所最小精度"
+        lev_fn = cfg.get("default_leverage")
+        if not callable(lev_fn):
+            lev_fn = lambda _s: 5
+        leverage = int(data.get("leverage") or 0) or int(lev_fn(symbol))
+        conn = get_db()
+        init_strategy_tables(conn)
+        mon = _get_active_monitor(conn, cfg, symbol, direction)
+        if not mon:
+            return False, "监控单已不存在"
+        rg, legs_done = _get_or_create_roll_group_meta(conn, mon)
+        new_sl = float(preview["new_stop_loss"])
+        tp0 = float(preview["initial_take_profit"])
         if add_mode == "market":
             order = cfg["market_add"](ex_sym, direction, amount, leverage)
             fill = float(cfg.get("resolve_fill_price", lambda o, s, p: p)(order, ex_sym, preview["add_price"]) or preview["add_price"])
@@ -228,7 +237,6 @@ def _roll_execute(cfg: dict, data: dict) -> tuple[bool, str]:
                 (legs_done + 1, cfg["app_now_str"](), rg["id"]),
             )
             conn.commit()
-            conn.close()
             return True, f"已挂限价加仓单 #{oid}，成交后请在页面点「同步持仓并更新止损」"
         cfg["replace_tpsl"](ex_sym, direction, new_sl, tp0, mon)
         conn.execute(
@@ -260,12 +268,16 @@ def _roll_execute(cfg: dict, data: dict) -> tuple[bool, str]:
             (new_sl, mon["id"]),
         )
         conn.commit()
-        conn.close()
         return True, f"滚仓第 {legs_done + 1} 腿已市价成交，交易所止损已更新，止盈仍为首仓 {tp0}"
     except Exception as e:
-        conn.close()
         fe = cfg.get("friendly_error")
         return False, fe(e) if callable(fe) else str(e)
+    finally:
+        if conn is not None:
+            try:
+                conn.close()
+            except Exception:
+                pass
 
 
 def _get_active_monitor(conn, cfg: dict, symbol: str, direction: str) -> Optional[dict]: