treshenkov/clearing
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

clearing-service http://jira.mfd.msk:8088/browse/CLS-500

Browse source
This commit is contained in:
AKurakin 2023-09-04 12:33:07 +03:00
parent 199d9b3c58
commit 5d7772d45e
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/validation/RefundDateValidationRule.java
View file

@ -47,12 +47,17 @@ public enum RefundDateValidationRule implements IValidationRule<ImdgValidationCo
Collection<Registry> rgss = rgsImdg.getCollectionObjectsByPredicate(prdct).stream() Collection<Registry> rgss = rgsImdg.getCollectionObjectsByPredicate(prdct).stream()
.filter(rgs -> Objects.nonNull(rgs.getSettlementDate())) .filter(rgs -> Objects.nonNull(rgs.getSettlementDate()))
.filter(rgs -> Objects.nonNull(rgs.getValueDate())) .filter(rgs -> Objects.nonNull(rgs.getValueDate()))
.filter(rgs -> rgs.getValueDate().isBefore(rgs.getSettlementDate())) .filter(rgs -> rgs.getRefundDate().equals(rgs.getSettlementDate()))
.collect(Collectors.toList()); .collect(Collectors.toList());
if (rgss.size() < 1) { if (rgss.size() < 1) {
return of(ClearingError.RecordNotFound, "groupId=" + validatedObject.getGroupId()); return of(ClearingError.RecordNotFound, "groupId=" + validatedObject.getGroupId());
} }
for (Registry rgs : rgss) {
if (!validatedObject.getRefundDate().isAfter(rgs.getValueDate())) {
return of(ClearingError.WrongFieldValue, "refundDate");
}
}
context.storeObject(ValidationStored.RefundDateChangeRegistries, rgss); context.storeObject(ValidationStored.RefundDateChangeRegistries, rgss);
return empty(); return empty();
} }

3
clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/RequirementsAndObligationCreation.java
View file

@ -31,6 +31,9 @@ import java.util.Optional;
import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.atomic.AtomicReference;
import java.util.function.BiFunction; import java.util.function.BiFunction;
/**
* LiabilitiesAndClaims
*/
@Service @Service
@Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE) @Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
public class RequirementsAndObligationCreation implements ISessionStage { public class RequirementsAndObligationCreation implements ISessionStage {