From ac77a92c12c3ec3d9e59729dedb5d0995de008e8 Mon Sep 17 00:00:00 2001 From: liguoyang Date: Wed, 21 Aug 2024 16:05:40 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E7=A7=BB=E9=99=A4No?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Services/Implements/GainfoGroupService.cs | 7 +++++-- .../Services/Implements/GainfoService.cs | 2 +- .../Implements/MealSupplementRecordService.cs | 1 - .../Order/Services/Implements/BalanceService.cs | 7 ++----- .../Services/Implements/BookingOrderService.cs | 8 ++++---- .../Services/Implements/HainingBalanceService.cs | 1 - .../Order/Services/Implements/MiddleService.cs | 4 ++-- .../Order/Services/Implements/OrderService.cs | 13 ++++++------- Src/Dlhis.Entity/Basic/Entity/GainfoMealEntity.cs | 6 ------ .../Services/Implements/OrderService.cs | 10 +++++----- .../Jobs/MealChunengSupplementHandlerJob.cs | 1 - .../Jobs/MealHainingSupplementHandlerJob.cs | 1 - .../Jobs/MealSupplementHandlerJob.cs | 1 - 13 files changed, 25 insertions(+), 37 deletions(-) diff --git a/Src/Dlhis.Basic/Organization/Services/Implements/GainfoGroupService.cs b/Src/Dlhis.Basic/Organization/Services/Implements/GainfoGroupService.cs index f9f0e50b..27fee37d 100644 --- a/Src/Dlhis.Basic/Organization/Services/Implements/GainfoGroupService.cs +++ b/Src/Dlhis.Basic/Organization/Services/Implements/GainfoGroupService.cs @@ -84,10 +84,13 @@ public class GainfoGroupService : IGainfoGroupService await _devicePermissionService.GenerateDeviceTasksAsync(async () => { - var relations = await _dbContext.Queryable().Where(x => x.GroupCode == request.GroupCode).ToListAsync(); + var relations = await _dbContext.Queryable() + .Where(x => x.GroupCode == request.GroupCode) + .ToListAsync(); await _dbContext.DeleteAsync(relations); - request.UserNos = await _dbContext.Queryable().Where(x => request.UserNos.Contains(x.No) || request.UserNos.Contains(x.Code)) + request.UserNos = await _dbContext.Queryable() + .Where(x => request.UserNos.Contains(x.No) || request.UserNos.Contains(x.Code)) .Select(x => x.No) .ToListAsync(); diff --git a/Src/Dlhis.Basic/Organization/Services/Implements/GainfoService.cs b/Src/Dlhis.Basic/Organization/Services/Implements/GainfoService.cs index 80615642..73657899 100644 --- a/Src/Dlhis.Basic/Organization/Services/Implements/GainfoService.cs +++ b/Src/Dlhis.Basic/Organization/Services/Implements/GainfoService.cs @@ -167,7 +167,7 @@ public class GainfoService : IGainfoService var info = await _gainfoStore.Queryable(GainfoStatusEnumType.Working) .LeftJoin((ga, department) => ga.DepartmentNo == department.No) - .LeftJoin((ga, department, mealUser) => ga.No == mealUser.UserNo) + .LeftJoin((ga, department, mealUser) => ga.Code == mealUser.UserCode) .LeftJoin((ga, department, mealUser, type) => type.Code == ga.CardType.ToString() && type.Type == "timeperiod") .Where((ga, department) => ga.Id == gainfo.Id) .Select((ga, department, mealUser, type) => new GainfoCurrentResponse diff --git a/Src/Dlhis.Canteen/MealSupplementRecord/Services/Implements/MealSupplementRecordService.cs b/Src/Dlhis.Canteen/MealSupplementRecord/Services/Implements/MealSupplementRecordService.cs index 6bb57af2..1528806e 100644 --- a/Src/Dlhis.Canteen/MealSupplementRecord/Services/Implements/MealSupplementRecordService.cs +++ b/Src/Dlhis.Canteen/MealSupplementRecord/Services/Implements/MealSupplementRecordService.cs @@ -189,7 +189,6 @@ public class MealSupplementRecordService : IMealSupplementRecordService { mealUser = new GainfoMealEntity { - UserNo = gainfo.No, UserCode = gainfo.Code, Balance = 0, BalanceOfRecharge = 0, diff --git a/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs b/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs index 8c6fedcc..dcf55279 100644 --- a/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs +++ b/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs @@ -128,12 +128,11 @@ public class BalanceService : IBalanceService } } - var userNo = balanceRecord.UserNo; //获取人员余额 return await _dbContext.Queryable() - .LeftJoin((x, ga) => x.UserNo == ga.No) + .LeftJoin((x, ga) => x.UserCode == ga.Code) .LeftJoin((x, ga, department) => ga.DepartmentNo == department.No) - .Where(x => x.UserNo == userNo) + .Where(x => x.UserCode == balanceRecord.UserCode) .Select((x, ga, department) => new OrderResultResponse { UserCode = ga.Code, @@ -525,7 +524,6 @@ public class BalanceService : IBalanceService { gainfoMeal = new GainfoMealEntity { - UserNo = gainfo.No, UserCode = gainfo.Code, Balance = 0, BalanceOfRecharge = 0, @@ -565,7 +563,6 @@ public class BalanceService : IBalanceService { gainfoMeal = new GainfoMealEntity { - UserNo = gainfo.No, UserCode = gainfo.Code, Balance = 0, BalanceOfRecharge = 0, diff --git a/Src/Dlhis.Canteen/Order/Services/Implements/BookingOrderService.cs b/Src/Dlhis.Canteen/Order/Services/Implements/BookingOrderService.cs index afff04cd..e149c83b 100644 --- a/Src/Dlhis.Canteen/Order/Services/Implements/BookingOrderService.cs +++ b/Src/Dlhis.Canteen/Order/Services/Implements/BookingOrderService.cs @@ -85,7 +85,7 @@ public class BookingOrderService : BaseOrderService, IBookingOrderService TenantId = businessPlace.TenantId, }; - var orderId = await DbContext.InsertReturnIdentityAsync(order); + await DbContext.InsertAsync(order); await CommonHelper.RetryAsync(async () => { await _dishesMenuApi.GetBookingDishesDetailAsync(request.BookingDate, request.BusinessPlaceCode, (int)request.ShiftType, request.DishesCode); @@ -98,7 +98,7 @@ public class BookingOrderService : BaseOrderService, IBookingOrderService //餐补 if (request.Source == BalanceRecordSourceEnumType.LocalTenantSubsidies) { - var mealInfo = await DbContext.Queryable().Where(x => x.UserNo == order.UserNo).FirstAsync(); + var mealInfo = await DbContext.Queryable().Where(x => x.UserCode == order.UserCode).FirstAsync(); mealInfo.ThrowIfNull("余额不足,无法消费"); //金额+- @@ -109,7 +109,7 @@ public class BookingOrderService : BaseOrderService, IBookingOrderService .SetColumns(x => x.Balance == mealInfo.Balance) .SetColumns(x => x.Version == x.Version + 1) .SetColumns(x => x.ModifiedTime == DateTime.Now) - .Where(x => x.UserNo == order.UserNo && x.Version == mealInfo.Version) //必须与查询时的version一致 + .Where(x => x.UserCode == order.UserCode && x.Version == mealInfo.Version) //必须与查询时的version一致 .ExecuteCommandThrowVersionAsync(); } @@ -252,7 +252,7 @@ public class BookingOrderService : BaseOrderService, IBookingOrderService { await CommonHelper.RetryAsync(async () => { - var mealInfo = await DbContext.Queryable().Where(x => x.UserNo == order.UserNo).FirstAsync(); + var mealInfo = await DbContext.Queryable().Where(x => x.UserCode == order.UserCode).FirstAsync(); var setBalance = mealInfo.Balance + Math.Abs(order.Amount); await DbContext.Updateable() .SetColumns(x => x.Version == x.Version + 1) diff --git a/Src/Dlhis.Canteen/Order/Services/Implements/HainingBalanceService.cs b/Src/Dlhis.Canteen/Order/Services/Implements/HainingBalanceService.cs index 46ac4779..f9cbd59c 100644 --- a/Src/Dlhis.Canteen/Order/Services/Implements/HainingBalanceService.cs +++ b/Src/Dlhis.Canteen/Order/Services/Implements/HainingBalanceService.cs @@ -30,7 +30,6 @@ public class HainingBalanceService : IHainingBalanceService { gainfoMeal = new GainfoMealEntity { - UserNo = gainfo.No, UserCode = gainfo.Code, Balance = 0, BalanceOfRecharge = 0, diff --git a/Src/Dlhis.Canteen/Order/Services/Implements/MiddleService.cs b/Src/Dlhis.Canteen/Order/Services/Implements/MiddleService.cs index 418eafae..213b4c83 100644 --- a/Src/Dlhis.Canteen/Order/Services/Implements/MiddleService.cs +++ b/Src/Dlhis.Canteen/Order/Services/Implements/MiddleService.cs @@ -30,9 +30,9 @@ public class MiddleService : IMiddleService //获取人员余额 return await _dbContext.Queryable() - .LeftJoin((x, ga) => x.UserNo == ga.No) + .LeftJoin((x, ga) => x.UserCode == ga.Code) .LeftJoin((x, ga, department) => ga.DepartmentNo == department.No) - .Where(x => x.UserNo == entity.UserNo) + .Where(x => x.UserCode == entity.UserCode) .Select((x, ga, department) => new OrderResultResponse { UserCode = ga.Code, diff --git a/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs b/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs index 4d0b3eed..4916a86c 100644 --- a/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs +++ b/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs @@ -294,7 +294,7 @@ public class OrderService : BaseOrderService, IOrderService await CommonHelper.RetryAsync(async () => { - var gainfoMeal = await DbContext.Queryable().Where(x => x.UserNo == order.UserNo).SingleAsync(); + var gainfoMeal = await DbContext.Queryable().Where(x => x.UserCode == order.UserCode).SingleAsync(); //金额+- gainfoMeal.Balance += order.Amount; (gainfoMeal.Balance < 0).ThrowIfTrue("余额不足,无法消费"); @@ -303,7 +303,7 @@ public class OrderService : BaseOrderService, IOrderService .SetColumns(x => x.Balance == gainfoMeal.Balance) .SetColumns(x => x.Version == x.Version + 1) .SetColumns(x => x.ModifiedTime == DateTime.Now) - .Where(x => x.UserNo == order.UserNo && x.Version == gainfoMeal.Version) //必须与查询时的version一致 + .Where(x => x.UserCode == order.UserCode && x.Version == gainfoMeal.Version) //必须与查询时的version一致 .ExecuteCommandThrowVersionAsync(); //写入记录 @@ -390,7 +390,7 @@ public class OrderService : BaseOrderService, IOrderService await using var handler = await redisCache.LockAsync($"gainfo:meal:{order.UserNo}", retryInterval: TimeSpan.FromSeconds(1)); if (handler.Acquired) { - var gainfoMeal = await DbContext.Queryable().Where(x => x.UserNo == order.UserNo).FirstAsync(); + var gainfoMeal = await DbContext.Queryable().Where(x => x.UserCode == order.UserCode).FirstAsync(); if (gainfoMeal == null) { gainfoMeal = new GainfoMealEntity @@ -399,7 +399,6 @@ public class OrderService : BaseOrderService, IOrderService BalanceOfRecharge = 0, BalanceOfSubsidies = 0, Version = 0, - UserNo = order.UserNo, UserCode = order.UserCode, }; @@ -413,7 +412,7 @@ public class OrderService : BaseOrderService, IOrderService .SetColumns(x => x.Balance == gainfoMeal.Balance) .SetColumns(x => x.Version == x.Version + 1) .SetColumns(x => x.ModifiedTime == DateTime.Now) - .Where(x => x.UserNo == order.UserNo && x.Version == gainfoMeal.Version) //必须与查询时的version一致 + .Where(x => x.UserCode == order.UserCode && x.Version == gainfoMeal.Version) //必须与查询时的version一致 .ExecuteCommandThrowVersionAsync(); //写入记录 @@ -610,9 +609,9 @@ public class OrderService : BaseOrderService, IOrderService //获取人员余额 var data = await DbContext.Queryable() - .LeftJoin((x, ga) => x.UserNo == ga.No) + .LeftJoin((x, ga) => x.UserCode == ga.Code) .LeftJoin((x, ga, department) => ga.DepartmentNo == department.No) - .Where(x => x.UserNo == gainfo.No) + .Where(x => x.UserCode == gainfo.Code) .Select((x, ga, department) => new OrderResultResponse { UserCode = ga.Code, diff --git a/Src/Dlhis.Entity/Basic/Entity/GainfoMealEntity.cs b/Src/Dlhis.Entity/Basic/Entity/GainfoMealEntity.cs index 75cd45b1..1d311bc6 100644 --- a/Src/Dlhis.Entity/Basic/Entity/GainfoMealEntity.cs +++ b/Src/Dlhis.Entity/Basic/Entity/GainfoMealEntity.cs @@ -10,12 +10,6 @@ namespace Dlhis.Entity.Basic.Entity [SugarTable(TableName = "GainfoMeal", TableDescription = "就餐人员")] public class GainfoMealEntity : SugarBaseEntity, IVersion { - /// - /// 档案号 - /// - [SugarColumn(IsNullable = false, ColumnDescription = "档案号", UniqueGroupNameList = new[] { "idx_CanteenUser_UserNo" })] - public string UserNo { get; set; } - /// /// 工号 /// diff --git a/Src/Dlhis.Middle/Services/Implements/OrderService.cs b/Src/Dlhis.Middle/Services/Implements/OrderService.cs index 18a2a629..919663c6 100644 --- a/Src/Dlhis.Middle/Services/Implements/OrderService.cs +++ b/Src/Dlhis.Middle/Services/Implements/OrderService.cs @@ -70,7 +70,7 @@ public class OrderService : IOrderService var isError = false; try { - (await _dbContext.Queryable().Where(x => x.UserNo == gainfo.No).AnyAsync()).ThrowIfFalse("余额不足,无法消费"); + (await _dbContext.Queryable().Where(x => x.UserCode == gainfo.Code).AnyAsync()).ThrowIfFalse("余额不足,无法消费"); await ConsumeAsync(request.Adapt(), gainfo); } catch (Exception ex) @@ -81,9 +81,9 @@ public class OrderService : IOrderService //获取人员余额 var data = await _dbContext.Queryable() - .LeftJoin((x, ga) => x.UserNo == ga.No) + .LeftJoin((x, ga) => x.UserCode == ga.Code) .LeftJoin((x, ga, department) => ga.DepartmentNo == department.No) - .Where(x => x.UserNo == gainfo.No) + .Where(x => x.UserCode == gainfo.Code) .Select((x, ga, department) => new OrderResultResponse { UserCode = ga.Code, @@ -196,7 +196,7 @@ public class OrderService : IOrderService { if (!allowNoBalance) { - var gainfoMeal = await _dbContext.Queryable().Where(x => x.UserNo == balanceRecord.UserNo).SingleAsync(); + var gainfoMeal = await _dbContext.Queryable().Where(x => x.UserCode == balanceRecord.UserCode).SingleAsync(); //金额+- gainfoMeal.Balance -= Math.Abs(balanceRecord.Amount); @@ -206,7 +206,7 @@ public class OrderService : IOrderService .SetColumns(x => x.Balance == gainfoMeal.Balance) .SetColumns(x => x.Version == x.Version + 1) .SetColumns(x => x.ModifiedTime == DateTime.Now) - .Where(x => x.UserNo == balanceRecord.UserNo && x.Version == gainfoMeal.Version) //必须与查询时的version一致 + .Where(x => x.UserCode == balanceRecord.UserCode && x.Version == gainfoMeal.Version) //必须与查询时的version一致 .ExecuteCommandThrowVersionAsync(); } diff --git a/Src/Dlhis.ScheduledTask/Jobs/MealChunengSupplementHandlerJob.cs b/Src/Dlhis.ScheduledTask/Jobs/MealChunengSupplementHandlerJob.cs index 9d652ee3..88a0a9ad 100644 --- a/Src/Dlhis.ScheduledTask/Jobs/MealChunengSupplementHandlerJob.cs +++ b/Src/Dlhis.ScheduledTask/Jobs/MealChunengSupplementHandlerJob.cs @@ -101,7 +101,6 @@ public class MealChunengSupplementHandlerJob : BaseJob Balance = 0, BalanceOfRecharge = 0, BalanceOfSubsidies = 0, - UserNo = gainfo.No, UserCode = gainfo.Code, Version = 0, }; diff --git a/Src/Dlhis.ScheduledTask/Jobs/MealHainingSupplementHandlerJob.cs b/Src/Dlhis.ScheduledTask/Jobs/MealHainingSupplementHandlerJob.cs index 5639f42c..c405fe81 100644 --- a/Src/Dlhis.ScheduledTask/Jobs/MealHainingSupplementHandlerJob.cs +++ b/Src/Dlhis.ScheduledTask/Jobs/MealHainingSupplementHandlerJob.cs @@ -101,7 +101,6 @@ public class MealHainingSupplementHandlerJob : BaseJob Balance = 0, BalanceOfRecharge = 0, BalanceOfSubsidies = 0, - UserNo = gainfo.No, UserCode = gainfo.Code, Version = 0, }; diff --git a/Src/Dlhis.ScheduledTask/Jobs/MealSupplementHandlerJob.cs b/Src/Dlhis.ScheduledTask/Jobs/MealSupplementHandlerJob.cs index 1a3698ca..078428fc 100644 --- a/Src/Dlhis.ScheduledTask/Jobs/MealSupplementHandlerJob.cs +++ b/Src/Dlhis.ScheduledTask/Jobs/MealSupplementHandlerJob.cs @@ -101,7 +101,6 @@ public class MealSupplementHandlerJob : BaseJob Balance = 0, BalanceOfRecharge = 0, BalanceOfSubsidies = 0, - UserNo = gainfo.No, UserCode = gainfo.Code, Version = 0, };