From ae36188f318b75f96658711effa9c17dee53cb16 Mon Sep 17 00:00:00 2001 From: AKurakin Date: Mon, 13 May 2024 16:42:42 +0300 Subject: [PATCH] http://jira.mfd.msk:8088/browse/CLS-676 Launcher OUTV --- .../controller/request/cud/schedule/LauncherNew.java | 12 ++++++++++++ .../backend-api/src/main/resources/meta/meta.xml | 3 ++- .../clearing/scheduler/service/LauncherService.java | 1 + .../scheduler/service/LauncherServiceTest.java | 1 + .../payment/PIClearingOutbondActionNewRequest.java | 10 ++++++++++ .../domain/cud/schedule/LauncherCommandRequest.java | 10 ++++++++++ 6 files changed, 36 insertions(+), 1 deletion(-) diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/schedule/LauncherNew.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/schedule/LauncherNew.java index 6dbaf1b9f..6fd604853 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/schedule/LauncherNew.java +++ b/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 { @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 { 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 { this.debitLeg_accountId = debitLeg_accountId; } + public String getSwiftCode() { + return swiftCode; + } + + public void setSwiftCode(String swiftCode) { + this.swiftCode = swiftCode; + } + public BigDecimal getFullBalance() { return fullBalance; } diff --git a/clearing-parent/backend-api/src/main/resources/meta/meta.xml b/clearing-parent/backend-api/src/main/resources/meta/meta.xml index 5923015e0..3fd0238a2 100644 --- a/clearing-parent/backend-api/src/main/resources/meta/meta.xml +++ b/clearing-parent/backend-api/src/main/resources/meta/meta.xml @@ -1,6 +1,6 @@ - + @@ -1362,6 +1362,7 @@ + diff --git a/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/LauncherService.java b/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/LauncherService.java index b78f1bea4..61dcf3a23 100644 --- a/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/LauncherService.java +++ b/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 request = new BaseRequest<>(); diff --git a/clearing-parent/scheduler-service/src/test/java/ru/spcex/clearing/scheduler/service/LauncherServiceTest.java b/clearing-parent/scheduler-service/src/test/java/ru/spcex/clearing/scheduler/service/LauncherServiceTest.java index 436ffd1e5..85b59251b 100644 --- a/clearing-parent/scheduler-service/src/test/java/ru/spcex/clearing/scheduler/service/LauncherServiceTest.java +++ b/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 predictableBaseRequest = new BaseRequest<>(); diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/payment/PIClearingOutbondActionNewRequest.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/payment/PIClearingOutbondActionNewRequest.java index a850c598e..baca56f0d 100644 --- a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/payment/PIClearingOutbondActionNewRequest.java +++ b/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; + } } diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/schedule/LauncherCommandRequest.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/schedule/LauncherCommandRequest.java index abcff7aa8..939aa8aa6 100644 --- a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/schedule/LauncherCommandRequest.java +++ b/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; + } }