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

Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development

Browse Source
This commit is contained in:
cheche
2024-01-16 14:04:18 +08:00
parent e7e186b9a1 d65ac0912d
commit 1979b7297c
33 changed files with 604 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Src/Dlhis.Canteen/Order/Controllers/BalancesController.cs
View File

@@ -24,7 +24,7 @@ public class BalancesController : ControllerBase
}
/// <summary>
/// 获取消费记录
/// 获取记录分页
/// </summary>
/// <param name="request"></param>
/// <returns></returns>

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

@@ -381,7 +381,7 @@ public class BalanceService : IBalanceService
{
now = request.SearchDate.Value;
start = new DateTime(now.Year, now.Month, now.Day);
end = new DateTime(now.Year, now.Month, now.Day + 1);
end = new DateTime(now.Year, now.Month, now.Day, 23, 59, 59);
}
var device = await _dbContext.Queryable<DeviceEntity>()
@@ -433,8 +433,14 @@ public class BalanceService : IBalanceService
CostDateTime = record.CostDateTime
}).ToPageListAsync(request);
//消费总金额
var sum = await _dbContext.Queryable<BalanceRecordEntity>()
.WhereIF(request.SearchDate.HasValue, record => record.CostDate >= start)
.WhereIF(request.SearchDate.HasValue, record => record.CostDate <= end)
.Where(record => record.TenantId == device.TenantId || (record.DeviceInfo == device.Code.ToString() || record.DeviceInfo == device.UniqueNo))
.Where(record => record.Type == BalanceRecordTypeEnumType.Out && record.Status == BalanceRecordStatusEnumType.Valid)
.SumAsync(record => SqlFunc.Abs(SqlFunc.IsNull(record.Amount, 0)));
var sum = page.Data.Sum(x => Math.Abs(x.Amount));
page.Data.ForEach(x => x.Sum = sum);
return page;