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

Fixing VerificationResultComponent.

Browse source
This commit is contained in:
psemenkov 2023-03-20 10:25:28 +03:00
parent e24cece994
commit 3c31fc9d02
1 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/VerificationResultComponent.java
View file

@ -2,20 +2,14 @@ package ru.spcex.clearing.service;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.DisposableBean;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
import ru.clearing.classes.objects.BusinessObject;
import ru.clearing.classes.statics.data.account.Account; import ru.clearing.classes.statics.data.account.Account;
import ru.clearing.classes.statics.data.account.AccountBalance;
import ru.clearing.classes.statics.data.clearing.VerificationResult; import ru.clearing.classes.statics.data.clearing.VerificationResult;
import ru.clearing.classes.statics.data.company.Company; import ru.clearing.classes.statics.data.company.Company;
import ru.clearing.classes.statics.data.sdf.SDf01; import ru.clearing.classes.statics.data.sdf.SDf01;
import ru.clearing.classes.statics.data.account.AccountBalance;
import ru.clearing.classes.statics.data.sdf.SDf03;
import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.clearing.imdg.IMDGDistributedNames;
import ru.spcex.platform.classes.base.interfaces.WithId; import ru.spcex.platform.classes.base.interfaces.WithId;
import ru.spcex.platform.enumeration.AccountType; import ru.spcex.platform.enumeration.AccountType;
@ -243,7 +237,7 @@ public class VerificationResultComponent {
{ {
Map<String, BigDecimal> summOfSDf01 = new HashMap<>(); Map<String, BigDecimal> summOfSDf01 = new HashMap<>();
for (SDf01 document : allSDf01) { for (SDf01 document : allSDf01) {
if (StringUtils.isEmpty(document.getRemainder())) { if (!StringUtils.isEmpty(document.getRemainder())) {
try { try {
String account = document.getAccount(); String account = document.getAccount();
BigDecimal value = new BigDecimal(document.getRemainder()); BigDecimal value = new BigDecimal(document.getRemainder());
@ -264,7 +258,7 @@ public class VerificationResultComponent {
if (account.getCloseBalanceAmount() != null) { if (account.getCloseBalanceAmount() != null) {
String accountKey = account.getAccount(); String accountKey = account.getAccount();
BigDecimal value = account.getCloseBalanceAmount(); BigDecimal value = account.getCloseBalanceAmount();
;
BigDecimal a = summOfAccountBalance.get(accountKey); BigDecimal a = summOfAccountBalance.get(accountKey);
if (a == null) a = BigDecimal.ZERO; if (a == null) a = BigDecimal.ZERO;
a = a.add(value); a = a.add(value);
@ -306,7 +300,11 @@ public class VerificationResultComponent {
.anyMatch(check -> ResultStatuses.notSuccess.equalsByKey(check.getResultStatus())); .anyMatch(check -> ResultStatuses.notSuccess.equalsByKey(check.getResultStatus()));
final String finalStatus = hasMissmatch ? ResultStatuses.notSuccess.getKey() : ResultStatuses.success.getKey(); final String finalStatus = hasMissmatch ? ResultStatuses.notSuccess.getKey() : ResultStatuses.success.getKey();
log.trace("For company {} set GenerationStatus = {}", forCompany.getId(), finalStatus); log.trace("For company {} set GenerationStatus = {}", forCompany.getId(), finalStatus);
for (VerificationResult check : checks) check.setGenerationStatus(finalStatus); Long generationId = idGenerator.nextId();
for (VerificationResult check : checks) {
check.setGenerationStatus(finalStatus);
check.setGenerationId(generationId);
}
return checks; return checks;
} }