chebser/RhSolutions-AddIn
0
0
Fork 0
Code Packages Releases 16 Wiki Activity

Fix method name

Browse Source
This commit is contained in:
Sergey Chebotar 2023-06-09 14:49:20 +03:00
parent a44f450df6
commit 50543ae697
3 changed files with 30 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
RhSolutions.AddIn/AddIn/RhSolutionsFunctions.cs
View File

@ -152,9 +152,35 @@ public class RhSolutionsFunctions
}
else
{
var article = skus.First().Id;
IDatabaseClient databaseClient = RhSolutionsAddIn.ServiceProvider.GetService<IDatabaseClient>();
ICurrencyClient currencyClient = RhSolutionsAddIn.ServiceProvider.GetRequiredService<ICurrencyClient>();
IMemoryCache memoryCache = RhSolutionsAddIn.ServiceProvider.GetRequiredService<IMemoryCache>();
var article = skus.First().Id;
DateTime date = dateField == 0 ? DateTime.Today : DateTime.FromOADate(dateField);
if (!memoryCache.TryGetValue(date, out decimal exchangeRate))
{
var result = ExcelAsyncUtil.Run(nameof(КУРСЕВРО), dateField, delegate
{
var requestResult = currencyClient.GetExchangeRate(date)
.GetAwaiter()
.GetResult();
return requestResult ?? -1m;
});
if (result is not decimal)
{
return "Загрузка...";
}
else
{
exchangeRate = (decimal)result;
var cacheEntryOptions = new MemoryCacheEntryOptions()
.SetSlidingExpiration(TimeSpan.FromHours(1));
memoryCache.Set(date, exchangeRate, cacheEntryOptions);
}
}
if (ExcelAsyncUtil.Run(nameof(РЕХАУЦЕНАРУБ), line, delegate
{
@ -163,11 +189,6 @@ public class RhSolutionsFunctions
.GetResult()
.FirstOrDefault();
DateTime date = dateField == 0 ? DateTime.Today : DateTime.FromOADate(dateField);
var exchangeRate = currencyClient.GetCurrencyCourse(date)
.GetAwaiter()
.GetResult();
return product == null ? -1m :
product.Price * exchangeRate * 1.2m;
}) is not decimal requestResult)
@ -199,7 +220,7 @@ public class RhSolutionsFunctions
{
var result = ExcelAsyncUtil.Run(nameof(КУРСЕВРО), dateField, delegate
{
var requestResult = currencyClient.GetCurrencyCourse(date)
var requestResult = currencyClient.GetExchangeRate(date)
.GetAwaiter()
.GetResult();

2
RhSolutions.AddIn/Services/CurrencyClient.cs
View File

@ -16,7 +16,7 @@ public class CurrencyClient : ICurrencyClient
_httpClient = httpClient;
}
public async Task<decimal?> GetCurrencyCourse(DateTime date)
public async Task<decimal?> GetExchangeRate(DateTime date)
{
string request = $"{_requestAddress}{date.Date:dd/MM/yyyy}";
HttpResponseMessage response = await _httpClient.GetAsync(request);

2
RhSolutions.AddIn/Services/ICurrencyClient.cs
View File

@ -5,5 +5,5 @@ namespace RhSolutions.Services;
public interface ICurrencyClient
{
public Task<decimal?> GetCurrencyCourse(DateTime date);
public Task<decimal?> GetExchangeRate(DateTime date);
}