From 65224fe3b726b8ce507bfe86b8951c0a146c1240 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=94=D0=B0=D0=BD=D0=B8=D0=BB=D0=B0=20=D0=A1=D0=B5=D0=BB?= =?UTF-8?q?=D1=8F=D0=B5=D0=B2?= Date: Mon, 17 Apr 2023 19:30:52 +0300 Subject: [PATCH] =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B8=20=D0=B7?= =?UTF-8?q?=D0=B0=D0=BF=D0=B8=D1=81=D0=B8=20=D0=B2=D1=80=D0=B5=D0=BC=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- FoodOrders/FoodOrderDatabaseImplement/Models/Order.cs | 2 +- FoodOrders/FoodOrderFileImplement/Models/Order.cs | 2 +- .../FoodOrdersBusinessLogic/BusinessLogic/OrderLogic.cs | 4 ++-- .../FoodOrdersContracts/BindingModels/OrderBindingModel.cs | 2 +- FoodOrders/FoodOrdersContracts/ViewModels/OrderViewModel.cs | 2 +- FoodOrders/FoodOrdersListImplement/Models/Order.cs | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/FoodOrders/FoodOrderDatabaseImplement/Models/Order.cs b/FoodOrders/FoodOrderDatabaseImplement/Models/Order.cs index cafb75c..81e53fa 100644 --- a/FoodOrders/FoodOrderDatabaseImplement/Models/Order.cs +++ b/FoodOrders/FoodOrderDatabaseImplement/Models/Order.cs @@ -24,7 +24,7 @@ namespace FoodOrdersDatabaseImplement.Models public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен; [Required] - public DateTime DateCreate { get; private set; } = DateTime.Now; + public DateTime DateCreate { get; private set; } = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Utc); public DateTime? DateImplement { get; private set; } diff --git a/FoodOrders/FoodOrderFileImplement/Models/Order.cs b/FoodOrders/FoodOrderFileImplement/Models/Order.cs index 46733ee..7de4a8e 100644 --- a/FoodOrders/FoodOrderFileImplement/Models/Order.cs +++ b/FoodOrders/FoodOrderFileImplement/Models/Order.cs @@ -20,7 +20,7 @@ namespace FoodOrderFileImplement.Models public int Count { get; private set; } public double Sum { get; private set; } public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен; - public DateTime DateCreate { get; private set; } = DateTime.Now; + public DateTime DateCreate { get; private set; } = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Utc); public DateTime? DateImplement { get; private set; } public static Order? Create(OrderBindingModel? model) diff --git a/FoodOrders/FoodOrdersBusinessLogic/BusinessLogic/OrderLogic.cs b/FoodOrders/FoodOrdersBusinessLogic/BusinessLogic/OrderLogic.cs index 2a990bd..c464003 100644 --- a/FoodOrders/FoodOrdersBusinessLogic/BusinessLogic/OrderLogic.cs +++ b/FoodOrders/FoodOrdersBusinessLogic/BusinessLogic/OrderLogic.cs @@ -59,7 +59,7 @@ namespace PlumbingRepairBusinessLogic.BusinessLogic model.Status = newStatus; if (model.Status == OrderStatus.Выдан) - model.DateImplement = DateTime.Now; + model.DateImplement = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Utc); if (_orderStorage.Update(model) == null) { @@ -129,7 +129,7 @@ namespace PlumbingRepairBusinessLogic.BusinessLogic throw new ArgumentNullException("Сумма заказа должна быть больше 0", nameof(model.Sum)); } - _logger.LogInformation("Order. OrderId:{Id}.Sum:{ Sum}. WorkId: { WorkId}", model.Id, model.Sum, model.FoodId); + _logger.LogInformation("Order. OrderId:{Id}.Sum:{ Sum}. FoodId: { FoodId}", model.Id, model.Sum, model.FoodId); } } } diff --git a/FoodOrders/FoodOrdersContracts/BindingModels/OrderBindingModel.cs b/FoodOrders/FoodOrdersContracts/BindingModels/OrderBindingModel.cs index bb66510..0ec9113 100644 --- a/FoodOrders/FoodOrdersContracts/BindingModels/OrderBindingModel.cs +++ b/FoodOrders/FoodOrdersContracts/BindingModels/OrderBindingModel.cs @@ -20,7 +20,7 @@ namespace FoodOrdersContracts.BindingModels public OrderStatus Status { get; set; } = OrderStatus.Неизвестен; - public DateTime DateCreate { get; set; } = DateTime.Now; + public DateTime DateCreate { get; set; } = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Utc); public DateTime? DateImplement { get; set; } diff --git a/FoodOrders/FoodOrdersContracts/ViewModels/OrderViewModel.cs b/FoodOrders/FoodOrdersContracts/ViewModels/OrderViewModel.cs index 711b11b..6a9193e 100644 --- a/FoodOrders/FoodOrdersContracts/ViewModels/OrderViewModel.cs +++ b/FoodOrders/FoodOrdersContracts/ViewModels/OrderViewModel.cs @@ -27,7 +27,7 @@ namespace FoodOrdersContracts.ViewModels public OrderStatus Status { get; set; } = OrderStatus.Неизвестен; [DisplayName(" Дата создания ")] - public DateTime DateCreate { get; set; } = DateTime.Now; + public DateTime DateCreate { get; set; } = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Utc); [DisplayName(" Дата выполнения ")] public DateTime? DateImplement { get; set; } diff --git a/FoodOrders/FoodOrdersListImplement/Models/Order.cs b/FoodOrders/FoodOrdersListImplement/Models/Order.cs index 8e3c2f4..3726f3d 100644 --- a/FoodOrders/FoodOrdersListImplement/Models/Order.cs +++ b/FoodOrders/FoodOrdersListImplement/Models/Order.cs @@ -18,7 +18,7 @@ namespace FoodOrdersListImplement.Models public int Count { get; private set; } public double Sum { get; private set; } public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен; - public DateTime DateCreate { get; private set; } = DateTime.Now; + public DateTime DateCreate { get; private set; } = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Utc); public DateTime? DateImplement { get; private set; } public static Order? Create(OrderBindingModel? model)