http://jira.mfd.msk:8088/browse/CLS-676 Launcher OUTV

clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/schedule/LauncherNew.java

@@ -68,6 +68,9 @@ public class LauncherNew implements IAction<Object> {
     @ApiModelProperty(value = "Наименование счета получателя", example = "1000")
     @JsonProperty
     private Long debitLeg_accountId;
+    @ApiModelProperty(value = "SWIFT", example = "ABCDE")
+    @JsonProperty
+    private String swiftCode;
 
     @ApiModelProperty(value = "Время", dataType = "java.lang.String", example = "16:30:00")
     @JsonSerialize(using = LocalTimeSerializer.class)
@@ -95,6 +98,7 @@ public class LauncherNew implements IAction<Object> {
         taskRunnerCommandRequest.setAddresseeId(addresseeId);
         taskRunnerCommandRequest.setDebitLeg_accountId(debitLeg_accountId);
         taskRunnerCommandRequest.setFromTime(fromTime);
+        taskRunnerCommandRequest.setSwiftCode(swiftCode);
         return taskRunnerCommandRequest;
     }
 
@@ -232,6 +236,14 @@ public class LauncherNew implements IAction<Object> {
         this.debitLeg_accountId = debitLeg_accountId;
     }
 
+    public String getSwiftCode() {
+        return swiftCode;
+    }
+
+    public void setSwiftCode(String swiftCode) {
+        this.swiftCode = swiftCode;
+    }
+
     public BigDecimal getFullBalance() {
         return fullBalance;
     }

clearing-parent/backend-api/src/main/resources/meta/meta.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--?xml-stylesheet type="text/xsl" href="\..\corp-reports\src\data\meta\meta.server.xslt"?-->
-<meta version="3.11.0.86">
+<meta version="3.11.0.87">
 	<!-- _xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" _xsi:noNamespaceSchemaLocation="file:///E:/d/projects/meta/from/meta.xsd" -->
 	<!--Здесь словари-->
 	<enums>
@@ -1362,6 +1362,7 @@
 					<creditLeg_accountId type="1" group="Отправитель" name="Наименование счета отправителя" shortname="Регистр списания" link="account" linkCode="account"/>
 					<addresseeId type="1" group="Получатель" name="Участник получатель" shortname="Получатель" link="company" linkCode="shortName" required="true" enabled="false"/>
 					<debitLeg_accountId type="1" group="Получатель" name="Наименование счета получателя" shortname="Счет получателя" link="bankAccount" linkCode="correspondentAccount"/>
+					<swiftCode type="2" length="255" group="Получатель" shortname="SWIFT" enabled="false"/>
 				</post>
 				<post destination="GTRD" group="Обмен с Торговой системой" name="Получение сделок из Торговой системы">
 				</post>

clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/LauncherService.java

@@ -98,6 +98,7 @@ public class LauncherService extends QueueConsumer implements InitializingBean {
         req.setCreditLeg_amount(launcherNew.getCreditLeg_amount());
         req.setCreditLeg_accountId(launcherNew.getCreditLeg_accountId());
         req.setDebitLeg_accountId(launcherNew.getDebitLeg_accountId());
+        req.setSwiftCode(launcherNew.getSwiftCode());
 
         final String destination = Consts.PAYMENT_INSTRUCTION_CLEARING_OUTBOUND_ACTION;
         BaseRequest<Object> request = new BaseRequest<>();

clearing-parent/scheduler-service/src/test/java/ru/spcex/clearing/scheduler/service/LauncherServiceTest.java

@@ -81,6 +81,7 @@ class LauncherServiceTest extends AbstractServiceTest {
         launcherCommandRequest.setCreditLeg_accountId(123L);
         launcherCommandRequest.setAddresseeId(144L);
         launcherCommandRequest.setDebitLeg_accountId(145L);
+        launcherCommandRequest.setSwiftCode("SWIFT");
         launcherCommandRequest.setFromTime(LocalTime.of(12,23));
 
         BaseRequest<Object> predictableBaseRequest = new BaseRequest<>();

platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/payment/PIClearingOutbondActionNewRequest.java

@@ -18,6 +18,8 @@ public class PIClearingOutbondActionNewRequest {
     private Long creditLeg_accountId;
     @JsonProperty
     private Long debitLeg_accountId;
+    @JsonProperty
+    private String swiftCode;
 
     public Long getSenderId() {
         return senderId;
@@ -66,4 +68,12 @@ public class PIClearingOutbondActionNewRequest {
     public void setDebitLeg_accountId(Long debitLeg_accountId) {
         this.debitLeg_accountId = debitLeg_accountId;
     }
+
+    public String getSwiftCode() {
+        return swiftCode;
+    }
+
+    public void setSwiftCode(String swiftCode) {
+        this.swiftCode = swiftCode;
+    }
 }

platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/schedule/LauncherCommandRequest.java

@@ -44,6 +44,8 @@ public class LauncherCommandRequest {
     private Long addresseeId;
     @JsonProperty
     private Long debitLeg_accountId;
+    @JsonProperty
+    private String swiftCode;
 
     @JsonSerialize(using = LocalTimeSerializer.class)
     @JsonDeserialize(using = LocalTimeDeserializer.class)
@@ -185,4 +187,12 @@ public class LauncherCommandRequest {
     public void setFromTime(LocalTime fromTime) {
         this.fromTime = fromTime;
     }
+
+    public String getSwiftCode() {
+        return swiftCode;
+    }
+
+    public void setSwiftCode(String swiftCode) {
+        this.swiftCode = swiftCode;
+    }
 }