diff --git a/Src/Dlhis.Middle/Request/OrderAddRequest.cs b/Src/Dlhis.Middle/Request/OrderAddRequest.cs index a8cc25b4..acf711ed 100644 --- a/Src/Dlhis.Middle/Request/OrderAddRequest.cs +++ b/Src/Dlhis.Middle/Request/OrderAddRequest.cs @@ -1,10 +1,8 @@ -using System.ComponentModel.DataAnnotations; -using Dlhis.Entity.Canteen.Enums; -using Kurisu.AspNetCore.Utils.Extensions; +using Dlhis.Entity.Canteen.Enums; namespace Dlhis.Middle.Request; -public class OrderAddRequest : IValidatableObject +public class OrderAddRequest { /// /// 是否离线数据 @@ -24,19 +22,13 @@ public class OrderAddRequest : IValidatableObject /// /// 档案号/QrCode/学工号 /// - [Required(ErrorMessage = "人员档案号/QrCode/学工号/userId 不能为空")] public string UserUniqueNo { get; set; } /// /// 来源 /// - [EnumDataType(typeof(BalanceRecordSourceEnumType))] public BalanceRecordSourceEnumType Source { get; set; } - /// - /// 金额 - /// - [Range(0.01, double.MaxValue)] public decimal Amount { get; set; } /// @@ -44,20 +36,5 @@ public class OrderAddRequest : IValidatableObject /// public DateTime? CostDateTime { get; set; } - public string Image { get; set; } - - - public IEnumerable Validate(ValidationContext validationContext) - { - //处理金额 - Amount = -Math.Abs(Amount); - - CostDateTime ??= DateTime.Now; - - if (DeviceUniqueNo.IsEmpty()) - { - yield return new ValidationResult("设备号不能为空", new[] { nameof(DeviceUniqueNo) }); - } - } -} +} \ No newline at end of file diff --git a/Src/Dlhis.Middle/Services/Implements/RemoteOrderService.cs b/Src/Dlhis.Middle/Services/Implements/RemoteOrderService.cs index cda2a8b7..55385ecb 100644 --- a/Src/Dlhis.Middle/Services/Implements/RemoteOrderService.cs +++ b/Src/Dlhis.Middle/Services/Implements/RemoteOrderService.cs @@ -44,7 +44,7 @@ public class RemoteOrderService : IRemoteOrderService var content = new StringContent(request.ToJson(), Encoding.UTF8, "application/json"); - var response = await httpClient.PostAsync($"https://{_hostName}/api/Canteen/Orders/device", content); + var response = await httpClient.PostAsync($"https://{_hostName}/api/canteen/orders", content); var responseJson = await response.Content.ReadAsStringAsync(); return responseJson.ToObject>();