From afdd9e6f142b60a8b2fab0887c57c9ea69cf46f8 Mon Sep 17 00:00:00 2001 From: liguoyang Date: Thu, 21 Mar 2024 21:48:05 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E4=BB=B7=E6=A0=BC=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E8=8F=9C=E5=8D=95=E4=B8=AD=E7=9A=84=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Src/Dlhis.Basic/Dishes/Response/DishesDetailResponse.cs | 4 ++-- .../Dishes/Services/Implements/DishesMenuService.cs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Src/Dlhis.Basic/Dishes/Response/DishesDetailResponse.cs b/Src/Dlhis.Basic/Dishes/Response/DishesDetailResponse.cs index fe90d831..4605c66d 100644 --- a/Src/Dlhis.Basic/Dishes/Response/DishesDetailResponse.cs +++ b/Src/Dlhis.Basic/Dishes/Response/DishesDetailResponse.cs @@ -35,7 +35,7 @@ public class DishesDetailResponse /// /// 单价 /// - public decimal Price { get; set; } + public decimal? Price { get; set; } /// /// 剩余数量 @@ -53,7 +53,7 @@ public class DishesDetailResponse { return CurrentUnits.ToObject>(); } - return new () { "个" }; + return new() { "个" }; } } diff --git a/Src/Dlhis.Basic/Dishes/Services/Implements/DishesMenuService.cs b/Src/Dlhis.Basic/Dishes/Services/Implements/DishesMenuService.cs index 14ff5703..ac48ebe3 100644 --- a/Src/Dlhis.Basic/Dishes/Services/Implements/DishesMenuService.cs +++ b/Src/Dlhis.Basic/Dishes/Services/Implements/DishesMenuService.cs @@ -108,7 +108,7 @@ public class DishesMenuService : IDishesMenuService CustomCode = dishes.CustomCode, Description = dishes.Description, ImageUrl = dishes.ImageUrl, - Price = dishes.Price, + Price = SqlFunc.IIF(x.Price > 0, x.Price, dishes.Price), Name = dishes.Name, Number = x.Number, CurrentUnits = dishes.Units.ToString()