diff --git a/Src/Dlhis.Canteen/Order/Request/BalanceSupplementRequest.cs b/Src/Dlhis.Canteen/Order/Request/BalanceSupplementRequest.cs index 1309dbe2..c55cd9e1 100644 --- a/Src/Dlhis.Canteen/Order/Request/BalanceSupplementRequest.cs +++ b/Src/Dlhis.Canteen/Order/Request/BalanceSupplementRequest.cs @@ -24,9 +24,13 @@ public class BalanceSupplementRequest : IValidatableObject public IEnumerable Validate(ValidationContext validationContext) { - if (Amount > 0) - { - yield return new ValidationResult("金额有误", new[] { nameof(Amount) }); - } + //if (Amount > 0) + //{ + // yield return new ValidationResult("金额有误", new[] { nameof(Amount) }); + //} + + //都是消费处理 + Amount = -Math.Abs(Amount); + yield break; } } diff --git a/Src/Dlhis.ScheduledTask/DeviceUploadLog/Services/Implements/DeviceUploadLogService.cs b/Src/Dlhis.ScheduledTask/DeviceUploadLog/Services/Implements/DeviceUploadLogService.cs index f76ddb6e..eace219b 100644 --- a/Src/Dlhis.ScheduledTask/DeviceUploadLog/Services/Implements/DeviceUploadLogService.cs +++ b/Src/Dlhis.ScheduledTask/DeviceUploadLog/Services/Implements/DeviceUploadLogService.cs @@ -85,7 +85,7 @@ public class DeviceUploadLogService : IDeviceUploadLogService var device = devices.FirstOrDefault(item => item.UniqueNo == x.Key); if (device != null) { - return x.AsEnumerable().Select(item => new DeviceUploadLogEntity + return x.Select(item => new DeviceUploadLogEntity { DeviceUniqueNo = x.Key, UserUniqueNo = item.UserUniqueNo,