fix 订餐null异常处理

This commit is contained in:
2024-03-19 19:51:56 +08:00
parent f427338715
commit f003e30169
18 changed files with 96 additions and 167 deletions

View File

@@ -8,9 +8,9 @@ public class DishesMenusBookingSettingResponse
public DateTime ServerTime { get; set; }
/// <summary>
/// 餐别-餐次信息
/// 订餐期限
/// </summary>
public List<BusinessShiftMealRelationshipResponse> ShiftInfos { get; set; }
public DateTime Deadline { get; set; }
/// <summary>
/// 支付方式

View File

@@ -178,7 +178,7 @@ public class DishesMenuService : IDishesMenuService
foreach (var item in request.Items)
{
var u = item.Date.ToString("yyyy-MM-dd") + "-" + item.CustomCode;
var u = item.Date.ToString("yyyy-MM-dd") + ". " + item.CustomCode;
(item.ShiftTypes.DistinctBy(x => x.ShiftType).Count() != item.ShiftTypes.Count).ThrowIfTrue($"{u}的餐次不可重复添加");

View File

@@ -66,12 +66,13 @@ public class DishesService : IDishesService
.Select(x => x.Value)
.FirstAsync();
DateTime dateTime;
DateTime.TryParseExact(strDatetime, "HH:mm:ss", null, System.Globalization.DateTimeStyles.None, out dateTime);
if (!TimeOnly.TryParse(strDatetime, out var deadline))
deadline = new TimeOnly(8, 30);
var res = new DishesMenusBookingSettingResponse
{
ServerTime = dateTime,
ServerTime = DateTime.Now,
Deadline = DateTime.Today.Add(deadline.ToTimeSpan())
};
var shift = await _dbContext.Queryable<BusinessPlaceShiftRelationshipEntity>()
@@ -87,11 +88,7 @@ public class DishesService : IDishesService
if (shift != null)
{
var businessShiftMealRelationships = await _dbContext.Queryable<BusinessShiftMealRelationshipEntity>()
.Where(x => x.ShiftCode == shift.ShiftCode)
.Select<BusinessShiftMealRelationshipResponse>()
.ToListAsync();
res.ShiftInfos = businessShiftMealRelationships;
if (shift.TenantId == request.Factory)
{
@@ -104,6 +101,7 @@ public class DishesService : IDishesService
}
res.PayTypes = payTypes;
return res;
}