From 175ca143e25943d5b5b8b79c0afbab8beda9efdf Mon Sep 17 00:00:00 2001
From: liguoyang <Ligy.97@foxmail.com>
Date: Mon, 1 Apr 2024 11:12:55 +0800
Subject: [PATCH] =?UTF-8?q?feat=20=E8=AE=A2=E5=8D=95=E6=B6=88=E8=B4=B9?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=A2=9E=E5=8A=A0=E8=BD=AF=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Order/Services/Implements/OrderService.cs              | 7 +++----
 Src/Dlhis.Entity/Canteen/Entities/BalanceRecordEntity.cs   | 6 +++++-
 .../Canteen/Entities/CanteenOrderDetailEntity.cs           | 6 +++++-
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs b/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs
index 71f18bf3..ef8c57a2 100644
--- a/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs
+++ b/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs
@@ -49,15 +49,14 @@ public class OrderService : BaseOrderService, IOrderService
         //消费权限控制
         await CheckPermissionAsync(gainfo.No, request.DeviceUniqueNo);
 
-        var canteenUserExists = await DbContext.Queryable<GainfoMealEntity>()
+        if (!await DbContext.Queryable<GainfoMealEntity>()
            .Where(x => x.UserNo == gainfo.No)
-           .AnyAsync();
-
-        if (!canteenUserExists)
+           .AnyAsync())
         {
             await DbContext.InsertAsync(new GainfoMealEntity
             {
                 UserNo = gainfo.No,
+                UserCode = gainfo.Code,
                 Balance = 0,
                 BalanceOfRecharge = 0,
                 BalanceOfSubsidies = 0,
diff --git a/Src/Dlhis.Entity/Canteen/Entities/BalanceRecordEntity.cs b/Src/Dlhis.Entity/Canteen/Entities/BalanceRecordEntity.cs
index 4a95d47f..3e091cfe 100644
--- a/Src/Dlhis.Entity/Canteen/Entities/BalanceRecordEntity.cs
+++ b/Src/Dlhis.Entity/Canteen/Entities/BalanceRecordEntity.cs
@@ -10,7 +10,7 @@ namespace Dlhis.Entity.Canteen.Entities;
 /// 充值/消费记录
 /// </summary>
 [SugarTable(TableName = "BalanceRecord", TableDescription = "充值/消费记录")]
-public class BalanceRecordEntity : SugarBaseEntity, ITenantId
+public class BalanceRecordEntity : SugarBaseEntity, ISoftDeleted, ITenantId
 {
     /// <summary>
     /// 流水号
@@ -147,4 +147,8 @@ public class BalanceRecordEntity : SugarBaseEntity, ITenantId
 
 
     public string TenantId { get; set; }
+
+
+    [SugarColumn(ColumnDataType = "bit")]
+    public bool IsDeleted { get; set; }
 }
\ No newline at end of file
diff --git a/Src/Dlhis.Entity/Canteen/Entities/CanteenOrderDetailEntity.cs b/Src/Dlhis.Entity/Canteen/Entities/CanteenOrderDetailEntity.cs
index 1627a0f7..e6a0285d 100644
--- a/Src/Dlhis.Entity/Canteen/Entities/CanteenOrderDetailEntity.cs
+++ b/Src/Dlhis.Entity/Canteen/Entities/CanteenOrderDetailEntity.cs
@@ -8,7 +8,7 @@ namespace Dlhis.Entity.Canteen.Entities;
 /// 订餐明细表
 /// </summary>
 [SugarTable(TableName = "CanteenOrderDetail", TableDescription = "订单明细表")]
-public class CanteenOrderDetailEntity : SugarBaseEntity, ITenantId
+public class CanteenOrderDetailEntity : SugarBaseEntity, ISoftDeleted, ITenantId
 {
     /// <summary>
     /// 订单号
@@ -47,4 +47,8 @@ public class CanteenOrderDetailEntity : SugarBaseEntity, ITenantId
     public string Unit { get; set; }
 
     public string TenantId { get; set; }
+
+
+    [SugarColumn(ColumnDataType = "bit")]
+    public bool IsDeleted { get; set; }
 }