miracle/auto_trade_sys
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
薇薇安 2026-02-14 23:43:33 +08:00
parent 7df054f638
commit baa8277aee
2 changed files with 51 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
backend/api/routes/account.py
View File

@ -1822,20 +1822,40 @@ async def sync_positions(
except Exception as e: except Exception as e:
logger.debug(f"获取 {symbol} 成交记录失败: {e}") logger.debug(f"获取 {symbol} 成交记录失败: {e}")
client_order_id = None client_order_id = None
prefix_matched = False
if system_order_prefix: if system_order_prefix:
if not entry_order_id: if not entry_order_id:
logger.debug(f" {symbol} 无法获取开仓订单号，跳过补建") logger.debug(f" {symbol} 无法获取开仓订单号，将用「是否有止损/止盈单」兜底判断")
continue else:
try: try:
order_info = await client.client.futures_get_order(symbol=symbol, orderId=int(entry_order_id), recvWindow=20000) order_info = await client.client.futures_get_order(symbol=symbol, orderId=int(entry_order_id), recvWindow=20000)
cid = (order_info or {}).get("clientOrderId") or "" cid = (order_info or {}).get("clientOrderId") or ""
client_order_id = cid or None client_order_id = cid or None
if not cid.startswith(system_order_prefix): if cid.startswith(system_order_prefix):
logger.debug(f" {symbol} 开仓订单 clientOrderId={cid!r} 非系统前缀，跳过补建") prefix_matched = True
else:
logger.debug(f" {symbol} 开仓订单 clientOrderId={cid!r} 非系统前缀，将用「是否有止损/止盈单」兜底判断")
except Exception as e:
logger.debug(f" {symbol} 查询开仓订单失败: {e}，将用「是否有止损/止盈单」兜底判断")
if not prefix_matched:
has_sltp = False
try:
normal = await client.get_open_orders(symbol)
for o in (normal or []):
if _order_is_sltp(o, "type"):
has_sltp = True
break
if not has_sltp:
algo = await client.futures_get_open_algo_orders(symbol=symbol, algo_type="CONDITIONAL")
for o in (algo or []):
if _order_is_sltp(o, "orderType"):
has_sltp = True
break
except Exception as e:
logger.debug(f"检查 {symbol} 止盈止损单失败: {e}")
if only_recover_when_has_sltp and not has_sltp:
logger.debug(f" {symbol} 未匹配系统前缀且无止损/止盈单，跳过补建")
continue continue
except Exception as e:
logger.debug(f" {symbol} 查询开仓订单失败: {e}，跳过补建")
continue
elif only_recover_when_has_sltp: elif only_recover_when_has_sltp:
has_sltp = False has_sltp = False
try: try:

32
trading_system/position_manager.py
View File

@ -2863,7 +2863,10 @@ class PositionManager:
if sync_recover: if sync_recover:
system_order_prefix = (config.TRADING_CONFIG.get("SYSTEM_ORDER_ID_PREFIX") or "").strip() system_order_prefix = (config.TRADING_CONFIG.get("SYSTEM_ORDER_ID_PREFIX") or "").strip()
if system_order_prefix: if system_order_prefix:
logger.info(f" → 补建「系统单」记录（仅当开仓订单 clientOrderId 前缀为 {system_order_prefix!r} 时创建）") logger.info(
f" → 补建「系统单」记录：开仓订单 clientOrderId 前缀为 {system_order_prefix!r} 时创建；"
"未匹配前缀时若有止损/止盈单也补建（便于历史单/监控一致）"
)
else: else:
logger.info(" → 补建「系统单」记录（仅当存在止损/止盈单时创建，避免手动单误建）" if sync_recover_only_has_sltp else " → 补建缺失持仓记录") logger.info(" → 补建「系统单」记录（仅当存在止损/止盈单时创建，避免手动单误建）" if sync_recover_only_has_sltp else " → 补建缺失持仓记录")
for symbol in missing_in_db: for symbol in missing_in_db:
@ -2889,19 +2892,24 @@ class PositionManager:
except Exception: except Exception:
pass pass
client_order_id_sync = None client_order_id_sync = None
prefix_matched = False # 是否通过 clientOrderId 前缀确认为系统单
if system_order_prefix: if system_order_prefix:
if not entry_order_id: if not entry_order_id:
logger.debug(f" {symbol} 无法获取开仓订单号，跳过补建") logger.debug(f" {symbol} 无法获取开仓订单号，将用「是否有止损/止盈单」兜底判断")
continue else:
try: try:
order_info = await self.client.client.futures_get_order(symbol=symbol, orderId=int(entry_order_id), recvWindow=20000) order_info = await self.client.client.futures_get_order(symbol=symbol, orderId=int(entry_order_id), recvWindow=20000)
cid = (order_info or {}).get("clientOrderId") or "" cid = (order_info or {}).get("clientOrderId") or ""
client_order_id_sync = cid or None client_order_id_sync = cid or None
if not cid.startswith(system_order_prefix): if cid.startswith(system_order_prefix):
logger.debug(f" {symbol} 开仓订单 clientOrderId={cid!r} 非系统前缀，跳过补建") prefix_matched = True
continue else:
except Exception as e: logger.debug(f" {symbol} 开仓订单 clientOrderId={cid!r} 非系统前缀，将用「是否有止损/止盈单」兜底判断")
logger.debug(f" {symbol} 查询开仓订单失败: {e}，跳过补建") except Exception as e:
logger.debug(f" {symbol} 查询开仓订单失败: {e}，将用「是否有止损/止盈单」兜底判断")
# 未通过前缀确认时：若有止损/止盈单则仍补建（历史单或前缀未写入时也能被监控）
if not prefix_matched and sync_recover_only_has_sltp and not (await _symbol_has_sltp(symbol)):
logger.debug(f" {symbol} 未匹配系统前缀且无止损/止盈单，跳过补建")
continue continue
elif sync_recover_only_has_sltp and not (await _symbol_has_sltp(symbol)): elif sync_recover_only_has_sltp and not (await _symbol_has_sltp(symbol)):
logger.debug(f" {symbol} 无止损/止盈单，跳过补建") logger.debug(f" {symbol} 无止损/止盈单，跳过补建")