diff --git a/Src/Dlhis.Canteen/Order/Request/OrderAddRequest.cs b/Src/Dlhis.Canteen/Order/Request/OrderAddRequest.cs index 9b8ff088..01760a96 100644 --- a/Src/Dlhis.Canteen/Order/Request/OrderAddRequest.cs +++ b/Src/Dlhis.Canteen/Order/Request/OrderAddRequest.cs @@ -56,20 +56,15 @@ public class OrderAddRequest : IValidatableObject //处理金额 Amount = Type == BalanceRecordTypeEnumType.In ? Math.Abs(Amount) : -Math.Abs(Amount); + + //在线就以API时间为准 + if (!IsOffline) + { + CostDateTime = DateTime.Now; + } + if (Type == BalanceRecordTypeEnumType.Out) { - //处理消费类型 - if ((int)Source >= (int)BalanceRecordSourceEnumType.Wechat) - { - yield return new ValidationResult($"不支持来源{Source.GetDescription()}", new[] { nameof(Source) }); - } - - //在线就以API时间为准 - if (!IsOffline) - { - CostDateTime = DateTime.Now; - } - if (DeviceUniqueNo.IsEmpty()) { yield return new ValidationResult("设备唯一号不能为空", new[] { nameof(DeviceUniqueNo) }); @@ -77,10 +72,12 @@ public class OrderAddRequest : IValidatableObject } else if (Type == BalanceRecordTypeEnumType.In) { - if ((int)Source < (int)BalanceRecordSourceEnumType.Wechat) - { - yield return new ValidationResult($"不支持来源{Source.GetDescription()}", new[] { nameof(Source) }); - } + //if ((int)Source < (int)BalanceRecordSourceEnumType.Wechat) + //{ + // yield return new ValidationResult($"不支持来源{Source.GetDescription()}", new[] { nameof(Source) }); + //} } + + yield break; } } diff --git a/Src/Dlhis.Entity/Canteen/Enums/BalanceRecordSourceEnumType.cs b/Src/Dlhis.Entity/Canteen/Enums/BalanceRecordSourceEnumType.cs index cb56bdbc..73c52bc0 100644 --- a/Src/Dlhis.Entity/Canteen/Enums/BalanceRecordSourceEnumType.cs +++ b/Src/Dlhis.Entity/Canteen/Enums/BalanceRecordSourceEnumType.cs @@ -9,23 +9,31 @@ namespace Dlhis.Entity.Canteen.Enums; public enum BalanceRecordSourceEnumType { /// - /// 卡消费 + /// 卡 /// - [Description("卡消费")] + [Description("卡")] Card = 100, /// - /// 人脸消费 + /// 人脸 /// - [Description("人脸消费")] + [Description("人脸")] Face, /// - /// 二维码消费 + /// 二维码 /// - [Description("二维码消费")] + [Description("二维码")] QrCode, + /// + /// 现金 + /// + [Description("现金")] + Cash, + + //********************************************************************************************************* + /// /// 来自微信 /// @@ -44,11 +52,13 @@ public enum BalanceRecordSourceEnumType [Description("银联")] UnionPay, + //********************************************************************************************************* + /// /// 来自本基地补贴 /// [Description("本基地补贴")] - LocalTenantSubsidies, + LocalTenantSubsidies = 300, /// /// 来自其他基地补贴