From 3dbd8f3e35a438bc536bd14d295c9b05660161b7 Mon Sep 17 00:00:00 2001 From: liguoyang Date: Wed, 23 Oct 2024 13:28:25 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E9=87=8D=E7=AE=97=E6=8E=92=E9=99=A4?= =?UTF-8?q?=E7=94=B5=E5=AD=90=E9=A4=90=E5=88=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs | 3 ++- Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs b/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs index 3ee3e407..24e9fb11 100644 --- a/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs +++ b/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs @@ -140,7 +140,7 @@ public class BalanceService : IBalanceService .SetColumns(x => x.Version == x.Version + 1) .SetColumns(x => x.Balance == x.Balance + amount) .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(); }, 5); } @@ -604,6 +604,7 @@ public class BalanceService : IBalanceService //重新核算 var balance = await _dbContext.Queryable() .Where(x => x.UserCode == gainfo.Code) + .Where(x => x.Source != BalanceRecordSourceEnumType.EMealVoucher) .Where(x => x.Status == BalanceRecordStatusEnumType.Valid) .SumAsync(x => x.Amount); diff --git a/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs b/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs index 44574448..98e9356c 100644 --- a/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs +++ b/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs @@ -537,7 +537,7 @@ public class OrderService : BaseOrderService, IOrderService var originData = eMealVoucherQrCode.OriginData.Split(':'); var no = originData[0]; - var idNo = originData.Length == 4 ? originData[3] : originData[2]; + var idNo = originData[3]; try {