From b7863af6336dfcb64036f07317c81fe0154f0e9b Mon Sep 17 00:00:00 2001 From: Mikhail Kuznetsov Date: Fri, 16 Feb 2024 12:27:08 +1000 Subject: [PATCH] =?UTF-8?q?fix(orderLoader):=20=D1=83=D1=82=D0=BE=D1=87?= =?UTF-8?q?=D0=BD=D0=B5=D0=BD=D0=B8=D0=B5=20=D1=80=D0=B0=D1=81=D1=87=D1=91?= =?UTF-8?q?=D1=82=20=D0=B2=D1=80=D0=B5=D0=BC=D0=B5=D0=BD=D0=B8=20=D1=81?= =?UTF-8?q?=D0=BE=D0=B7=D0=B4=D0=B0=D0=BD=D0=B8=D1=8F=20=D0=B8=20=D0=BA?= =?UTF-8?q?=D1=80=D0=B0=D0=B9=D0=BD=D0=B5=D0=B3=D0=BE=20=D1=81=D1=80=D0=BE?= =?UTF-8?q?=D0=BA=D0=B0=20=D0=BD=D0=B0=D1=80=D1=8F=D0=B4=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PARR.EsppApi/Models/EsppOrder.cs | 6 ++++++ PARR.EsppApi/Settings/EsppUserTimeZoneSettings.cs | 5 ++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/PARR.EsppApi/Models/EsppOrder.cs b/PARR.EsppApi/Models/EsppOrder.cs index c8a32434..6540a04a 100644 --- a/PARR.EsppApi/Models/EsppOrder.cs +++ b/PARR.EsppApi/Models/EsppOrder.cs @@ -38,6 +38,12 @@ namespace PARR.EsppApi.Models var dateTime = DateTime.ParseExact(ExpirationDate, "dd.MM.yyyy HH:mm:ss", CultureInfo.InvariantCulture); var utc = dateTime.AddHours(-EsppUserTimeZoneSettings.TimeZone); + //TODO: костыль!!! + // странное поведение даты, разница с еспп 13 часов. + // считаем часовой пояс УЗ ЕСПП 10 часов ЮТС + // в качестве костыля прибавляем 3 + utc = dateTime.AddHours(-3); + return new DateTimeOffset(utc, new TimeSpan(0)); } } diff --git a/PARR.EsppApi/Settings/EsppUserTimeZoneSettings.cs b/PARR.EsppApi/Settings/EsppUserTimeZoneSettings.cs index db896a4c..abbe6641 100644 --- a/PARR.EsppApi/Settings/EsppUserTimeZoneSettings.cs +++ b/PARR.EsppApi/Settings/EsppUserTimeZoneSettings.cs @@ -2,6 +2,9 @@ { internal static class EsppUserTimeZoneSettings { - public static int TimeZone = 0; + /// + /// Таймзона учетной записи ЕСПП относительно UTC + /// + public static int TimeZone = 10;//0; } }