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

feat 用户消费明细显示已退款

Browse Source
This commit is contained in:
liguoyang
2024-11-12 10:39:55 +08:00
parent 59fdf00df3
commit 1a04513489
2 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Src/Dlhis.Basic/Organization/Services/Implements/GainfoGroupService.cs
View File

@@ -112,19 +112,19 @@ public class GainfoGroupService : IGainfoGroupService
var gainfo = await _dbContext.Queryable<GainfoEntity>().Where(x => x.Code == userCode).SingleAsync(); var gainfo = await _dbContext.Queryable<GainfoEntity>().Where(x => x.Code == userCode).SingleAsync();
var userNo = gainfo?.No; var userNo = gainfo?.No;
return await _dbContext.Queryable<GainfoGroupEntity>() return await _dbContext.Queryable<GainfoGroupRelationshipEntity>()
.LeftJoin<GainfoGroupRelationshipEntity>((x, r) => x.Code == r.GroupCode) .LeftJoin<GainfoGroupEntity>((x, xg) => x.GroupCode == xg.Code)
.Where((x, r) => r.UserNo == userNo) .Where((x, xg) => x.UserNo == userNo)
.Select(x => new GainfoGroupTreeResponse .Select((x, xg) => new GainfoGroupTreeResponse
{ {
Id = x.Id, Id = x.Id,
PCode = x.PCode, PCode = xg.PCode,
Code = x.Code, Code = xg.Code,
Name = x.Name, Name = xg.Name,
Remark = x.Remark, Remark = xg.Remark,
Editable = x.Editable, Editable = xg.Editable,
IsDefault = x.IsDefault, IsDefault = xg.IsDefault,
TenantId = x.TenantId TenantId = xg.TenantId
}) })
.ToListAsync(); .ToListAsync();
} }

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

@@ -348,8 +348,8 @@ public class BalanceService : IBalanceService
.LeftJoin<DepartmentEntity>((record, ga, department) => ga.DepartmentNo == department.No) .LeftJoin<DepartmentEntity>((record, ga, department) => ga.DepartmentNo == department.No)
.LeftJoin<BusinessPlaceEntity>((record, ga, department, bPlace) => record.BusinessPlaceCode == bPlace.Code) .LeftJoin<BusinessPlaceEntity>((record, ga, department, bPlace) => record.BusinessPlaceCode == bPlace.Code)
.Where((record, ga) => record.UserCode == jinkoCode) .Where((record, ga) => record.UserCode == jinkoCode)
.Where(record => record.Status == BalanceRecordStatusEnumType.Valid && record.Type == BalanceRecordTypeEnumType.Out) .Where(record => record.Type == BalanceRecordTypeEnumType.Out && (record.Status == BalanceRecordStatusEnumType.Valid || record.Status == BalanceRecordStatusEnumType.Obsolute))
.Where(record => record.Source != BalanceRecordSourceEnumType.EMealVoucher) //不展示电子餐券信息 .Where(record => record.Source != BalanceRecordSourceEnumType.EMealVoucher)
.WhereIF(request.SearchDateTimePeriod.HasValue(), record => record.CostDate >= request.SearchDateTimePeriod.Start && record.CostDate <= request.SearchDateTimePeriod.End) .WhereIF(request.SearchDateTimePeriod.HasValue(), record => record.CostDate >= request.SearchDateTimePeriod.Start && record.CostDate <= request.SearchDateTimePeriod.End)
.WhereIF(request.ApplicationType.HasValue, record => record.ApplicationType == request.ApplicationType) .WhereIF(request.ApplicationType.HasValue, record => record.ApplicationType == request.ApplicationType)
.OrderBy(record => record.CostDateTime) .OrderBy(record => record.CostDateTime)
@@ -358,7 +358,7 @@ public class BalanceService : IBalanceService
Id = record.Id, Id = record.Id,
CurrentAmount = SqlFunc.Abs(record.Amount), CurrentAmount = SqlFunc.Abs(record.Amount),
Source = record.Source, Source = record.Source,
No = record.No, No = SqlFunc.IIF(record.Status == BalanceRecordStatusEnumType.Obsolute && record.Remark == "退款", "(已退)" + record.No, record.No),
BusinessPlaceName = bPlace.Name, BusinessPlaceName = bPlace.Name,
ShiftType = record.ShiftType, ShiftType = record.ShiftType,
CostDateTime = record.CostDateTime, CostDateTime = record.CostDateTime,
@@ -372,7 +372,7 @@ public class BalanceService : IBalanceService
var monthSum = await _dbContext.Queryable<BalanceRecordEntity>() var monthSum = await _dbContext.Queryable<BalanceRecordEntity>()
.Where(x => x.CostDateTime >= monthStart && x.CostDateTime <= monthEnd) .Where(x => x.CostDateTime >= monthStart && x.CostDateTime <= monthEnd)
.Where(x => x.Status == BalanceRecordStatusEnumType.Valid && x.Type == BalanceRecordTypeEnumType.Out) .Where(x => x.Type == BalanceRecordTypeEnumType.Out && (x.Status == BalanceRecordStatusEnumType.Valid || x.Status == BalanceRecordStatusEnumType.Obsolute))
.Where(x => x.Source != BalanceRecordSourceEnumType.EMealVoucher) .Where(x => x.Source != BalanceRecordSourceEnumType.EMealVoucher)
.Where(x => x.UserCode == jinkoCode) .Where(x => x.UserCode == jinkoCode)
.SumAsync(x => SqlFunc.Abs(x.Amount)); .SumAsync(x => SqlFunc.Abs(x.Amount));