yuangb/jinko.yikatong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 移除No

Browse Source
This commit is contained in:
liguoyang
2024-08-21 16:05:40 +08:00
parent dd049b44b1
commit ac77a92c12
13 changed files with 25 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs
View File

@@ -128,12 +128,11 @@ public class BalanceService : IBalanceService
}
}
var userNo = balanceRecord.UserNo;
//获取人员余额
return await _dbContext.Queryable<GainfoMealEntity>()
.LeftJoin<GainfoEntity>((x, ga) => x.UserNo == ga.No)
.LeftJoin<GainfoEntity>((x, ga) => x.UserCode == ga.Code)
.LeftJoin<DepartmentEntity>((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,

8
Src/Dlhis.Canteen/Order/Services/Implements/BookingOrderService.cs
View File

@@ -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<GainfoMealEntity>().Where(x => x.UserNo == order.UserNo).FirstAsync();
var mealInfo = await DbContext.Queryable<GainfoMealEntity>().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<GainfoMealEntity>().Where(x => x.UserNo == order.UserNo).FirstAsync();
var mealInfo = await DbContext.Queryable<GainfoMealEntity>().Where(x => x.UserCode == order.UserCode).FirstAsync();
var setBalance = mealInfo.Balance + Math.Abs(order.Amount);
await DbContext.Updateable<GainfoMealEntity>()
.SetColumns(x => x.Version == x.Version + 1)

1
Src/Dlhis.Canteen/Order/Services/Implements/HainingBalanceService.cs
View File

@@ -30,7 +30,6 @@ public class HainingBalanceService : IHainingBalanceService
{
gainfoMeal = new GainfoMealEntity
{
UserNo = gainfo.No,
UserCode = gainfo.Code,
Balance = 0,
BalanceOfRecharge = 0,

4
Src/Dlhis.Canteen/Order/Services/Implements/MiddleService.cs
View File

@@ -30,9 +30,9 @@ public class MiddleService : IMiddleService
//获取人员余额
return await _dbContext.Queryable<GainfoMealEntity>()
.LeftJoin<GainfoEntity>((x, ga) => x.UserNo == ga.No)
.LeftJoin<GainfoEntity>((x, ga) => x.UserCode == ga.Code)
.LeftJoin<DepartmentEntity>((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,

13
Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs
View File

@@ -294,7 +294,7 @@ public class OrderService : BaseOrderService, IOrderService
await CommonHelper.RetryAsync(async () =>
{
var gainfoMeal = await DbContext.Queryable<GainfoMealEntity>().Where(x => x.UserNo == order.UserNo).SingleAsync();
var gainfoMeal = await DbContext.Queryable<GainfoMealEntity>().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<GainfoMealEntity>().Where(x => x.UserNo == order.UserNo).FirstAsync();
var gainfoMeal = await DbContext.Queryable<GainfoMealEntity>().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<GainfoMealEntity>()
.LeftJoin<GainfoEntity>((x, ga) => x.UserNo == ga.No)
.LeftJoin<GainfoEntity>((x, ga) => x.UserCode == ga.Code)
.LeftJoin<DepartmentEntity>((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,