vladzvx
/
klhztrader
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Чуть доработал логирование решений
test / deploy_trader_prod (push) Successful in 4m58s Details

dev
vlad zverzhkhovskiy 2025-09-09 09:28:52 +03:00
parent 7cc13d9ba0
commit 83038954d9
3 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
KLHZ.Trader.Core/DataLayer/Entities/Declisions/Enums/DeclisionTradeAction.cs
View File

@ -6,7 +6,9 @@
StopBuy = 1, StopBuy = 1,
StopBuyShortTime = 2, StopBuyShortTime = 2,
OpenLong = 100, OpenLong = 100,
OpenLongReal = 101,
CloseLong = 200, CloseLong = 200,
CloseLongReal = 201,
OpenShort = 300, OpenShort = 300,
CloseShort = 400, CloseShort = 400,
} }

25
KLHZ.Trader.Core/Exchange/Services/Trader.cs
View File

@ -187,6 +187,7 @@ namespace KLHZ.Trader.Core.Exchange.Services
var accounts = _tradeDataProvider.Accounts var accounts = _tradeDataProvider.Accounts
.Where(a => !a.Value.Assets.ContainsKey(message.Figi)) .Where(a => !a.Value.Assets.ContainsKey(message.Figi))
.ToArray(); .ToArray();
var loggedDeclisions = 0;
foreach (var acc in accounts) foreach (var acc in accounts)
{ {
if (IsBuyAllowed(acc.Value, message.Value, 1, _accountCashPartFutures, _accountCashPart)) if (IsBuyAllowed(acc.Value, message.Value, 1, _accountCashPartFutures, _accountCashPart))
@ -201,16 +202,16 @@ namespace KLHZ.Trader.Core.Exchange.Services
Count = 1, Count = 1,
RecomendPrice = null, RecomendPrice = null,
}); });
if (loggedDeclisions == 0)
{
await LogDeclision(DeclisionTradeAction.OpenLongReal, message);
loggedDeclisions++;
}
} }
await LogDeclision(DeclisionTradeAction.OpenLong, message);
} }
} }
} }
else await LogDeclision(DeclisionTradeAction.OpenLong, message);
{
await LogDeclision(DeclisionTradeAction.OpenLong, message);
}
} }
} }
} }
@ -218,6 +219,7 @@ namespace KLHZ.Trader.Core.Exchange.Services
if ((res & TradingEvent.UptrendEnd) == TradingEvent.UptrendEnd) if ((res & TradingEvent.UptrendEnd) == TradingEvent.UptrendEnd)
{ {
var assetType = _tradeDataProvider.GetAssetTypeByFigi(message.Figi); var assetType = _tradeDataProvider.GetAssetTypeByFigi(message.Figi);
var loggedDeclisions = 0;
if (!message.IsHistoricalData && BotModeSwitcher.CanSell()) if (!message.IsHistoricalData && BotModeSwitcher.CanSell())
{ {
var assetsForClose = _tradeDataProvider.Accounts var assetsForClose = _tradeDataProvider.Accounts
@ -248,14 +250,15 @@ namespace KLHZ.Trader.Core.Exchange.Services
Count = (long)asset.Count, Count = (long)asset.Count,
RecomendPrice = null, RecomendPrice = null,
}); });
await LogDeclision(DeclisionTradeAction.CloseLong, message, profit); if (loggedDeclisions == 0)
{
loggedDeclisions++;
await LogDeclision(DeclisionTradeAction.CloseLongReal, message, profit);
}
} }
} }
} }
else await LogDeclision(DeclisionTradeAction.CloseLong, message);
{
await LogDeclision(DeclisionTradeAction.CloseLong, message);
}
} }
} }

2
KLHZ.Trader.Service/Controllers/PlayController.cs
View File

@ -25,7 +25,7 @@ namespace KLHZ.Trader.Service.Controllers
{ {
try try
{ {
var time = DateTime.UtcNow.AddDays(-40); var time = DateTime.UtcNow.AddMinutes(-40);
using var context1 = await _dbContextFactory.CreateDbContextAsync(); using var context1 = await _dbContextFactory.CreateDbContextAsync();
context1.ChangeTracker.QueryTrackingBehavior = QueryTrackingBehavior.NoTracking; context1.ChangeTracker.QueryTrackingBehavior = QueryTrackingBehavior.NoTracking;
var data = await context1.PriceChanges var data = await context1.PriceChanges