fix 区间判断临时处理

This commit is contained in:
2024-01-10 19:10:38 +08:00
parent 3e5e9e4d0a
commit 1738e52d8d
2 changed files with 10 additions and 6 deletions

View File

@@ -57,13 +57,15 @@ public class OrderService : IOrderService
Start = x.Start,
End = x.End,
}.IsPresent(request.CostDateTime));
}.IsPresent1(request.CostDateTime));
//根据档案号
var canteenUser = await _dbContext.Queryable<CanteenUserEntity>()
.Where(x => x.UserNo == request.UserUniqueNo || x.UserCode == request.UserUniqueNo)
.FirstAsync();
canteenUser.ThrowIfNull($"{request.DeviceUniqueNo}不存在,无法就餐");
var gafinfo = await _dbContext.Queryable<GainfoEntity>()
.Where(x => x.No == canteenUser.UserNo)
.FirstAsync();
@@ -75,8 +77,8 @@ public class OrderService : IOrderService
var shiftTimePeriod = new TimePeriod()
{
Start = shift.Start,
End = shift.End
Start = shift?.Start,
End = shift?.End
};
//成本日期 todo 优化
@@ -148,7 +150,7 @@ public class OrderService : IOrderService
DateTime costDateTime)
{
var order = await _dbContext.Queryable<CanteenOrderEntity>().Where(x => x.Id == orderId).FirstAsync();
await Verify(settings, shifts, costDateTime, order);//校验
for (int i = 0; i < 5; i++)
@@ -205,7 +207,7 @@ public class OrderService : IOrderService
Start = x.Start,
End = x.End,
}.IsPresent(costDateTime)).ThrowIfNull("当前非就餐时间,无法消费");
}.IsPresent1(costDateTime)).ThrowIfNull("当前非就餐时间,无法消费");
}
var beginOfDay = DateTime.Today;

View File

@@ -8,7 +8,7 @@ namespace Dlhis.Canteen.Order;
/// </summary>
public static class TimePeriodExtensions
{
public static bool IsPresent(this TimePeriod period, DateTime dateTime)
public static bool IsPresent1(this TimePeriod period, DateTime dateTime)
{
int hour = dateTime.Hour;
int minute = dateTime.Minute;
@@ -24,6 +24,8 @@ public static class TimePeriodExtensions
{
return minute < period.End.Value.Minute;
}
return true;
}
return false;