diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf57Executor.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf57Executor.java index 42b4d6a73..3da76df1d 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf57Executor.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf57Executor.java @@ -391,6 +391,8 @@ public class Sdf57Executor extends AbstractExecutor { rgsD.setRegistryUnit(unit.getKey()); rgsD.setRegistryCode(RegistryUtil.clearingCode(rgsD)); rgsD.setBalance(stmt.getAmount()); + rgsD.setSessionId(null); + rgsD.setSessionType(null); return rgsD; } diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/AbstractSession.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/AbstractSession.java index f0ea75768..390714828 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/AbstractSession.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/AbstractSession.java @@ -64,6 +64,7 @@ public abstract class AbstractSession { if (session != null) { session.setSessionStatus(SessionStatus.CLOS.getKey()); session.setWorkflowStatus(WorkflowStatus.Blocked.getKey()); + session.setUpdated(Instant.now()); sessionImdg.update(session); } this.currStage.set(null); @@ -75,6 +76,7 @@ public abstract class AbstractSession { synchronized (this.currStage) { this.currStage.set(t); this.currSession.setSessionStatus(t.getKey()); + this.currSession.setUpdated(Instant.now()); sessionImdg.update(this.currSession); } } diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/FinalMkrSession.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/FinalMkrSession.java index 91368cf16..fdacfabe4 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/FinalMkrSession.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/FinalMkrSession.java @@ -24,6 +24,7 @@ import ru.spcex.platform.imdg.api.ImdgProvider; import ru.spcex.platform.imdg.api.predicate.ImdgPredicateBuilder; import ru.spcex.platform.utils.enumeration.IMessageResolver; +import java.time.Instant; import java.time.LocalDate; import java.util.Collection; import java.util.List; @@ -249,6 +250,7 @@ public class FinalMkrSession extends AbstractSession implements InitializingBean newSession.setSessionStatus(startStatus.getKey()); newSession.setWorkflowStatus(SessionStatus.ACTV.getKey()); newSession.setClearingDate(LocalDate.now()); + newSession.setCreated(Instant.now()); //todo companyId/securityId/userId передается из сообщения очереди sessionImdg.insert(newSession); diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/IntermediateMkrSession.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/IntermediateMkrSession.java index 779f6ff1b..526b6503a 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/IntermediateMkrSession.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/IntermediateMkrSession.java @@ -24,6 +24,7 @@ import ru.spcex.platform.imdg.api.ImdgProvider; import ru.spcex.platform.imdg.api.predicate.ImdgPredicateBuilder; import ru.spcex.platform.utils.enumeration.IMessageResolver; +import java.time.Instant; import java.time.LocalDate; import java.util.Collection; import java.util.List; @@ -237,6 +238,7 @@ public class IntermediateMkrSession extends AbstractSession implements Initializ newSession.setSessionStatus(startStatus.getKey()); newSession.setWorkflowStatus(SessionStatus.ACTV.getKey()); newSession.setClearingDate(LocalDate.now()); + newSession.setCreated(Instant.now()); //todo companyId/securityId/userId передается из сообщения очереди sessionImdg.insert(newSession); diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/PrimaryAuctionB0Session.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/PrimaryAuctionB0Session.java index 141c701f2..64f627535 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/PrimaryAuctionB0Session.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/PrimaryAuctionB0Session.java @@ -22,6 +22,7 @@ import ru.spcex.platform.imdg.api.ImdgProvider; import ru.spcex.platform.imdg.api.predicate.ImdgPredicateBuilder; import ru.spcex.platform.utils.enumeration.IMessageResolver; +import java.time.Instant; import java.time.LocalDate; import java.util.Collection; import java.util.List; @@ -220,6 +221,7 @@ public class PrimaryAuctionB0Session extends AbstractSession implements Initiali newSession.setSessionStatus(startStatus.getKey()); newSession.setWorkflowStatus(SessionStatus.ACTV.getKey()); newSession.setClearingDate(LocalDate.now()); + newSession.setCreated(Instant.now()); //todo companyId/securityId/userId передается из сообщения очереди sessionImdg.insert(newSession); currSession = newSession; diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/PrimaryAuctionBnSession.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/PrimaryAuctionBnSession.java index 48083506e..0358cad35 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/PrimaryAuctionBnSession.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/PrimaryAuctionBnSession.java @@ -22,6 +22,7 @@ import ru.spcex.platform.imdg.api.ImdgProvider; import ru.spcex.platform.imdg.api.predicate.ImdgPredicateBuilder; import ru.spcex.platform.utils.enumeration.IMessageResolver; +import java.time.Instant; import java.time.LocalDate; import java.util.Collection; import java.util.List; @@ -220,6 +221,7 @@ public class PrimaryAuctionBnSession extends AbstractSession implements Initiali newSession.setSessionStatus(startStatus.getKey()); newSession.setWorkflowStatus(SessionStatus.ACTV.getKey()); newSession.setClearingDate(LocalDate.now()); + newSession.setCreated(Instant.now()); //todo companyId/securityId/userId передается из сообщения очереди sessionImdg.insert(newSession); diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/PrimaryAuctionT0Session.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/PrimaryAuctionT0Session.java index a5aea193b..e08fa4150 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/PrimaryAuctionT0Session.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/PrimaryAuctionT0Session.java @@ -22,6 +22,7 @@ import ru.spcex.platform.imdg.api.ImdgProvider; import ru.spcex.platform.imdg.api.predicate.ImdgPredicateBuilder; import ru.spcex.platform.utils.enumeration.IMessageResolver; +import java.time.Instant; import java.time.LocalDate; import java.util.Collection; import java.util.List; @@ -218,6 +219,7 @@ public class PrimaryAuctionT0Session extends AbstractSession implements Initiali newSession.setSessionStatus(TaskType.StartRevise.getKey()); newSession.setWorkflowStatus(SessionStatus.ACTV.getKey()); newSession.setClearingDate(LocalDate.now()); + newSession.setCreated(Instant.now()); //todo companyId/securityId/userId передается из сообщения очереди sessionImdg.insert(newSession); currSession = newSession; diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/ReturnDepositSession.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/ReturnDepositSession.java index 2796b284d..c6d6c206c 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/ReturnDepositSession.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/ReturnDepositSession.java @@ -20,6 +20,7 @@ import ru.spcex.platform.imdg.api.ImdgProvider; import ru.spcex.platform.imdg.api.predicate.ImdgPredicateBuilder; import ru.spcex.platform.utils.enumeration.IMessageResolver; +import java.time.Instant; import java.time.LocalDate; import java.util.Collection; @@ -193,6 +194,7 @@ public class ReturnDepositSession extends AbstractSession implements Initializin newSession.setSessionStatus(startStatus.getKey()); newSession.setWorkflowStatus(SessionStatus.ACTV.getKey()); newSession.setClearingDate(LocalDate.now()); + newSession.setCreated(Instant.now()); //todo companyId/securityId/userId передается из сообщения очереди sessionImdg.insert(newSession); diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/SecondaryAuctionT0Session.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/SecondaryAuctionT0Session.java index 49561d0e3..733978c7e 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/SecondaryAuctionT0Session.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/SecondaryAuctionT0Session.java @@ -22,6 +22,7 @@ import ru.spcex.platform.imdg.api.ImdgProvider; import ru.spcex.platform.imdg.api.predicate.ImdgPredicateBuilder; import ru.spcex.platform.utils.enumeration.IMessageResolver; +import java.time.Instant; import java.time.LocalDate; import java.util.ArrayList; import java.util.Collection; @@ -223,6 +224,7 @@ public class SecondaryAuctionT0Session extends AbstractSession implements Initia newSession.setSessionStatus(startStatus.getKey()); newSession.setWorkflowStatus(SessionStatus.ACTV.getKey()); newSession.setClearingDate(LocalDate.now()); + newSession.setCreated(Instant.now()); //todo companyId/securityId/userId передается из сообщения очереди sessionImdg.insert(newSession); diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/InspectionObligationsDepositReturn.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/InspectionObligationsDepositReturn.java index fb7aa2aa2..63cd30d24 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/InspectionObligationsDepositReturn.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/InspectionObligationsDepositReturn.java @@ -126,8 +126,10 @@ public class InspectionObligationsDepositReturn implements ISessionStage { ); if (dmtBalance.compareTo(omtBalance) >= 0 && amfBalance.compareTo(omtBalance) >=0) { group.forEach(rgs -> updateStatus(rgs, RegistryStatus.OK)); + updateStatus(dmtInfo.get(), RegistryStatus.OK); } else { group.forEach(rgs -> updateStatus(rgs, registryStatusFailed())); + updateStatus(dmtInfo.get(), RegistryStatus.UNCV); } continue; } @@ -141,9 +143,10 @@ public class InspectionObligationsDepositReturn implements ISessionStage { ); if (dmtBalance.compareTo(omtBalance) >= 0 && amfBalance.compareTo(omtBalance) >= 0) { group.forEach(rgs -> updateStatus(rgs, RegistryStatus.OK)); + updateStatus(dmtClnr.get(), RegistryStatus.OK); } else { group.forEach(rgs -> updateStatus(rgs, registryStatusFailed())); - updateStatus(dmtClnr.get(), registryStatusFailed()); + updateStatus(dmtClnr.get(), RegistryStatus.UNCV); } continue; }