fix 返回支付方式中文描述

This commit is contained in:
cheche
2024-03-19 09:58:31 +08:00
committed by liguoyang
parent e548c780b8
commit 153f0ecd2a
3 changed files with 47 additions and 30 deletions

View File

@@ -0,0 +1,11 @@
using Dlhis.Entity.Canteen.Enums;
using Kurisu.AspNetCore.Utils.Extensions;
namespace Dlhis.Basic.Dishes.Response
{
public class BalanceRecordSourceEnumDto
{
public BalanceRecordSourceEnumType Type { get; set; }
public string TypeCN => Type.GetDescription();
}
}

View File

@@ -10,6 +10,6 @@ namespace Dlhis.Basic.Dishes.Response
public DateTime ServiceTime { get; set; } public DateTime ServiceTime { get; set; }
public List<BalanceRecordSourceEnumType> PayType { get; set; } public List<BalanceRecordSourceEnumDto> PayTypes { get; set; }
} }
} }

View File

@@ -63,17 +63,6 @@ public class DishesService : IDishesService
public async Task<GetDishesMenusBookingResponse> GetDishesMenusBookingSetting(GetDishesMenusBookingRequest request) public async Task<GetDishesMenusBookingResponse> GetDishesMenusBookingSetting(GetDishesMenusBookingRequest request)
{ {
try
{
var shift = await _dbContext.Queryable<BusinessPlaceShiftRelationshipEntity>()
.Where(x => x.PlaceCode == request.PlaceCode)
.FirstAsync();
var BusinessShiftMealRelationships = await _dbContext.Queryable<BusinessShiftMealRelationshipEntity>()
.Where(x => x.ShiftCode == shift.ShiftCode)
.Select<BusinessShiftMealRelationshipResponse>()
.ToListAsync();
// 读取最晚订餐的时间 // 读取最晚订餐的时间
var strDatetime = await _dbContext.Queryable<CanteenSettingEntity>() var strDatetime = await _dbContext.Queryable<CanteenSettingEntity>()
.Where(x => x.UniqueType == CanteenSettingUnqiueEnumType.Tenant && x.Item == CanteenSettingItemEnumType.BookingDeadline && x.Enable) .Where(x => x.UniqueType == CanteenSettingUnqiueEnumType.Tenant && x.Item == CanteenSettingItemEnumType.BookingDeadline && x.Enable)
@@ -83,27 +72,43 @@ public class DishesService : IDishesService
DateTime dateTime; DateTime dateTime;
DateTime.TryParseExact(strDatetime, "HH:mm:ss", null, System.Globalization.DateTimeStyles.None, out dateTime); DateTime.TryParseExact(strDatetime, "HH:mm:ss", null, System.Globalization.DateTimeStyles.None, out dateTime);
var payTypes = new List<BalanceRecordSourceEnumType> { BalanceRecordSourceEnumType.Cash };
if (shift.TenantId == request.Factory)
{
payTypes.Add(BalanceRecordSourceEnumType.LocalTenantSubsidies);
}
var res = new GetDishesMenusBookingResponse var res = new GetDishesMenusBookingResponse
{ {
BusinessShiftMealRelationships = BusinessShiftMealRelationships,
ServiceTime = dateTime, ServiceTime = dateTime,
PayType = payTypes
}; };
return res;
} var shift = await _dbContext.Queryable<BusinessPlaceShiftRelationshipEntity>()
catch (Exception ex) .Where(x => x.PlaceCode == request.PlaceCode)
.FirstAsync();
var payTypes = new List<BalanceRecordSourceEnumDto>();
var dto1 = new BalanceRecordSourceEnumDto
{ {
return new GetDishesMenusBookingResponse(); Type = BalanceRecordSourceEnumType.Cash
};
payTypes.Add(dto1);
if (shift != null)
{
var businessShiftMealRelationships = await _dbContext.Queryable<BusinessShiftMealRelationshipEntity>()
.Where(x => x.ShiftCode == shift.ShiftCode)
.Select<BusinessShiftMealRelationshipResponse>()
.ToListAsync();
res.BusinessShiftMealRelationships = businessShiftMealRelationships;
if (shift.TenantId == request.Factory)
{
var dto2 = new BalanceRecordSourceEnumDto
{
Type = BalanceRecordSourceEnumType.LocalTenantSubsidies
};
payTypes.Add(dto2);
} }
} }
res.PayTypes = payTypes;
return res;
}
public async Task<DishesDetailResponse> GetDishesDetailByIdAsync(long id) public async Task<DishesDetailResponse> GetDishesDetailByIdAsync(long id)
{ {
@@ -113,3 +118,4 @@ public class DishesService : IDishesService
.SingleAsync(); .SingleAsync();
} }
} }