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

fix nullable处理

Browse Source
This commit is contained in:
liguoyang
2024-04-07 15:45:05 +08:00
parent 4c2e6d0d8e
commit cfcf9a27a6
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,9 +22,9 @@ namespace Dlhis.Canteen.Order.Services.Implements;
public class OrderService : BaseOrderService, IOrderService public class OrderService : BaseOrderService, IOrderService
{ {
public OrderService(ICanteenSettingService canteenSettingService, public OrderService(ICanteenSettingService canteenSettingService,
IDbContext dbContext, IDbContext dbContext,
ICurrentUser currentUser, ICurrentUser currentUser,
IDevicePermissionApi devicePermissionApi, IDevicePermissionApi devicePermissionApi,
ILogger<OrderService> logger) ILogger<OrderService> logger)
: base(canteenSettingService, dbContext, currentUser, devicePermissionApi, logger) : base(canteenSettingService, dbContext, currentUser, devicePermissionApi, logger)
@@ -366,6 +366,7 @@ public class OrderService : BaseOrderService, IOrderService
var balanceRecords = await DbContext.Queryable<BalanceRecordEntity>() var balanceRecords = await DbContext.Queryable<BalanceRecordEntity>()
.Where(x => x.UserNo == order.UserNo) .Where(x => x.UserNo == order.UserNo)
.Where(x=>x.Type == BalanceRecordTypeEnumType.Out)
.Where(x => x.CreateTime >= beginOfDay && x.CreateTime <= endOfDay) //今天消费记录 .Where(x => x.CreateTime >= beginOfDay && x.CreateTime <= endOfDay) //今天消费记录
.ToListAsync(); .ToListAsync();
@@ -376,7 +377,9 @@ public class OrderService : BaseOrderService, IOrderService
.Where(x => x.Catalog == CanteenBusinessPlaceCatalogEnumType.Supermarket) .Where(x => x.Catalog == CanteenBusinessPlaceCatalogEnumType.Supermarket)
.Select(x => x.Code).ToListAsync(); .Select(x => x.Code).ToListAsync();
var cost = balanceRecords.Where(x => businessPlaceCodes.Contains(x.BusinessPlaceCode.Value)).Sum(x => x.Amount); var cost = balanceRecords.Where(x => x.BusinessPlaceCode.HasValue)
.Where(x => businessPlaceCodes.Contains(x.BusinessPlaceCode.Value))
.Sum(x => x.Amount);
if (cost + Math.Abs(order.Amount) > dayMarketCostMax) if (cost + Math.Abs(order.Amount) > dayMarketCostMax)
{ {
throw new UserFriendlyException($"超出当天超市消费限制({dayMarketCostMax}),无法消费"); throw new UserFriendlyException($"超出当天超市消费限制({dayMarketCostMax}),无法消费");