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 17:53:41 +03:00
parent e8d1dc482d
commit a0e4ea7b49
8 changed files with 46 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -68,6 +68,9 @@ public class LauncherNew implements IAction<Object> {
@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<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);
@ -242,6 +246,14 @@ public class LauncherNew implements IAction<Object> {
this.addresseeId = addresseeId;
}
public Long getCorrespondentAccountId() {
return correspondentAccountId;
}
public void setCorrespondentAccountId(Long correspondentAccountId) {
this.correspondentAccountId = correspondentAccountId;
}
public Long getDebitLeg_accountId() {
return debitLeg_accountId;
}

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

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

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

@ -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.12.4.96">
<meta version="3.12.4.97">
<!-- _xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" _xsi:noNamespaceSchemaLocation="file:///E:/d/projects/meta/from/meta.xsd" -->
<!--Здесь словари-->
<enums>
@ -1368,6 +1368,7 @@
<senderId type="1" group="Отправитель" name="Участник отправитель" shortname="Отправитель" link="company" linkCode="shortName" required="true"/>
<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"/>
<correspondentAccountId type="1" group="Получатель" name="Корреспондентский счет" shortname="Корр. счет" link="BankAccount" linkCode="correspondentAccountName" linkKeyCode="id" required="false" enabled="true" />
<debitLeg_accountId type="1" group="Получатель" name="Наименование счета получателя" shortname="Счет получателя" link="bankAccount" linkCode="account"/>
<swiftCode type="2" length="255" group="Получатель" shortname="SWIFT" enabled="false"/>
</post>

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

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

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

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

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

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

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

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

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

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