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

fix 数据状态处理

Browse Source
This commit is contained in:
liguoyang
2024-04-11 12:48:00 +08:00
parent 7884b4d70e
commit 03c49b5e9f
3 changed files with 34 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -549,6 +549,7 @@ public class BalanceService : IBalanceService
.LeftJoin<DepartmentEntity>((record, ga, department) => ga.DepartmentNo == department.No)
.LeftJoin<BusinessPlaceEntity>((record, ga, department, bplace) => record.BusinessPlaceCode == bplace.Code)
.Where(record => record.Type == BalanceRecordTypeEnumType.Out)
.Where(record => record.Status == BalanceRecordStatusEnumType.Valid)
.WhereIF(request.SearchDateTimePeriod?.Start.HasValue == true, record => record.CostDate >= request.SearchDateTimePeriod.Start)
.WhereIF(request.SearchDateTimePeriod?.End.HasValue == true, record => record.CostDate <= request.SearchDateTimePeriod.End)
.WhereIF(request.ApplicationType.HasValue, record => record.ApplicationType == request.ApplicationType)

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

@@ -241,27 +241,36 @@ public class OrderService : BaseOrderService, IOrderService
{
if (!allowNoBalance)
{
var gainfoMeal = await DbContext.Queryable<GainfoMealEntity>().Where(x => x.UserNo == order.UserNo).FirstAsync();
if (gainfoMeal == null)
GainfoMealEntity gainfoMeal = null;
using (var handler = await _redisCache.LockAsync($"gainfo:meal:{order.UserNo}", retryInterval: TimeSpan.FromSeconds(1)))
{
gainfoMeal = new GainfoMealEntity
if (handler.Acquired)
{
Balance = 0,
BalanceOfRecharge = 0,
BalanceOfSubsidies = 0,
Version = 0,
TenantId = gainfo.Factory,
UserNo = order.UserNo,
UserCode = order.UserCode,
gainfoMeal = await DbContext.Queryable<GainfoMealEntity>().Where(x => x.UserNo == order.UserNo).FirstAsync();
if (gainfoMeal == null)
{
gainfoMeal = new GainfoMealEntity
{
Balance = 0,
BalanceOfRecharge = 0,
BalanceOfSubsidies = 0,
Version = 0,
TenantId = gainfo.Factory,
UserNo = order.UserNo,
UserCode = order.UserCode,
CreatedBy = 1,
CreateTime = DateTime.Now,
ModifiedBy = 1,
ModifiedTime = DateTime.Now,
};
CreatedBy = 1,
CreateTime = DateTime.Now,
ModifiedBy = 1,
ModifiedTime = DateTime.Now,
};
await DbContext.InsertAsync(gainfoMeal);
await DbContext.InsertAsync(gainfoMeal);
}
}
}
//金额+-
gainfoMeal.Balance += order.Amount;