This commit is contained in:
薇薇安 2026-01-27 11:28:57 +08:00
parent 16c4cfbdd8
commit 8e365b3a9a

View File

@ -2698,6 +2698,10 @@ class PositionManager:
if pnl_percent_margin > position_info.get('maxProfit', 0):
position_info['maxProfit'] = pnl_percent_margin
# ⚠️ 2026-01-27修复提前初始化partial_profit_taken避免在止损检查时未定义
partial_profit_taken = position_info.get('partialProfitTaken', False)
remaining_quantity = position_info.get('remainingQuantity', quantity)
# 移动止损逻辑(盈利后保护利润,基于保证金)
# 每次检查时从Redis重新加载配置确保配置修改能即时生效
try:
@ -2863,8 +2867,7 @@ class PositionManager:
should_close = False
take_profit_1 = position_info.get('takeProfit1') # 第一目标盈亏比1:1
take_profit_2 = position_info.get('takeProfit2', position_info.get('takeProfit')) # 第二目标1.5:1
partial_profit_taken = position_info.get('partialProfitTaken', False)
remaining_quantity = position_info.get('remainingQuantity', quantity)
# ⚠️ 注意partial_profit_taken和remaining_quantity已在方法开头初始化这里不需要重复定义
# 第一目标30%固定止盈基于保证金了结50%仓位保证拿到30%盈利
if not partial_profit_taken and take_profit_1 is not None: