From 40c655c9ff8cc754af6d724382679e1d4985d3ce Mon Sep 17 00:00:00 2001 From: cheche <717840555@qq.com> Date: Fri, 26 Jan 2024 15:35:25 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Services/Implements/BalanceService.cs | 24 +++++++++---------- .../Services/Implements/ApkFIileService.cs | 3 ++- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs b/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs index 406cc86c..7ea10886 100644 --- a/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs +++ b/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs @@ -119,10 +119,10 @@ public class BalanceService : IBalanceService obj.LateNightAmount = costIdGroup.Where(x => x.BusinessShiftCode.ToString() == shiftCodeDict["LateNight"]).Sum(x => x.Amount); // 每个餐次单价 - obj.BreakfastPrice = obj.BreakfastNumberOfPeople == 0 ? 0 : obj.BreakfastAmount / obj.BreakfastNumberOfPeople; - obj.LunchPrice = obj.LunchNumberOfPeople == 0 ? 0 : obj.LunchAmount / obj.LunchNumberOfPeople; - obj.DinnerPrice = obj.DinnerNumberOfPeople == 0 ? 0 : obj.DinnerAmount / obj.DinnerNumberOfPeople; - obj.LateNightPrice = obj.LateNightNumberOfPeople == 0 ? 0 : obj.LateNightAmount / obj.LateNightNumberOfPeople; + obj.BreakfastPrice = obj.BreakfastNumberOfPeople == 0 ? 0 : Math.Round(obj.BreakfastAmount / obj.BreakfastNumberOfPeople, 2); + obj.LunchPrice = obj.LunchNumberOfPeople == 0 ? 0 : Math.Round(obj.LunchAmount / obj.LunchNumberOfPeople, 2); + obj.DinnerPrice = obj.DinnerNumberOfPeople == 0 ? 0 : Math.Round(obj.DinnerAmount / obj.DinnerNumberOfPeople, 2); + obj.LateNightPrice = obj.LateNightNumberOfPeople == 0 ? 0 : Math.Round(obj.LateNightAmount / obj.LateNightNumberOfPeople, 2); // 总人数 总金额 obj.TotalNumberOfPeople = obj.BreakfastNumberOfPeople + obj.LunchNumberOfPeople + obj.DinnerNumberOfPeople + obj.LateNightNumberOfPeople; @@ -234,10 +234,10 @@ public class BalanceService : IBalanceService obj.LateNightAmount = departmentGroup.Where(x => x.BusinessShiftCode.ToString() == shiftCodeDict["LateNight"]).Sum(x => x.Amount); // 每个餐次单价 - obj.BreakfastPrice = obj.BreakfastNumberOfPeople == 0 ? 0 : obj.BreakfastAmount / obj.BreakfastNumberOfPeople; - obj.LunchPrice = obj.LunchNumberOfPeople == 0 ? 0 : obj.LunchAmount / obj.LunchNumberOfPeople; - obj.DinnerPrice = obj.DinnerNumberOfPeople == 0 ? 0 : obj.DinnerAmount / obj.DinnerNumberOfPeople; - obj.LateNightPrice = obj.LateNightNumberOfPeople == 0 ? 0 : obj.LateNightAmount / obj.LateNightNumberOfPeople; + obj.BreakfastPrice = obj.BreakfastNumberOfPeople == 0 ? 0 : Math.Round(obj.BreakfastAmount / obj.BreakfastNumberOfPeople, 2); + obj.LunchPrice = obj.LunchNumberOfPeople == 0 ? 0 : Math.Round(obj.LunchAmount / obj.LunchNumberOfPeople, 2); + obj.DinnerPrice = obj.DinnerNumberOfPeople == 0 ? 0 : Math.Round(obj.DinnerAmount / obj.DinnerNumberOfPeople, 2); + obj.LateNightPrice = obj.LateNightNumberOfPeople == 0 ? 0 : Math.Round(obj.LateNightAmount / obj.LateNightNumberOfPeople, 2); // 总人数 总金额 obj.TotalNumberOfPeople = obj.BreakfastNumberOfPeople + obj.LunchNumberOfPeople + obj.DinnerNumberOfPeople + obj.LateNightNumberOfPeople; @@ -299,10 +299,10 @@ public class BalanceService : IBalanceService obj.LateNightAmount = originTenantIdGroup.Where(x => x.BusinessShiftCode.ToString() == shiftCodeDict["LateNight"]).Sum(x => x.Amount); // 每个餐次单价 - obj.BreakfastPrice = obj.BreakfastNumberOfPeople == 0 ? 0 : obj.BreakfastAmount / obj.BreakfastNumberOfPeople; - obj.LunchPrice = obj.LunchNumberOfPeople == 0 ? 0 : obj.LunchAmount / obj.LunchNumberOfPeople; - obj.DinnerPrice = obj.DinnerNumberOfPeople == 0 ? 0 : obj.DinnerAmount / obj.DinnerNumberOfPeople; - obj.LateNightPrice = obj.LateNightNumberOfPeople == 0 ? 0 : obj.LateNightAmount / obj.LateNightNumberOfPeople; + obj.BreakfastPrice = obj.BreakfastNumberOfPeople == 0 ? 0 : Math.Round(obj.BreakfastAmount / obj.BreakfastNumberOfPeople, 2); + obj.LunchPrice = obj.LunchNumberOfPeople == 0 ? 0 : Math.Round(obj.LunchAmount / obj.LunchNumberOfPeople, 2); + obj.DinnerPrice = obj.DinnerNumberOfPeople == 0 ? 0 : Math.Round(obj.DinnerAmount / obj.DinnerNumberOfPeople, 2); + obj.LateNightPrice = obj.LateNightNumberOfPeople == 0 ? 0 : Math.Round(obj.LateNightAmount / obj.LateNightNumberOfPeople, 2); // 总人数 总金额 obj.TotalNumberOfPeople = obj.BreakfastNumberOfPeople + obj.LunchNumberOfPeople + obj.DinnerNumberOfPeople + obj.LateNightNumberOfPeople; diff --git a/Src/Dlhis.Common/Services/Implements/ApkFIileService.cs b/Src/Dlhis.Common/Services/Implements/ApkFIileService.cs index b3707341..0a19cb7f 100644 --- a/Src/Dlhis.Common/Services/Implements/ApkFIileService.cs +++ b/Src/Dlhis.Common/Services/Implements/ApkFIileService.cs @@ -1,6 +1,7 @@ using Dlhis.Common.Request; using Dlhis.Common.Response; using Dlhis.Entity.Common; +using Kurisu.AspNetCore.Utils.Extensions; using Kurisu.SqlSugar.Services; using Mapster; using Microsoft.AspNetCore.Mvc; @@ -73,7 +74,7 @@ public class ApkFIileService : IApkFIileService { //上传 var completeFilePath = FormSingleFileUpload(request.formFile); - if (completeFilePath == "No file uploaded") + if (completeFilePath == "No file uploaded" || completeFilePath.IsEmpty()) { return null; }