admin/Backend-Api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add Reward To checkout Completed

Browse Source
This commit is contained in:
gozareshgir
2026-01-24 18:57:53 +03:30
parent 69f4819bf6
commit c97ea5356f
7 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
AccountManagement.Application.Contracts/AccountManagement.Application.Contracts.csproj
View File

@@ -2,6 +2,7 @@
<PropertyGroup> <PropertyGroup>
<TargetFramework>net10.0</TargetFramework> <TargetFramework>net10.0</TargetFramework>
<NuGetAudit>false</NuGetAudit>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

3
Company.Domain/CheckoutAgg/ValueObjects/CheckoutReward.cs
View File

@@ -4,7 +4,7 @@ namespace Company.Domain.CheckoutAgg.ValueObjects;
public class CheckoutReward public class CheckoutReward
{ {
public CheckoutReward(string amount, double amountDouble, string grantDateFa, DateTime grantDateGr, string description, string title) public CheckoutReward(string amount, double amountDouble, string grantDateFa, DateTime grantDateGr, string description, string title, long entityId)
{ {
Amount = amount; Amount = amount;
AmountDouble = amountDouble; AmountDouble = amountDouble;
@@ -12,6 +12,7 @@ public class CheckoutReward
GrantDateGr = grantDateGr; GrantDateGr = grantDateGr;
Description = description; Description = description;
Title = title; Title = title;
EntityId = entityId;
} }
/// <summary> /// <summary>

1
CompanyManagment.App.Contracts/CompanyManagment.App.Contracts.csproj
View File

@@ -4,6 +4,7 @@
<TargetFramework>net10.0</TargetFramework> <TargetFramework>net10.0</TargetFramework>
<GenerateDocumentationFile>true</GenerateDocumentationFile> <GenerateDocumentationFile>true</GenerateDocumentationFile>
<NoWarn>$(NoWarn);1591</NoWarn> <NoWarn>$(NoWarn);1591</NoWarn>
<NuGetAudit>false</NuGetAudit>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

4
CompanyManagment.Application/CheckoutApplication.cs
View File

@@ -244,8 +244,8 @@ public class CheckoutApplication : ICheckoutApplication
double rewardPay = 0; double rewardPay = 0;
if (command.RewardPayCompute) if (command.RewardPayCompute)
{ {
rewards = _rollCallMandatoryRepository.RewardForCheckout(command.EmployeeId, command.WorkshopId, checkoutStart.ToGeorgianDateTime(), checkoutEnd.ToGeorgianDateTime()) rewards = _rollCallMandatoryRepository.RewardForCheckout(command.EmployeeId, command.WorkshopId, checkoutEnd.ToGeorgianDateTime(), checkoutStart.ToGeorgianDateTime())
.Select(x => new CheckoutReward(x.Amount, x.AmountDouble, x.GrantDateFa, x.GrantDateGr, x.Description, x.Title)).ToList(); .Select(x => new CheckoutReward(x.Amount, x.AmountDouble, x.GrantDateFa, x.GrantDateGr, x.Description, x.Title, x.Id)).ToList();
rewardPay = rewards.Sum(x => x.AmountDouble); rewardPay = rewards.Sum(x => x.AmountDouble);
} }

4
CompanyManagment.EFCore/Repository/RollCallMandatoryRepository.cs
View File

@@ -5202,7 +5202,7 @@ public class RollCallMandatoryRepository : RepositoryBase<long, RollCall>, IRoll
public List<RewardViewModel> RewardForCheckout(long employeeId, long workshopId, DateTime checkoutEnd, public List<RewardViewModel> RewardForCheckout(long employeeId, long workshopId, DateTime checkoutEnd,
DateTime checkoutStart) DateTime checkoutStart)
{ {
return _context.Rewards.Where(x => var result = _context.Rewards.Where(x =>
x.WorkshopId == workshopId && x.EmployeeId == employeeId && x.GrantDate <= checkoutEnd && x.WorkshopId == workshopId && x.EmployeeId == employeeId && x.GrantDate <= checkoutEnd &&
x.GrantDate >= checkoutStart).Select(x => new RewardViewModel x.GrantDate >= checkoutStart).Select(x => new RewardViewModel
{ {
@@ -5215,6 +5215,8 @@ public class RollCallMandatoryRepository : RepositoryBase<long, RollCall>, IRoll
IsActive = x.IsActive, IsActive = x.IsActive,
Id = x.id Id = x.id
}).ToList(); }).ToList();
return result;
} }
private List<FineViewModel> FinesForCheckout(long employeeId, long workshopId, DateTime contractStart, private List<FineViewModel> FinesForCheckout(long employeeId, long workshopId, DateTime contractStart,

1
WorkFlow/Application/WorkFlow.Application.Contracts/WorkFlow.Application.Contracts.csproj
View File

@@ -4,6 +4,7 @@
<TargetFramework>net10.0</TargetFramework> <TargetFramework>net10.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<NuGetAudit>false</NuGetAudit>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

5
gg.text Normal file
View File

@@ -0,0 +1,5 @@
<Project>
<PropertyGroup>
<NuGetAuditMode>None</NuGetAuditMode>
</PropertyGroup>
</Project>