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

fix 用户消费明细状态处理

Browse Source
This commit is contained in:
liguoyang
2024-11-13 15:41:15 +08:00
parent 0e38406dd5
commit ee8784195f
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -358,7 +358,8 @@ public class BalanceService : IBalanceService
Id = record.Id,
CurrentAmount = SqlFunc.Abs(record.Amount),
Source = record.Source,
No = SqlFunc.IIF(record.Status == BalanceRecordStatusEnumType.Obsolute && record.Remark == "退款", "(已退)" + record.No, record.No),
Status = record.Status,
No = SqlFunc.IIF(record.Status == BalanceRecordStatusEnumType.Obsolute, "(已退)" + record.No, record.No),
BusinessPlaceName = bPlace.Name,
ShiftType = record.ShiftType,
CostDateTime = record.CostDateTime,
@@ -372,7 +373,7 @@ public class BalanceService : IBalanceService
var monthSum = await _dbContext.Queryable<BalanceRecordEntity>()
.Where(x => x.CostDateTime >= monthStart && x.CostDateTime <= monthEnd)
.Where(x => x.Type == BalanceRecordTypeEnumType.Out && (x.Status == BalanceRecordStatusEnumType.Valid || x.Status == BalanceRecordStatusEnumType.Obsolute))
.Where(x => x.Type == BalanceRecordTypeEnumType.Out && x.Status == BalanceRecordStatusEnumType.Valid)
.Where(x => x.Source != BalanceRecordSourceEnumType.EMealVoucher)
.Where(x => x.UserCode == jinkoCode)
.SumAsync(x => SqlFunc.Abs(x.Amount));