treshenkov/clearing
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

backend-api meta: launcher OUTV добавлено поле correspondentAccountId (переделка - только на фронтэнде поле нужно)

Browse source
This commit is contained in:
AKurakin 2024-07-08 19:16:27 +03:00
parent 5f022a5d9d
commit 1bd41b8f50
7 changed files with 7 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -111,7 +111,6 @@ public class LauncherNew implements IAction<Object> {
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);

4
clearing-parent/backend-api/src/main/resources/meta/meta.json
View file

@ -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",

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

@ -1366,9 +1366,9 @@
<creditLeg_amount type="10" name="Сумма отправителя" shortname="Сумма" required="true"/>
<paymentPurpose type="2" length="255" name="Назначение платежа" shortname="Основание" required="true"/>
<senderId type="1" group="Отправитель" name="Участник отправитель" shortname="Отправитель" link="company" linkCode="shortName" required="true"/>
<creditLeg_accountId type="1" group="Отправитель" name="Наименование счета отправителя" shortname="Регистр списания" link="account" linkCode="account"/>
<creditLeg_accountId type="1" group="Отправитель" name="Наименование счета отправителя" shortname="Регистр списания" link="account" linkCode="account" required="true"/>
<addresseeId type="1" group="Получатель" name="Участник получатель" shortname="Получатель" link="company" linkCode="shortName" required="true" enabled="false"/>
<correspondentAccountId type="1" group="Получатель" name="Корреспондентский счет" shortname="Корр. счет" link="bankAccount" linkCode="correspondentAccountName" linkKeyCode="id" required="false" enabled="true" />
<correspondentAccountId type="1" group="Получатель" name="Корреспондентский счет" shortname="Корр. счет" link="bankAccount" linkCode="correspondentAccountName" linkKeyCode="id" required="true" enabled="true" />
<debitLeg_accountId type="1" group="Получатель" name="Наименование счета получателя" shortname="Счет получателя" link="bankAccount" linkCode="account"/>
<swiftCode type="2" length="255" group="Получатель" shortname="SWIFT" enabled="false"/>
</post>

4
clearing-parent/backend-api/src/test/resources/meta.json
View file

@ -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",

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

@ -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;

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

@ -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));

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

@ -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;
}