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 f214d8f57..ac6fb4bcc 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 @@ -111,7 +111,6 @@ 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); 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 0cd956796..19a53abc9 100644 --- a/clearing-parent/backend-api/src/main/resources/meta/meta.json +++ b/clearing-parent/backend-api/src/main/resources/meta/meta.json @@ -5883,7 +5883,7 @@ } , {"code": "creditLeg_accountId", - "type": 1,"group": "Отправитель","name": "Наименование счета отправителя","shortname": "Регистр списания","link": "account","linkCode": "account" + "type": 1,"group": "Отправитель","name": "Наименование счета отправителя","shortname": "Регистр списания","link": "account","linkCode": "account","required": true } , {"code": "addresseeId", @@ -5891,7 +5891,7 @@ } , {"code": "correspondentAccountId", - "type": 1,"group": "Получатель","name": "Корреспондентский счет","shortname": "Корр. счет","link": "bankAccount","linkCode": "correspondentAccountName","linkKeyCode": "id","required": false,"enabled": true + "type": 1,"group": "Получатель","name": "Корреспондентский счет","shortname": "Корр. счет","link": "bankAccount","linkCode": "correspondentAccountName","linkKeyCode": "id","required": true,"enabled": true } , {"code": "debitLeg_accountId", 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 9c8643c97..08a63081e 100644 --- a/clearing-parent/backend-api/src/main/resources/meta/meta.xml +++ b/clearing-parent/backend-api/src/main/resources/meta/meta.xml @@ -1366,9 +1366,9 @@ - + - + diff --git a/clearing-parent/backend-api/src/test/resources/meta.json b/clearing-parent/backend-api/src/test/resources/meta.json index 0cd956796..19a53abc9 100644 --- a/clearing-parent/backend-api/src/test/resources/meta.json +++ b/clearing-parent/backend-api/src/test/resources/meta.json @@ -5883,7 +5883,7 @@ } , {"code": "creditLeg_accountId", - "type": 1,"group": "Отправитель","name": "Наименование счета отправителя","shortname": "Регистр списания","link": "account","linkCode": "account" + "type": 1,"group": "Отправитель","name": "Наименование счета отправителя","shortname": "Регистр списания","link": "account","linkCode": "account","required": true } , {"code": "addresseeId", @@ -5891,7 +5891,7 @@ } , {"code": "correspondentAccountId", - "type": 1,"group": "Получатель","name": "Корреспондентский счет","shortname": "Корр. счет","link": "bankAccount","linkCode": "correspondentAccountName","linkKeyCode": "id","required": false,"enabled": true + "type": 1,"group": "Получатель","name": "Корреспондентский счет","shortname": "Корр. счет","link": "bankAccount","linkCode": "correspondentAccountName","linkKeyCode": "id","required": true,"enabled": true } , {"code": "debitLeg_accountId", 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 eab2c0b31..c4a73ecfc 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,11 +94,11 @@ 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()); req.setDebitLeg_accountId(launcherNew.getDebitLeg_accountId()); + // launcherNew.getCorrespondentAccountId() = getDebitLeg_accountId req.setSwiftCode(launcherNew.getSwiftCode()); final String destination = Consts.PAYMENT_INSTRUCTION_CLEARING_OUTBOUND_ACTION; 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 ef3536878..3fc4ed31d 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,7 +81,6 @@ 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 b15448115..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 @@ -11,8 +11,6 @@ public class PIClearingOutbondActionNewRequest { @JsonProperty private Long addresseeId; @JsonProperty - private Long correspondentAccountId; - @JsonProperty private String paymentPurpose; @JsonProperty private BigDecimal creditLeg_amount; @@ -39,14 +37,6 @@ public class PIClearingOutbondActionNewRequest { this.addresseeId = addresseeId; } - public Long getCorrespondentAccountId() { - return correspondentAccountId; - } - - public void setCorrespondentAccountId(Long correspondentAccountId) { - this.correspondentAccountId = correspondentAccountId; - } - public String getPaymentPurpose() { return paymentPurpose; }