From 1e98d9816a8f79b7a19364be4e47d4e3c8bf32b1 Mon Sep 17 00:00:00 2001
From: liguoyang <Ligy.97@foxmail.com>
Date: Thu, 11 Jan 2024 14:26:52 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E5=AD=97=E6=AE=B5=E5=90=8D=E7=A7=B0,?=
 =?UTF-8?q?=E6=B6=88=E8=B4=B9=E9=87=91=E9=A2=9D,=E5=AE=9E=E4=BD=93?=
 =?UTF-8?q?=E6=B3=A8=E8=A7=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Src/Dlhis.Basic/MealUser/Response/MealUserResponse.cs       | 4 +---
 Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs | 2 +-
 Src/Dlhis.Entity/Basic/Entity/DepartmentEntity.cs           | 4 ++--
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/Src/Dlhis.Basic/MealUser/Response/MealUserResponse.cs b/Src/Dlhis.Basic/MealUser/Response/MealUserResponse.cs
index 4e5bc79a..8f8ee0cb 100644
--- a/Src/Dlhis.Basic/MealUser/Response/MealUserResponse.cs
+++ b/Src/Dlhis.Basic/MealUser/Response/MealUserResponse.cs
@@ -1,6 +1,4 @@
 using Dlhis.Entity.Canteen.Enums;
-using SqlSugar.DbConvert;
-using SqlSugar;
 
 namespace Dlhis.Basic.MealUser.Response;
 
@@ -9,7 +7,7 @@ public class MealUserResponse
     /// <summary>
     /// 档案号
     /// </summary>
-    public string UserId { get; set; }
+    public string UserNo { get; set; }
 
 
     /// <summary>
diff --git a/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs b/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs
index 7e3ef6de..c7a94a64 100644
--- a/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs
+++ b/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs
@@ -193,7 +193,7 @@ public class OrderService : IOrderService
             }
 
             var effect = await _dbContext.Updateable<CanteenUserEntity>()
-                        .SetColumns(x => x.Balance == canteenUser.Balance + order.Amount)
+                        .SetColumns(x => x.Balance == canteenUser.Balance)
                         .SetColumns(x => x.Version == x.Version + 1)
                         .Where(x => x.UserNo == order.UserNo && x.Version == canteenUser.Version)//必须与查询时的version一致
                         .ExecuteCommandAsync();
diff --git a/Src/Dlhis.Entity/Basic/Entity/DepartmentEntity.cs b/Src/Dlhis.Entity/Basic/Entity/DepartmentEntity.cs
index bf4dc26c..ddf4eb7c 100644
--- a/Src/Dlhis.Entity/Basic/Entity/DepartmentEntity.cs
+++ b/Src/Dlhis.Entity/Basic/Entity/DepartmentEntity.cs
@@ -12,7 +12,7 @@ public class DepartmentEntity : SugarBaseEntity
     /// <summary>
     /// 部门号
     /// </summary>
-    [SugarColumn(ColumnDescription = "部门号")]
+    [SugarColumn(ColumnDescription = "部门号", IsNullable = false)]
     public string No { get; set; }
 
     /// <summary>
@@ -24,6 +24,6 @@ public class DepartmentEntity : SugarBaseEntity
     /// <summary>
     /// 部门名称
     /// </summary>
-    [SugarColumn(ColumnDescription = "部门名称")]
+    [SugarColumn(ColumnDescription = "部门名称" , IsNullable = false)]
     public string Name { get; set; }
 }