From 9440f4cf5815a957e6c3262f326a7ae353708a7b Mon Sep 17 00:00:00 2001
From: liguoyang <Ligy.97@foxmail.com>
Date: Thu, 18 Jan 2024 13:10:13 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E9=87=8D=E7=BD=AE=E6=B6=88=E8=B4=B9?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Order/Request/OrderAddRequest.cs          | 29 +++++++++----------
 .../Enums/BalanceRecordSourceEnumType.cs      | 24 ++++++++++-----
 2 files changed, 30 insertions(+), 23 deletions(-)

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
 {
     /// <summary>
-    /// 卡消费
+    /// 卡
     /// </summary>
-    [Description("卡消费")]
+    [Description("卡")]
     Card = 100,
 
     /// <summary>
-    /// 人脸消费
+    /// 人脸
     /// </summary>
-    [Description("人脸消费")]
+    [Description("人脸")]
     Face,
 
     /// <summary>
-    /// 二维码消费
+    /// 二维码
     /// </summary>
-    [Description("二维码消费")]
+    [Description("二维码")]
     QrCode,
 
+    /// <summary>
+    /// 现金
+    /// </summary>
+    [Description("现金")]
+    Cash,
+
+    //*********************************************************************************************************
+
     /// <summary>
     /// 来自微信
     /// </summary>
@@ -44,11 +52,13 @@ public enum BalanceRecordSourceEnumType
     [Description("银联")]
     UnionPay,
 
+    //*********************************************************************************************************
+
     /// <summary>
     /// 来自本基地补贴
     /// </summary>
     [Description("本基地补贴")]
-    LocalTenantSubsidies,
+    LocalTenantSubsidies = 300,
 
     /// <summary>
     /// 来自其他基地补贴