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

fix 优化注入redis情况

Browse Source
This commit is contained in:
liguoyang
2024-07-20 11:10:47 +08:00
parent 97c4384521
commit 2cab53c8a3
5 changed files with 46 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Src/Dlhis.Canteen/Order/Services/BaseOrderService.cs
View File

@@ -37,25 +37,14 @@ public abstract class BaseOrderService
/// 获取参数配置
/// </summary>
/// <typeparam name="T"></typeparam>
/// <param name="userNo"></param>
/// <param name="tenantId"></param>
/// <param name="item"></param>
/// <param name="defaultValue"></param>
/// <returns></returns>
protected async Task<T> GetSettingAsync<T>(string tenantId, CanteenSettingItemEnumType item, T defaultValue = default)
protected async Task<T> GetSettingAsync<T>(string userNo, string tenantId, CanteenSettingItemEnumType item, T defaultValue = default)
{
if (_settings == null)
{
var subjectId = _currentUser.GetIntSubjectId();
var gainfo = await _dbContext.Queryable<GainfoEntity>().Where(x => x.IdentityUserId == subjectId).FirstAsync();
var jinkoCode = _currentUser.GetUserClaim("jinko-code") ?? string.Empty;
if (jinkoCode.IsPresent())
{
gainfo = await _dbContext.Queryable<GainfoEntity>().Where(x => x.Code == jinkoCode).FirstAsync();
}
_settings = await _canteenSettingService.GetUserSettingAsync(gainfo.No, tenantId);
}
_settings ??= await _canteenSettingService.GetUserSettingAsync(userNo, tenantId);
if (_settings.TryGetValue(item, out var v))
{

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

@@ -41,7 +41,7 @@ public class BookingOrderService : BaseOrderService, IBookingOrderService
//预定时间
var now = DateTime.Now;
var bookingDeadline = await GetSettingAsync<TimeOnly?>(businessPlace.TenantId, CanteenSettingItemEnumType.BookingDeadline) ?? new TimeOnly(20, 30, 00);
var bookingDeadline = await GetSettingAsync<TimeOnly?>(gainfo.No, businessPlace.TenantId, CanteenSettingItemEnumType.BookingDeadline) ?? new TimeOnly(20, 30, 00);
var dealLine = DateTime.Today.Add(bookingDeadline.ToTimeSpan());
(now >= dealLine).ThrowIfTrue("超出订餐时间");
@@ -73,7 +73,7 @@ public class BookingOrderService : BaseOrderService, IBookingOrderService
No = SnowFlakeHelper.Instance.NextId().ToString(),
SubsidiesFromMonth = now.ToString("yyyyMM"),
IsOffline = false,
IsCostCrossTenant = await GetSettingAsync<bool>(businessPlace.TenantId, CanteenSettingItemEnumType.AllowCrossTenant),
IsCostCrossTenant = await GetSettingAsync<bool>(gainfo.No, businessPlace.TenantId, CanteenSettingItemEnumType.AllowCrossTenant),
OriginTenantId = gainfo.Factory, //人员可能跨基地消费
@@ -213,7 +213,7 @@ public class BookingOrderService : BaseOrderService, IBookingOrderService
var order = await DbContext.Queryable<CanteenOrderEntity>().Where(x => x.No == request.No).FirstAsync();
order.ThrowIfNull("订单不存在");
var bookingDeadline = await GetSettingAsync<TimeOnly?>(order.TenantId, CanteenSettingItemEnumType.BookingDeadline) ?? new TimeOnly(20, 30, 00);
var bookingDeadline = await GetSettingAsync<TimeOnly?>(order.No, order.TenantId, CanteenSettingItemEnumType.BookingDeadline) ?? new TimeOnly(20, 30, 00);
var dealLine = DateTime.Today.Add(bookingDeadline.ToTimeSpan());
(DateTime.Now >= dealLine).ThrowIfTrue("不在订单取消允许范围内,不可操作");

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

@@ -21,16 +21,16 @@ namespace Dlhis.Canteen.Order.Services.Implements;
public class OrderService : BaseOrderService, IOrderService
{
private readonly RedisCache _redisCache;
private readonly IServiceProvider _serviceProvider;
public OrderService(ICanteenSettingService canteenSettingService,
IDbContext dbContext,
ICurrentUser currentUser,
RedisCache redisCache,
IServiceProvider serviceProvider,
ILogger<OrderService> logger)
: base(canteenSettingService, dbContext, currentUser, logger)
{
_redisCache = redisCache;
_serviceProvider = serviceProvider;
}
public async Task<DefaultApiResult<OrderResultResponse>> DeviceConsume(OrderAddRequest request)
@@ -49,7 +49,7 @@ public class OrderService : BaseOrderService, IOrderService
.WhereIF(request.Source == BalanceRecordSourceEnumType.Card, x => x.CardNo == request.UserUniqueNo)
.WhereIF(request.Source != BalanceRecordSourceEnumType.Card && !request.IsUserId, x => x.Code == request.UserUniqueNo)
.WhereIF(request.Source != BalanceRecordSourceEnumType.Card && request.IsUserId && s, x => x.Id == userId)
.FirstAsync();
.SingleAsync();
if (gainfo == null && request.IsOffline)
{
@@ -66,20 +66,20 @@ public class OrderService : BaseOrderService, IOrderService
{
if (request.ThirdNo.IsPresent())
{
using (var handler = await _redisCache.LockAsync($"consume:device:{request.ThirdNo}"))
var redisCache = _serviceProvider.GetService<RedisCache>();
await using var handler = await redisCache.LockAsync($"consume:device:{request.ThirdNo}");
if (handler.Acquired)
{
if (handler.Acquired)
if (await ToCheckAsync(request.ThirdNo))
{
if (await ToCheckAsync(request.ThirdNo))
try
{
try
{
await HandleOfflineAsync(request.Adapt<ConsumeRequest>(), gainfo);
}
catch (Exception ex)
{
Logger.LogError(ex, "离线入库错误: 订单号:{no} .{message}", request.ThirdNo, ex.Message);
}
await HandleOfflineAsync(request.Adapt<ConsumeRequest>(), gainfo);
}
catch (Exception ex)
{
Logger.LogError(ex, "离线入库错误: 订单号:{no} .{message}", request.ThirdNo, ex.Message);
}
}
}
@@ -99,8 +99,6 @@ public class OrderService : BaseOrderService, IOrderService
else
{
gainfo.ThrowIfNull("无消费权限");
//todo
//await CheckPermissionAsync(gainfo.No, request.DeviceUniqueNo);
try
{
@@ -113,7 +111,6 @@ public class OrderService : BaseOrderService, IOrderService
}
}
//获取人员余额
var data = await DbContext.Queryable<GainfoMealEntity>()
.LeftJoin<GainfoEntity>((x, ga) => x.UserNo == ga.No)
@@ -175,7 +172,6 @@ public class OrderService : BaseOrderService, IOrderService
})
.FirstAsync();
//获取当前消费餐次
var shifts = await DbContext.Queryable<BusinessShiftMealRelationshipEntity>().Where(x => x.ShiftCode == businessPlaceInfo.ShiftCode).ToListAsync();
@@ -209,7 +205,7 @@ public class OrderService : BaseOrderService, IOrderService
No = SnowFlakeHelper.Instance.NextId().ToString(),
SubsidiesFromMonth = request.CostDateTime.ToString("yyyyMM"),
IsOffline = request.IsOffline,
IsCostCrossTenant = await GetSettingAsync<bool>(businessPlaceInfo.TenantId, CanteenSettingItemEnumType.AllowCrossTenant),
IsCostCrossTenant = businessPlaceInfo!.TenantId != gainfo.Factory,
OriginTenantId = gainfo.Factory,
Werks = gainfo.Werks,
@@ -221,21 +217,21 @@ public class OrderService : BaseOrderService, IOrderService
CostDateTime = request.CostDateTime,
//标识当前消费的基地
TenantId = businessPlaceInfo.TenantId,
TenantId = businessPlaceInfo!.TenantId,
};
await DbContext.InsertReturnIdentityAsync(order);
var allowNoBalance = await GetSettingAsync<bool>(businessPlaceInfo.TenantId, CanteenSettingItemEnumType.AllowNoBalance);
var allowNoBalance = await GetSettingAsync<bool>(gainfo.No, businessPlaceInfo.TenantId, CanteenSettingItemEnumType.AllowNoBalance);
await CommonHelper.RetryAsync(async () =>
{
if (!allowNoBalance)
{
GainfoMealEntity gainfoMeal = null;
using (var handler = await _redisCache.LockAsync($"gainfo:meal:{order.UserNo}", retryInterval: TimeSpan.FromSeconds(1)))
var redisCache = _serviceProvider.GetService<RedisCache>();
using (var handler = await redisCache.LockAsync($"gainfo:meal:{order.UserNo}", retryInterval: TimeSpan.FromSeconds(1)))
{
if (handler.Acquired)
{
@@ -298,14 +294,15 @@ public class OrderService : BaseOrderService, IOrderService
sr.ShiftCode,
x.TenantId
})
.FirstAsync();
.SingleAsync();
businessPlaceInfo.ThrowIfNull("设备尚未登记营业点");
//获取当前消费餐次
var shifts = await DbContext.Queryable<BusinessShiftMealRelationshipEntity>().Where(x => x.ShiftCode == businessPlaceInfo.ShiftCode).ToListAsync();
shifts.ThrowIfEmpty("营业点餐次尚未设置");
var shift = shifts.FirstOrDefault(x => new TimePeriod()
var shift = shifts.FirstOrDefault(x => new TimePeriod
{
Start = x.Start,
End = x.End
@@ -336,7 +333,7 @@ public class OrderService : BaseOrderService, IOrderService
No = SnowFlakeHelper.Instance.NextId().ToString(),
SubsidiesFromMonth = request.CostDateTime.ToString("yyyyMM"),
IsOffline = request.IsOffline,
IsCostCrossTenant = await GetSettingAsync<bool>(businessPlaceInfo.TenantId, CanteenSettingItemEnumType.AllowCrossTenant),
IsCostCrossTenant = await GetSettingAsync<bool>(gainfo.No, businessPlaceInfo!.TenantId, CanteenSettingItemEnumType.AllowCrossTenant),
OriginTenantId = gainfo.Factory,
Werks = gainfo.Werks,
@@ -396,13 +393,13 @@ public class OrderService : BaseOrderService, IOrderService
}
var pageResult = await DbContext.Queryable<CanteenOrderEntity>().Where(x => x.UserNo == gainfo.No)
.LeftJoin<BusinessPlaceEntity>((x, bplace) => x.BusinessPlaceCode == bplace.Code)
.LeftJoin<BusinessPlaceEntity>((x, bPlace) => x.BusinessPlaceCode == bPlace.Code)
.Where(x => x.ApplicationType == CanteenApplicationTypeEnumType.Booking)
.OrderBy(x => x.CreateTime, OrderByType.Desc)
.Select((x, bplace) => new OrderAggregationResponse
.Select((x, bPlace) => new OrderAggregationResponse
{
No = x.No,
BusinessPlaceName = bplace.Name,
BusinessPlaceName = bPlace.Name,
CreateTime = x.CreateTime,
Remark = x.Remark,
OrderStatus = x.OrderStatus,
@@ -440,7 +437,7 @@ public class OrderService : BaseOrderService, IOrderService
/// <returns></returns>
private async Task<DateTime> GetCostDateAsync(BusinessShiftMealRelationshipEntity shift, DateTime costDateTime)
{
var switchTime = await GetSettingAsync<TimeOnly?>(shift.TenantId, CanteenSettingItemEnumType.BusinessSwitchTime);
var switchTime = await GetSettingAsync<TimeOnly?>(string.Empty, shift.TenantId, CanteenSettingItemEnumType.BusinessSwitchTime);
var costDate = costDateTime.Date;
@@ -483,7 +480,7 @@ public class OrderService : BaseOrderService, IOrderService
.ToListAsync();
//一天消费金额
var dayCostMax = await GetSettingAsync<decimal>(order.TenantId, CanteenSettingItemEnumType.DayCostMax);
var dayCostMax = await GetSettingAsync<decimal>(order.UserNo, order.TenantId, CanteenSettingItemEnumType.DayCostMax);
if (dayCostMax != default)
{
//must has business place code, use .Value is safe
@@ -494,14 +491,14 @@ public class OrderService : BaseOrderService, IOrderService
}
//一次消费金额
var onceCostMax = await GetSettingAsync<decimal>(order.TenantId, CanteenSettingItemEnumType.OnceCostMax);
var onceCostMax = await GetSettingAsync<decimal>(order.UserNo, order.TenantId, CanteenSettingItemEnumType.OnceCostMax);
if (onceCostMax != default)
{
(Math.Abs(order.Amount) > onceCostMax).ThrowIfTrue($"单次消费金额不能超出{onceCostMax}元");
}
//超时消费限额
var dayMarketCostMax = await GetSettingAsync<decimal>(order.TenantId, CanteenSettingItemEnumType.DayMarketCostMax);
//超市消费限额
var dayMarketCostMax = await GetSettingAsync<decimal>(order.UserNo, order.TenantId, CanteenSettingItemEnumType.DayMarketCostMax);
if (dayMarketCostMax != default)
{
//current businessplace is supermarket
@@ -516,11 +513,11 @@ public class OrderService : BaseOrderService, IOrderService
}
//重复餐次消费
var allowRepeatInOneShift = await GetSettingAsync(order.TenantId, CanteenSettingItemEnumType.AllowRepeatInOneShift, true);
var allowRepeatInOneShift = await GetSettingAsync(order.UserNo, order.TenantId, CanteenSettingItemEnumType.AllowRepeatInOneShift, true);
if (!allowRepeatInOneShift)
{
var costCount = todayAllBalanceRecords.Count(x => x.ShiftType == order.ShiftType);
(costCount > 1).ThrowIfTrue($"{order?.ShiftType?.GetDescription()}不允许多次消费");
(costCount > 1).ThrowIfTrue($"{order.ShiftType?.GetDescription()}不允许多次消费");
}
}
@@ -534,16 +531,12 @@ public class OrderService : BaseOrderService, IOrderService
/// <exception cref="VersionExceptions"></exception>
private async Task GenerateConsumeRecordAsync(long orderId)
{
var order = await DbContext.Queryable<CanteenOrderEntity>().Where(x => x.Id == orderId).FirstAsync();
var order = await DbContext.Queryable<CanteenOrderEntity>().Where(x => x.Id == orderId).SingleAsync();
//校验
await Verify(order);
var allowNoBalance = await GetSettingAsync<bool>(order.TenantId, CanteenSettingItemEnumType.AllowNoBalance);
var allowNoBalance = await GetSettingAsync<bool>(order.UserNo, order.TenantId, CanteenSettingItemEnumType.AllowNoBalance);
////降级到读已提交
// await DbContext.Client.Ado.BeginTranAsync(IsolationLevel.ReadCommitted);
// try
// {
await CommonHelper.RetryAsync(async () =>
{
if (!allowNoBalance)
@@ -565,14 +558,6 @@ public class OrderService : BaseOrderService, IOrderService
var balanceRecord = order.Adapt<BalanceRecordEntity>();
await DbContext.InsertAsync(balanceRecord);
}, 5);
// await DbContext.Client.Ado.CommitTranAsync();
// }
// catch (Exception)
// {
// await DbContext.Client.Ado.RollbackTranAsync();
// throw;
// }
}
/// <summary>

12
Src/Dlhis.Canteen/Setting/Services/Implements/CanteenSettingService.cs
View File

@@ -90,17 +90,7 @@ public class CanteenSettingService : ICanteenSettingService
settings = settings.OrderBy(x => x.UniqueType).ToList();
var result = new Dictionary<CanteenSettingItemEnumType, string>();
settings.ForEach(x =>
{
if (result.ContainsKey(x.Item))
{
result[x.Item] = x.Value;
}
else
{
result.Add(x.Item, x.Value);
}
});
settings.ForEach(x => { result[x.Item] = x.Value; });
return result;
}