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

Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development

Browse Source
This commit is contained in:
cheche
2024-01-10 16:39:51 +08:00
parent be88816918 5e9d4ac2a6
commit 97f9d94846
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -69,7 +69,7 @@ public class OrderService : IOrderService
.FirstAsync(); .FirstAsync();
var settings = await _canteenSettingService.GetUserSettingAsync(gafinfo.No); var settings = await _canteenSettingService.GetUserSettingAsync(gafinfo.No);
var switchTime = GetSetting<TimeOnly>(settings, CanteenSettingItemEnumType.BusinessSwitchTime); var switchTime = GetSetting<TimeOnly?>(settings, CanteenSettingItemEnumType.BusinessSwitchTime);
//金额处理 //金额处理
request.Amount = request.Type == BalanceRecordTypeEnumType.In ? Math.Abs(request.Amount) : -Math.Abs(request.Amount); request.Amount = request.Type == BalanceRecordTypeEnumType.In ? Math.Abs(request.Amount) : -Math.Abs(request.Amount);
@@ -91,9 +91,12 @@ public class OrderService : IOrderService
costDate = DateTime.Now.AddDays(-1); costDate = DateTime.Now.AddDays(-1);
var beginOfDay = DateTime.Today; var beginOfDay = DateTime.Today;
var setTime = beginOfDay.Add(switchTime.ToTimeSpan()); if (switchTime.HasValue)
if (DateTime.Now < setTime) {
costDate = DateTime.Now.AddDays(-1); var setTime = beginOfDay.Add(switchTime.Value.ToTimeSpan());
if (DateTime.Now < setTime)
costDate = DateTime.Now.AddDays(-1);
}
} }
var order = new CanteenOrderEntity var order = new CanteenOrderEntity
@@ -119,9 +122,10 @@ public class OrderService : IOrderService
IsOffline = request.IsOffline, IsOffline = request.IsOffline,
IsCostCrossTenant = GetSetting<bool>(settings, CanteenSettingItemEnumType.AllowCrossTenant), IsCostCrossTenant = GetSetting<bool>(settings, CanteenSettingItemEnumType.AllowCrossTenant),
OriginTenantId = canteenUser.TenantId, OriginTenantId = canteenUser.TenantId,//人员可能跨基地消费
Status = BalanceRecordStatusEnumType.Doubtful, Status = BalanceRecordStatusEnumType.Doubtful,
TenantId = device.TenantId, //设备才能标识当前消费的基地
}; };
var id = await _dbContext.InsertReturnIdentityAsync(order); var id = await _dbContext.InsertReturnIdentityAsync(order);