From a0e4ea7b490dd5921d3de13d5411b2b115a9967b Mon Sep 17 00:00:00 2001 From: AKurakin Date: Mon, 8 Jul 2024 17:53:41 +0300 Subject: [PATCH] =?UTF-8?q?backend-api=20meta:=20launcher=20OUTV=20=D0=B4?= =?UTF-8?q?=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=BE=20=D0=BF=D0=BE?= =?UTF-8?q?=D0=BB=D0=B5=20correspondentAccountId?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/request/cud/schedule/LauncherNew.java | 12 ++++++++++++ .../backend-api/src/main/resources/meta/meta.json | 6 +++++- .../backend-api/src/main/resources/meta/meta.xml | 3 ++- .../backend-api/src/test/resources/meta.json | 6 +++++- .../clearing/scheduler/service/LauncherService.java | 1 + .../scheduler/service/LauncherServiceTest.java | 1 + .../payment/PIClearingOutbondActionNewRequest.java | 10 ++++++++++ .../domain/cud/schedule/LauncherCommandRequest.java | 10 ++++++++++ 8 files changed, 46 insertions(+), 3 deletions(-) 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 77b1a94d2..f214d8f57 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 addresseeId; + @ApiModelProperty(value = "Корреспондентский счет", example = "1000") + @JsonProperty + private Long correspondentAccountId; @ApiModelProperty(value = "Наименование счета получателя", example = "1000") @JsonProperty private Long debitLeg_accountId; @@ -108,6 +111,7 @@ public class LauncherNew implements IAction { taskRunnerCommandRequest.setSenderId(senderId); taskRunnerCommandRequest.setCreditLeg_accountId(creditLeg_accountId); taskRunnerCommandRequest.setAddresseeId(addresseeId); + taskRunnerCommandRequest.setCorrespondentAccountId(correspondentAccountId); taskRunnerCommandRequest.setDebitLeg_accountId(debitLeg_accountId); taskRunnerCommandRequest.setFromTime(fromTime); taskRunnerCommandRequest.setSwiftCode(swiftCode); @@ -242,6 +246,14 @@ public class LauncherNew implements IAction { this.addresseeId = addresseeId; } + public Long getCorrespondentAccountId() { + return correspondentAccountId; + } + + public void setCorrespondentAccountId(Long correspondentAccountId) { + this.correspondentAccountId = correspondentAccountId; + } + public Long getDebitLeg_accountId() { return debitLeg_accountId; } diff --git a/clearing-parent/backend-api/src/main/resources/meta/meta.json b/clearing-parent/backend-api/src/main/resources/meta/meta.json index 4215b87ec..e6e72d140 100644 --- a/clearing-parent/backend-api/src/main/resources/meta/meta.json +++ b/clearing-parent/backend-api/src/main/resources/meta/meta.json @@ -1,6 +1,6 @@ { - "version": "3.12.4.96", + "version": "3.12.4.97", "enums": { @@ -5889,6 +5889,10 @@ {"code": "addresseeId", "type": 1,"group": "Получатель","name": "Участник получатель","shortname": "Получатель","link": "company","linkCode": "shortName","required": true,"enabled": false } + , + {"code": "correspondentAccountId", + "type": 1,"group": "Получатель","name": "Корреспондентский счет","shortname": "Корр. счет","link": "BankAccount","linkCode": "correspondentAccountName","linkKeyCode": "id","required": false,"enabled": true + } , {"code": "debitLeg_accountId", "type": 1,"group": "Получатель","name": "Наименование счета получателя","shortname": "Счет получателя","link": "bankAccount","linkCode": "account" 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 2d23928bf..f96ddf4a5 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 @@ - + @@ -1368,6 +1368,7 @@ + diff --git a/clearing-parent/backend-api/src/test/resources/meta.json b/clearing-parent/backend-api/src/test/resources/meta.json index 4215b87ec..e6e72d140 100644 --- a/clearing-parent/backend-api/src/test/resources/meta.json +++ b/clearing-parent/backend-api/src/test/resources/meta.json @@ -1,6 +1,6 @@ { - "version": "3.12.4.96", + "version": "3.12.4.97", "enums": { @@ -5889,6 +5889,10 @@ {"code": "addresseeId", "type": 1,"group": "Получатель","name": "Участник получатель","shortname": "Получатель","link": "company","linkCode": "shortName","required": true,"enabled": false } + , + {"code": "correspondentAccountId", + "type": 1,"group": "Получатель","name": "Корреспондентский счет","shortname": "Корр. счет","link": "BankAccount","linkCode": "correspondentAccountName","linkKeyCode": "id","required": false,"enabled": true + } , {"code": "debitLeg_accountId", "type": 1,"group": "Получатель","name": "Наименование счета получателя","shortname": "Счет получателя","link": "bankAccount","linkCode": "account" 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 61dcf3a23..eab2c0b31 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 @@ -94,6 +94,7 @@ public class LauncherService extends QueueConsumer implements InitializingBean { var req = new PIClearingOutbondActionNewRequest(); req.setSenderId(launcherNew.getSenderId()); req.setAddresseeId(launcherNew.getAddresseeId()); + req.setCorrespondentAccountId(launcherNew.getCorrespondentAccountId()); req.setPaymentPurpose(launcherNew.getPaymentPurpose()); req.setCreditLeg_amount(launcherNew.getCreditLeg_amount()); req.setCreditLeg_accountId(launcherNew.getCreditLeg_accountId()); 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 3fc4ed31d..ef3536878 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.setSenderId(122L); launcherCommandRequest.setCreditLeg_accountId(123L); launcherCommandRequest.setAddresseeId(144L); + launcherCommandRequest.setCorrespondentAccountId(1442L); launcherCommandRequest.setDebitLeg_accountId(145L); launcherCommandRequest.setSwiftCode("SWIFT"); launcherCommandRequest.setFromTime(LocalTime.of(12,23)); 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 baca56f0d..b15448115 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 @@ -11,6 +11,8 @@ public class PIClearingOutbondActionNewRequest { @JsonProperty private Long addresseeId; @JsonProperty + private Long correspondentAccountId; + @JsonProperty private String paymentPurpose; @JsonProperty private BigDecimal creditLeg_amount; @@ -37,6 +39,14 @@ public class PIClearingOutbondActionNewRequest { this.addresseeId = addresseeId; } + public Long getCorrespondentAccountId() { + return correspondentAccountId; + } + + public void setCorrespondentAccountId(Long correspondentAccountId) { + this.correspondentAccountId = correspondentAccountId; + } + public String getPaymentPurpose() { return paymentPurpose; } 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 3dbf77e18..be464313c 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 @@ -47,6 +47,8 @@ public class LauncherCommandRequest { @JsonProperty private Long addresseeId; @JsonProperty + private Long correspondentAccountId; + @JsonProperty private Long debitLeg_accountId; @JsonProperty private String swiftCode; @@ -176,6 +178,14 @@ public class LauncherCommandRequest { this.addresseeId = addresseeId; } + public Long getCorrespondentAccountId() { + return correspondentAccountId; + } + + public void setCorrespondentAccountId(Long correspondentAccountId) { + this.correspondentAccountId = correspondentAccountId; + } + public Long getDebitLeg_accountId() { return debitLeg_accountId; }