промежуточная МКР сессия MEDM: убрал возврат депозитов (5 и 7 шаги)

clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/IntermediateMkrSession.java

@@ -8,7 +8,6 @@ import org.springframework.stereotype.Service;
 import ru.clearing.classes.statics.data.execution.ExecutionCommon;
 import ru.clearing.classes.statics.data.execution.ExecutionDeposit;
 import ru.clearing.classes.statics.data.misc.Session;
-import ru.clearing.classes.statics.data.payment.PaymentInstruction;
 import ru.clearing.classes.statics.data.registry.Registry;
 import ru.spcex.clearing.imdg.IMDGDistributedNames;
 import ru.spcex.clearing.platform.messaging.domain.BaseRequest;
@@ -28,7 +27,7 @@ import ru.spcex.platform.utils.enumeration.IMessageResolver;
 
 import java.time.Instant;
 import java.time.LocalDate;
-import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 import java.util.function.Supplier;
 
@@ -41,10 +40,8 @@ public class IntermediateMkrSession extends AbstractSession implements Initializ
     private final ObligationAdmission obligationsAdmission;
 
     private final InclusionObligations inclusionObligations;
-    private final InspectionObligationsDepositReturn inspectionObligationsReturn;
     private final InspectionObligations inspectionObligations;
     private final FormingRegistersOnOS formingRegistersOnOS;
-    private final FormingPaymentInstructionReturnMkr formingPaymentInstructionReturn;
     private final FormingPaymentInstructionAssets formingPaymentInstructionDeals;
     private final UnlockResources unlockResources;
     private final FinishingSession finishingSession;
@@ -66,12 +63,11 @@ public class IntermediateMkrSession extends AbstractSession implements Initializ
             ObligationAdmission obligationsAdmission,
             InclusionObligations inclusionObligations,
             InspectionObligations inspectionObligations, FormingRegistersOnOS formingRegistersOnOS,
-            FormingPaymentInstructionReturnMkr formingPaymentInstructionReturn, FormingPaymentInstructionAssets formingPaymentInstructionDeals,
+            FormingPaymentInstructionAssets formingPaymentInstructionDeals,
             UnlockResources unlockResources,
             FinishingSession finishingSession,
             EndStageNotification endStageNotification,
             IMessageResolver messageResolver,
-            InspectionObligationsDepositReturn inspectionObligationsReturn,
             @Qualifier("marketCodesForBn") Supplier<List<String>> marketCodes) {
         super(imdgProvider, messageResolver);
         this.balanceRevise = balanceRevise;
@@ -81,13 +77,11 @@ public class IntermediateMkrSession extends AbstractSession implements Initializ
         this.inclusionObligations = inclusionObligations;
         this.inspectionObligations = inspectionObligations;
         this.formingRegistersOnOS = formingRegistersOnOS;
-        this.formingPaymentInstructionReturn = formingPaymentInstructionReturn;
         this.formingPaymentInstructionDeals = formingPaymentInstructionDeals;
         this.unlockResources = unlockResources;
         this.finishingSession = finishingSession;
         this.endStageNotification = endStageNotification;
         this.executionDepositImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_ExecutionDeposit, ExecutionDeposit.class);
-        this.inspectionObligationsReturn = inspectionObligationsReturn;
         this.marketCodes = marketCodes;
         this.registryImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_Registry, Registry.class);
     }
@@ -107,7 +101,6 @@ public class IntermediateMkrSession extends AbstractSession implements Initializ
                 )
         );
         inclusionObligations.setSessionType(sessionType());
-        inspectionObligationsReturn.setSessionType(sessionType());
         inspectionObligations.setSessionType(sessionType());
         formingPaymentInstructionDeals.setSection(section());
         imdgProvider.waitAvailable();
@@ -183,7 +176,6 @@ public class IntermediateMkrSession extends AbstractSession implements Initializ
                 InspectionPoolPayload companyIdPayload = new InspectionPoolPayload();
                 companyIdPayload.setProcessedCompanyId(currSession.getCompanyId());
                 companyIdPayload.setSessionId(currSession.getId());
-                runStage(TaskType.InspectionObligations, companyIdPayload, inspectionObligationsReturn);
                 runStage(TaskType.InspectionObligations, companyIdPayload, inspectionObligations);
             }
             //stage 6
@@ -193,20 +185,11 @@ public class IntermediateMkrSession extends AbstractSession implements Initializ
                 runStage(TaskType.FormingRegistersOnOS, payload, formingRegistersOnOS); //returns Collection<Registry>
             }
             //stage 7
-
-            StageResult<Collection<PaymentInstruction>> returnsPayment = null;
-            {
-                FormingPaymentInstructionPayload payload = new FormingPaymentInstructionPayload();
-                payload.setSessionId(currSession.getId());
-                //stage 7
-                returnsPayment = runStage(TaskType.FormingPaymentInstruction, payload, formingPaymentInstructionReturn);
-            }
-
             StageResult<PaymentInfo> paymentResult = null;
             {
                 FormingPaymentInstructionPayload payload = new FormingPaymentInstructionPayload();
                 payload.setSessionId(currSession.getId());
-                payload.setPaymentInstructionReturns(returnsPayment.getStageResult());
+                payload.setPaymentInstructionReturns(Collections.emptyList());
                 //stage 7
                 paymentResult = runStage(TaskType.FormingPaymentInstruction, payload, formingPaymentInstructionDeals);
             }