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:
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
Download Patch File Download Diff File Expand all files Collapse all files

11
Src/Dlhis.Basic/Dishes/Response/BalanceRecordSourceEnumDto.cs Normal file
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();
}
}

2
Src/Dlhis.Basic/Dishes/Response/GetDishesMenusBookingResponse.cs
View File

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

64
Src/Dlhis.Basic/Dishes/Services/Implements/DishesService.cs
View File

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