forked from kodorvan/stcs
Fixed the direction at the start of the series
This commit is contained in:
@@ -28,11 +28,9 @@ async def start_trading_cycle(
|
|||||||
symbol = await rq.get_user_symbol(tg_id=tg_id)
|
symbol = await rq.get_user_symbol(tg_id=tg_id)
|
||||||
additional_data = await rq.get_user_additional_settings(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)
|
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
|
trade_mode = additional_data.trade_mode
|
||||||
switch_side = additional_data.switch_side
|
switch_side = additional_data.switch_side
|
||||||
|
side= additional_data.side
|
||||||
margin_type = additional_data.margin_type
|
margin_type = additional_data.margin_type
|
||||||
leverage = additional_data.leverage
|
leverage = additional_data.leverage
|
||||||
order_quantity = additional_data.order_quantity
|
order_quantity = additional_data.order_quantity
|
||||||
@@ -43,19 +41,8 @@ async def start_trading_cycle(
|
|||||||
stop_loss_percent = risk_management_data.stop_loss_percent
|
stop_loss_percent = risk_management_data.stop_loss_percent
|
||||||
total_commission = 0
|
total_commission = 0
|
||||||
|
|
||||||
get_side = "Buy"
|
|
||||||
|
|
||||||
if user_deals_data:
|
|
||||||
get_side = user_deals_data.last_side or "Buy"
|
|
||||||
|
|
||||||
if trade_mode == "Switch":
|
if trade_mode == "Switch":
|
||||||
if switch_side == "По направлению":
|
side = side
|
||||||
side = get_side
|
|
||||||
else:
|
|
||||||
if get_side == "Buy":
|
|
||||||
side = "Sell"
|
|
||||||
else:
|
|
||||||
side = "Buy"
|
|
||||||
else:
|
else:
|
||||||
if trade_mode == "Long":
|
if trade_mode == "Long":
|
||||||
side = "Buy"
|
side = "Buy"
|
||||||
|
|||||||
Reference in New Issue
Block a user