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-10-23 13:28:25 +08:00
parent d400b33ea9
commit 3dbd8f3e35
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -140,7 +140,7 @@ public class BalanceService : IBalanceService
.SetColumns(x => x.Version == x.Version + 1) .SetColumns(x => x.Version == x.Version + 1)
.SetColumns(x => x.Balance == x.Balance + amount) .SetColumns(x => x.Balance == x.Balance + amount)
.SetColumns(x => x.ModifiedTime == DateTime.Now) .SetColumns(x => x.ModifiedTime == DateTime.Now)
.Where(x => x.No == eNo && x.IdNo == idNo && x.Version == eDetail.Version) .Where(x => x.No == eNo && x.IdNo == idNo && x.Version == eDetail.Version)
.ExecuteCommandThrowVersionAsync(); .ExecuteCommandThrowVersionAsync();
}, 5); }, 5);
} }
@@ -604,6 +604,7 @@ public class BalanceService : IBalanceService
//重新核算 //重新核算
var balance = await _dbContext.Queryable<BalanceRecordEntity>() var balance = await _dbContext.Queryable<BalanceRecordEntity>()
.Where(x => x.UserCode == gainfo.Code) .Where(x => x.UserCode == gainfo.Code)
.Where(x => x.Source != BalanceRecordSourceEnumType.EMealVoucher)
.Where(x => x.Status == BalanceRecordStatusEnumType.Valid) .Where(x => x.Status == BalanceRecordStatusEnumType.Valid)
.SumAsync(x => x.Amount); .SumAsync(x => x.Amount);

2
Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs
View File

@@ -537,7 +537,7 @@ public class OrderService : BaseOrderService, IOrderService
var originData = eMealVoucherQrCode.OriginData.Split(':'); var originData = eMealVoucherQrCode.OriginData.Split(':');
var no = originData[0]; var no = originData[0];
var idNo = originData.Length == 4 ? originData[3] : originData[2]; var idNo = originData[3];
try try
{ {