fix 重算排除电子餐券

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<BalanceRecordEntity>()
                 .Where(x => x.UserCode == gainfo.Code)
+                .Where(x => x.Source != BalanceRecordSourceEnumType.EMealVoucher)
                 .Where(x => x.Status == BalanceRecordStatusEnumType.Valid)
                 .SumAsync(x => x.Amount);
 

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
             {