Alex/stcs
2
0
Fork 0
forked from kodorvan/stcs
Code Pull Requests Activity

The text has been corrected, fixed the commission check

Browse Source
This commit is contained in:
algizn97
2025-10-25 17:50:46 +05:00
parent 42f0f8ddc0
commit 7350c86927
3 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/bybit/open_positions.py
View File

@@ -215,6 +215,8 @@ async def trading_cycle(
try:
user_deals_data = await rq.get_user_deal_by_symbol(tg_id=tg_id, symbol=symbol)
user_auto_trading_data = await rq.get_user_auto_trading(tg_id=tg_id, symbol=symbol)
user_risk_management_data = await rq.get_user_risk_management(tg_id=tg_id)
commission_fee = user_risk_management_data.commission_fee
total_fee = user_auto_trading_data.total_fee
trade_mode = user_deals_data.trade_mode
margin_type = user_deals_data.margin_type
@@ -243,6 +245,10 @@ async def trading_cycle(
symbol=symbol,
leverage=leverage,
)
if commission_fee == "Yes_commission_fee":
total_fee = total_fee
else:
total_fee = 0
if trade_mode == "Switch":
if side == "Buy":

9
app/bybit/telegram_message_handler.py
View File

@@ -117,14 +117,7 @@ class TelegramMessageHandler:
fee = 0
exec_pnl = format_value(execution.get("execPnl"))
risk_management_data = await rq.get_user_risk_management(tg_id=tg_id)
commission_fee = risk_management_data.commission_fee
if commission_fee == "Yes_commission_fee":
total_pnl = safe_float(exec_pnl) - safe_float(exec_fee) - fee
else:
total_pnl = safe_float(exec_pnl)
total_pnl = safe_float(exec_pnl) - safe_float(exec_fee) - fee
header = (
"Сделка закрыта:" if safe_float(closed_size) > 0 else "Сделка открыта:"
)

2
app/telegram/handlers/main_settings/additional_settings.py
View File

@@ -43,7 +43,7 @@ async def settings_for_trade_mode(
text="Выберите режим торговли:\n\n"
"Лонг - все сделки серии открываются на покупку.\n"
"Шорт - все сделки серии открываются на продажу.\n"
"Свитч - направление первой сделки серии меняется по переменно.\n",
"Свитч - направление каждой сделки в рамках серии меняется попеременно.\n",
reply_markup=kbi.trade_mode,
)
logger.debug(