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() + if (!await DbContext.Queryable() .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; /// 充值/消费记录 /// [SugarTable(TableName = "BalanceRecord", TableDescription = "充值/消费记录")] -public class BalanceRecordEntity : SugarBaseEntity, ITenantId +public class BalanceRecordEntity : SugarBaseEntity, ISoftDeleted, ITenantId { /// /// 流水号 @@ -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; /// 订餐明细表 /// [SugarTable(TableName = "CanteenOrderDetail", TableDescription = "订单明细表")] -public class CanteenOrderDetailEntity : SugarBaseEntity, ITenantId +public class CanteenOrderDetailEntity : SugarBaseEntity, ISoftDeleted, ITenantId { /// /// 订单号 @@ -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; } }