разъебаться по полной #21

Merged
Arsen Mirzaev Tatyano-Muradovich merged 6 commits from Alex/stcs:devel into stable 2025-10-25 21:05:59 +07:00
6 changed files with 104 additions and 17 deletions
Showing only changes of commit 89603f0b62 - Show all commits

View File

@@ -28,11 +28,9 @@ async def start_trading_cycle(
symbol = await rq.get_user_symbol(tg_id=tg_id)
additional_data = await rq.get_user_additional_settings(tg_id=tg_id)
risk_management_data = await rq.get_user_risk_management(tg_id=tg_id)
user_deals_data = await rq.get_user_deal_by_symbol(
tg_id=tg_id, symbol=symbol
)
trade_mode = additional_data.trade_mode
switch_side = additional_data.switch_side
side= additional_data.side
margin_type = additional_data.margin_type
leverage = additional_data.leverage
order_quantity = additional_data.order_quantity
@@ -43,19 +41,8 @@ async def start_trading_cycle(
stop_loss_percent = risk_management_data.stop_loss_percent
total_commission = 0
get_side = "Buy"
if user_deals_data:
get_side = user_deals_data.last_side or "Buy"
if trade_mode == "Switch":
if switch_side == "По направлению":
side = get_side
else:
if get_side == "Buy":
side = "Sell"
else:
side = "Buy"
side = side
else:
if trade_mode == "Long":
side = "Buy"