yuangb/jinko.yikatong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 取消必选costid

Browse Source
This commit is contained in:
cheche
2024-01-26 11:55:15 +08:00
parent 6a2f8e4a9c
commit 9a88977339
1 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs
View File

@@ -131,7 +131,7 @@ public class BalanceService : IBalanceService
}
return lst;
}
/// <summary>
/// 消费明细
/// </summary>
@@ -198,7 +198,8 @@ public class BalanceService : IBalanceService
.WhereIF(!request.OriginTenantId.IsEmpty(), record => record.TenantId == request.OriginTenantId)
.WhereIF(request.StartDatetime.HasValue, record => record.CostDateTime >= request.StartDatetime)
.WhereIF(request.EndDatetime.HasValue, record => record.CostDateTime <= request.EndDatetime)
.Where(record => record.CostId == request.CostId && record.Type == BalanceRecordTypeEnumType.Out)
.WhereIF(!request.CostId.IsEmpty(), record => record.CostId == request.CostId)
.Where(record => record.Type == BalanceRecordTypeEnumType.Out)
.OrderBy(record => record.CreateTime, OrderByType.Desc)
.ToListAsync();
@@ -210,7 +211,8 @@ public class BalanceService : IBalanceService
var obj = new BalanceRecordSummaryRespones
{
DepartmentNo = departmentGroup.Key,
CostId = request.CostId
CostId = request.CostId,
OriginTenantId = ""
};
// 每个餐次人数
@@ -237,10 +239,6 @@ public class BalanceService : IBalanceService
obj.DinnerPrice = obj.DinnerNumberOfPeople == 0 ? 0 : obj.DinnerAmount / obj.DinnerNumberOfPeople;
obj.LateNightPrice = obj.LateNightNumberOfPeople == 0 ? 0 : obj.LateNightAmount / obj.LateNightNumberOfPeople;
// 每个部门餐次中的 OriginTenantId
obj.OriginTenantId = departmentGroup.FirstOrDefault()?.OriginTenantId;
// 总人数 总金额
obj.TotalNumberOfPeople = obj.BreakfastNumberOfPeople + obj.LunchNumberOfPeople + obj.DinnerNumberOfPeople + obj.LateNightNumberOfPeople;
obj.TotalAmount = obj.BreakfastAmount + obj.LunchAmount + obj.DinnerAmount + obj.LateNightAmount;
@@ -265,7 +263,8 @@ public class BalanceService : IBalanceService
.WhereIF(!request.OriginTenantId.IsEmpty(), record => record.TenantId == request.OriginTenantId)
.WhereIF(request.StartDatetime.HasValue, record => record.CostDateTime >= request.StartDatetime)
.WhereIF(request.EndDatetime.HasValue, record => record.CostDateTime <= request.EndDatetime)
.Where(record => record.CostId == request.CostId && record.Type == BalanceRecordTypeEnumType.Out)
.WhereIF(!request.CostId.IsEmpty(), record => record.CostId == request.CostId)
.Where(record => record.Type == BalanceRecordTypeEnumType.Out)
.OrderBy(record => record.CreateTime, OrderByType.Desc)
.ToListAsync();
@@ -313,9 +312,6 @@ public class BalanceService : IBalanceService
return lst;
}
/// <summary>
/// 用餐分析
/// </summary>