backend-api http://jira.mfd.msk:8088/browse/CLS-746 реквесты для меты

2024-09-09 13:45:09 +03:00 · 2024-09-09 13:45:09 +03:00 · 30d1d660f1
commit 30d1d660f1
parent c947aed016
4 changed files with 662 additions and 0 deletions
--- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/account/BankAccountNewAction.java
+++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/account/BankAccountNewAction.java
@ -53,6 +53,51 @@ public class BankAccountNewAction implements IAction<BankAccountNewRequest> {
    @ApiModelProperty(value = "Код SWIFT посредника", example = "ABCDE")
    @JsonProperty
    private String intermediarySwiftCode;
+    @ApiModelProperty(value = "Наименование владельца счета", example = "ABCDE")
+    @JsonProperty
+    private String name;
+    @ApiModelProperty(value = "Адрес владельца счета", example = "ABCDE")
+    @JsonProperty
+    private String address;
+    @ApiModelProperty(value = "Место нахождения банка получателя средств", example = "ABCDE")
+    @JsonProperty
+    private String bankAddress;
+    @ApiModelProperty(value = "SWIFT банка получателя средств", example = "ABCDE")
+    @JsonProperty
+    private String bankSwiftCode;
+    @ApiModelProperty(value = "Номер счета банка получателя средств", example = "ABCDE")
+    @JsonProperty
+    private String bankAccount;
+    @ApiModelProperty(value = "Наименование банка-посредника 1", example = "ABCDE")
+    @JsonProperty
+    private String bankName1;
+    @ApiModelProperty(value = "Место нахождения банка-посредника 1", example = "ABCDE")
+    @JsonProperty
+    private String bankAddress1;
+    @ApiModelProperty(value = "Номер счета банка-посредника 1", example = "ABCDE")
+    @JsonProperty
+    private String bankAccount1;
+    @ApiModelProperty(value = "Наименование банка-посредника 2", example = "ABCDE")
+    @JsonProperty
+    private String bankName2;
+    @ApiModelProperty(value = "Место нахождения банка-посредника 2", example = "ABCDE")
+    @JsonProperty
+    private String bankAddress2;
+    @ApiModelProperty(value = "SWIFT банка-посредника 2", example = "ABCDE")
+    @JsonProperty
+    private String intermediarySwiftCode2;
+    @ApiModelProperty(value = "Номер счета банка-посредника 2", example = "ABCDE")
+    @JsonProperty
+    private String bankAccount2;
+    @ApiModelProperty(value = "Лицевой счет получателя", example = "ABCDE")
+    @JsonProperty
+    private String personalAccount;
+    @ApiModelProperty(value = "КБК", example = "ABCDE")
+    @JsonProperty
+    private String budgetClassificationCode;
+    @ApiModelProperty(value = "ОКТМО получателя средств", example = "ABCDE")
+    @JsonProperty
+    private String oktmo;

    @Override
    public BankAccountNewRequest toRequest() {
@ -69,6 +114,21 @@ public class BankAccountNewAction implements IAction<BankAccountNewRequest> {
        req.setCompanyId(this.companyId);
        req.setSwiftCode(swiftCode);
        req.setIntermediarySwiftCode(intermediarySwiftCode);
+        req.setName(name);
+        req.setAddress(address);
+        req.setBankAddress(bankAddress);
+        req.setBankSwiftCode(bankSwiftCode);
+        req.setBankAccount(bankAccount);
+        req.setBankName1(bankName1);
+        req.setBankAddress1(bankAddress1);
+        req.setBankAccount1(bankAccount1);
+        req.setBankName2(bankName2);
+        req.setBankAddress2(bankAddress2);
+        req.setIntermediarySwiftCode2(intermediarySwiftCode2);
+        req.setBankAccount2(bankAccount2);
+        req.setPersonalAccount(personalAccount);
+        req.setBudgetClassificationCode(budgetClassificationCode);
+        req.setOktmo(oktmo);
        return req;
    }

@ -173,4 +233,124 @@ public class BankAccountNewAction implements IAction<BankAccountNewRequest> {
    public void setIntermediarySwiftCode(String intermediarySwiftCode) {
        this.intermediarySwiftCode = intermediarySwiftCode;
    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public String getBankAddress() {
+        return bankAddress;
+    }
+
+    public void setBankAddress(String bankAddress) {
+        this.bankAddress = bankAddress;
+    }
+
+    public String getBankSwiftCode() {
+        return bankSwiftCode;
+    }
+
+    public void setBankSwiftCode(String bankSwiftCode) {
+        this.bankSwiftCode = bankSwiftCode;
+    }
+
+    public String getBankAccount() {
+        return bankAccount;
+    }
+
+    public void setBankAccount(String bankAccount) {
+        this.bankAccount = bankAccount;
+    }
+
+    public String getBankName1() {
+        return bankName1;
+    }
+
+    public void setBankName1(String bankName1) {
+        this.bankName1 = bankName1;
+    }
+
+    public String getBankAddress1() {
+        return bankAddress1;
+    }
+
+    public void setBankAddress1(String bankAddress1) {
+        this.bankAddress1 = bankAddress1;
+    }
+
+    public String getBankAccount1() {
+        return bankAccount1;
+    }
+
+    public void setBankAccount1(String bankAccount1) {
+        this.bankAccount1 = bankAccount1;
+    }
+
+    public String getBankName2() {
+        return bankName2;
+    }
+
+    public void setBankName2(String bankName2) {
+        this.bankName2 = bankName2;
+    }
+
+    public String getBankAddress2() {
+        return bankAddress2;
+    }
+
+    public void setBankAddress2(String bankAddress2) {
+        this.bankAddress2 = bankAddress2;
+    }
+
+    public String getIntermediarySwiftCode2() {
+        return intermediarySwiftCode2;
+    }
+
+    public void setIntermediarySwiftCode2(String intermediarySwiftCode2) {
+        this.intermediarySwiftCode2 = intermediarySwiftCode2;
+    }
+
+    public String getBankAccount2() {
+        return bankAccount2;
+    }
+
+    public void setBankAccount2(String bankAccount2) {
+        this.bankAccount2 = bankAccount2;
+    }
+
+    public String getPersonalAccount() {
+        return personalAccount;
+    }
+
+    public void setPersonalAccount(String personalAccount) {
+        this.personalAccount = personalAccount;
+    }
+
+    public String getBudgetClassificationCode() {
+        return budgetClassificationCode;
+    }
+
+    public void setBudgetClassificationCode(String budgetClassificationCode) {
+        this.budgetClassificationCode = budgetClassificationCode;
+    }
+
+    public String getOktmo() {
+        return oktmo;
+    }
+
+    public void setOktmo(String oktmo) {
+        this.oktmo = oktmo;
+    }
 }
--- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/account/BankAccountUpdateAction.java
+++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/account/BankAccountUpdateAction.java
@ -48,6 +48,52 @@ public class BankAccountUpdateAction implements IAction<BankAccountUpdateRequest
    @ApiModelProperty(value = "Номер счета", example = "11111222223333344444")
    private String account;

+    @ApiModelProperty(value = "Наименование владельца счета", example = "ABCDE")
+    @JsonProperty
+    private String name;
+    @ApiModelProperty(value = "Адрес владельца счета", example = "ABCDE")
+    @JsonProperty
+    private String address;
+    @ApiModelProperty(value = "Место нахождения банка получателя средств", example = "ABCDE")
+    @JsonProperty
+    private String bankAddress;
+    @ApiModelProperty(value = "SWIFT банка получателя средств", example = "ABCDE")
+    @JsonProperty
+    private String bankSwiftCode;
+    @ApiModelProperty(value = "Номер счета банка получателя средств", example = "ABCDE")
+    @JsonProperty
+    private String bankAccount;
+    @ApiModelProperty(value = "Наименование банка-посредника 1", example = "ABCDE")
+    @JsonProperty
+    private String bankName1;
+    @ApiModelProperty(value = "Место нахождения банка-посредника 1", example = "ABCDE")
+    @JsonProperty
+    private String bankAddress1;
+    @ApiModelProperty(value = "Номер счета банка-посредника 1", example = "ABCDE")
+    @JsonProperty
+    private String bankAccount1;
+    @ApiModelProperty(value = "Наименование банка-посредника 2", example = "ABCDE")
+    @JsonProperty
+    private String bankName2;
+    @ApiModelProperty(value = "Место нахождения банка-посредника 2", example = "ABCDE")
+    @JsonProperty
+    private String bankAddress2;
+    @ApiModelProperty(value = "SWIFT банка-посредника 2", example = "ABCDE")
+    @JsonProperty
+    private String intermediarySwiftCode2;
+    @ApiModelProperty(value = "Номер счета банка-посредника 2", example = "ABCDE")
+    @JsonProperty
+    private String bankAccount2;
+    @ApiModelProperty(value = "Лицевой счет получателя", example = "ABCDE")
+    @JsonProperty
+    private String personalAccount;
+    @ApiModelProperty(value = "КБК", example = "ABCDE")
+    @JsonProperty
+    private String budgetClassificationCode;
+    @ApiModelProperty(value = "ОКТМО получателя средств", example = "ABCDE")
+    @JsonProperty
+    private String oktmo;
+
    @Override
    public BankAccountUpdateRequest toRequest() {
        var req = new BankAccountUpdateRequest();
@ -63,6 +109,21 @@ public class BankAccountUpdateAction implements IAction<BankAccountUpdateRequest
        req.setAccount(this.account);
        req.setSwiftCode(swiftCode);
        req.setIntermediarySwiftCode(intermediarySwiftCode);
+        req.setName(name);
+		req.setAddress(address);
+		req.setBankAddress(bankAddress);
+		req.setBankSwiftCode(bankSwiftCode);
+		req.setBankAccount(bankAccount);
+		req.setBankName1(bankName1);
+		req.setBankAddress1(bankAddress1);
+		req.setBankAccount1(bankAccount1);
+		req.setBankName2(bankName2);
+		req.setBankAddress2(bankAddress2);
+		req.setIntermediarySwiftCode2(intermediarySwiftCode2);
+		req.setBankAccount2(bankAccount2);
+		req.setPersonalAccount(personalAccount);
+		req.setBudgetClassificationCode(budgetClassificationCode);
+		req.setOktmo(oktmo);
        return req;
    }

@ -167,4 +228,124 @@ public class BankAccountUpdateAction implements IAction<BankAccountUpdateRequest
    public void setIntermediarySwiftCode(String intermediarySwiftCode) {
        this.intermediarySwiftCode = intermediarySwiftCode;
    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public String getBankAddress() {
+        return bankAddress;
+    }
+
+    public void setBankAddress(String bankAddress) {
+        this.bankAddress = bankAddress;
+    }
+
+    public String getBankSwiftCode() {
+        return bankSwiftCode;
+    }
+
+    public void setBankSwiftCode(String bankSwiftCode) {
+        this.bankSwiftCode = bankSwiftCode;
+    }
+
+    public String getBankAccount() {
+        return bankAccount;
+    }
+
+    public void setBankAccount(String bankAccount) {
+        this.bankAccount = bankAccount;
+    }
+
+    public String getBankName1() {
+        return bankName1;
+    }
+
+    public void setBankName1(String bankName1) {
+        this.bankName1 = bankName1;
+    }
+
+    public String getBankAddress1() {
+        return bankAddress1;
+    }
+
+    public void setBankAddress1(String bankAddress1) {
+        this.bankAddress1 = bankAddress1;
+    }
+
+    public String getBankAccount1() {
+        return bankAccount1;
+    }
+
+    public void setBankAccount1(String bankAccount1) {
+        this.bankAccount1 = bankAccount1;
+    }
+
+    public String getBankName2() {
+        return bankName2;
+    }
+
+    public void setBankName2(String bankName2) {
+        this.bankName2 = bankName2;
+    }
+
+    public String getBankAddress2() {
+        return bankAddress2;
+    }
+
+    public void setBankAddress2(String bankAddress2) {
+        this.bankAddress2 = bankAddress2;
+    }
+
+    public String getIntermediarySwiftCode2() {
+        return intermediarySwiftCode2;
+    }
+
+    public void setIntermediarySwiftCode2(String intermediarySwiftCode2) {
+        this.intermediarySwiftCode2 = intermediarySwiftCode2;
+    }
+
+    public String getBankAccount2() {
+        return bankAccount2;
+    }
+
+    public void setBankAccount2(String bankAccount2) {
+        this.bankAccount2 = bankAccount2;
+    }
+
+    public String getPersonalAccount() {
+        return personalAccount;
+    }
+
+    public void setPersonalAccount(String personalAccount) {
+        this.personalAccount = personalAccount;
+    }
+
+    public String getBudgetClassificationCode() {
+        return budgetClassificationCode;
+    }
+
+    public void setBudgetClassificationCode(String budgetClassificationCode) {
+        this.budgetClassificationCode = budgetClassificationCode;
+    }
+
+    public String getOktmo() {
+        return oktmo;
+    }
+
+    public void setOktmo(String oktmo) {
+        this.oktmo = oktmo;
+    }
 }
--- a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/account/BankAccountNewRequest.java
+++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/account/BankAccountNewRequest.java
@ -29,6 +29,37 @@ public class BankAccountNewRequest {
    public String swiftCode;
    @JsonProperty
    private String intermediarySwiftCode;
+    @JsonProperty
+    private String name;
+    @JsonProperty
+    private String address;
+    @JsonProperty
+    private String bankAddress;
+    @JsonProperty
+    private String bankSwiftCode;
+    @JsonProperty
+    private String bankAccount;
+    @JsonProperty
+    private String bankName1;
+    @JsonProperty
+    private String bankAddress1;
+    @JsonProperty
+    private String bankAccount1;
+    @JsonProperty
+    private String bankName2;
+    @JsonProperty
+    private String bankAddress2;
+    @JsonProperty
+    private String intermediarySwiftCode2;
+    @JsonProperty
+    private String bankAccount2;
+    @JsonProperty
+    private String personalAccount;
+    @JsonProperty
+    private String budgetClassificationCode;
+    @JsonProperty
+    private String oktmo;
+

    public String getBankIdentificationCode() {
        return bankIdentificationCode;
@ -133,4 +164,124 @@ public class BankAccountNewRequest {
    public void setIntermediarySwiftCode(String intermediarySwiftCode) {
        this.intermediarySwiftCode = intermediarySwiftCode;
    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public String getBankAddress() {
+        return bankAddress;
+    }
+
+    public void setBankAddress(String bankAddress) {
+        this.bankAddress = bankAddress;
+    }
+
+    public String getBankSwiftCode() {
+        return bankSwiftCode;
+    }
+
+    public void setBankSwiftCode(String bankSwiftCode) {
+        this.bankSwiftCode = bankSwiftCode;
+    }
+
+    public String getBankAccount() {
+        return bankAccount;
+    }
+
+    public void setBankAccount(String bankAccount) {
+        this.bankAccount = bankAccount;
+    }
+
+    public String getBankName1() {
+        return bankName1;
+    }
+
+    public void setBankName1(String bankName1) {
+        this.bankName1 = bankName1;
+    }
+
+    public String getBankAddress1() {
+        return bankAddress1;
+    }
+
+    public void setBankAddress1(String bankAddress1) {
+        this.bankAddress1 = bankAddress1;
+    }
+
+    public String getBankAccount1() {
+        return bankAccount1;
+    }
+
+    public void setBankAccount1(String bankAccount1) {
+        this.bankAccount1 = bankAccount1;
+    }
+
+    public String getBankName2() {
+        return bankName2;
+    }
+
+    public void setBankName2(String bankName2) {
+        this.bankName2 = bankName2;
+    }
+
+    public String getBankAddress2() {
+        return bankAddress2;
+    }
+
+    public void setBankAddress2(String bankAddress2) {
+        this.bankAddress2 = bankAddress2;
+    }
+
+    public String getIntermediarySwiftCode2() {
+        return intermediarySwiftCode2;
+    }
+
+    public void setIntermediarySwiftCode2(String intermediarySwiftCode2) {
+        this.intermediarySwiftCode2 = intermediarySwiftCode2;
+    }
+
+    public String getBankAccount2() {
+        return bankAccount2;
+    }
+
+    public void setBankAccount2(String bankAccount2) {
+        this.bankAccount2 = bankAccount2;
+    }
+
+    public String getPersonalAccount() {
+        return personalAccount;
+    }
+
+    public void setPersonalAccount(String personalAccount) {
+        this.personalAccount = personalAccount;
+    }
+
+    public String getBudgetClassificationCode() {
+        return budgetClassificationCode;
+    }
+
+    public void setBudgetClassificationCode(String budgetClassificationCode) {
+        this.budgetClassificationCode = budgetClassificationCode;
+    }
+
+    public String getOktmo() {
+        return oktmo;
+    }
+
+    public void setOktmo(String oktmo) {
+        this.oktmo = oktmo;
+    }
 }
--- a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/account/BankAccountUpdateRequest.java
+++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/account/BankAccountUpdateRequest.java
@ -27,6 +27,36 @@ public class BankAccountUpdateRequest {
    public String swiftCode;
    @JsonProperty
    private String intermediarySwiftCode;
+    @JsonProperty
+    private String name;
+    @JsonProperty
+    private String address;
+    @JsonProperty
+    private String bankAddress;
+    @JsonProperty
+    private String bankSwiftCode;
+    @JsonProperty
+    private String bankAccount;
+    @JsonProperty
+    private String bankName1;
+    @JsonProperty
+    private String bankAddress1;
+    @JsonProperty
+    private String bankAccount1;
+    @JsonProperty
+    private String bankName2;
+    @JsonProperty
+    private String bankAddress2;
+    @JsonProperty
+    private String intermediarySwiftCode2;
+    @JsonProperty
+    private String bankAccount2;
+    @JsonProperty
+    private String personalAccount;
+    @JsonProperty
+    private String budgetClassificationCode;
+    @JsonProperty
+    private String oktmo;

    public Long getId() {
        return id;
@ -123,4 +153,124 @@ public class BankAccountUpdateRequest {
    public void setIntermediarySwiftCode(String intermediarySwiftCode) {
        this.intermediarySwiftCode = intermediarySwiftCode;
    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public String getBankAddress() {
+        return bankAddress;
+    }
+
+    public void setBankAddress(String bankAddress) {
+        this.bankAddress = bankAddress;
+    }
+
+    public String getBankSwiftCode() {
+        return bankSwiftCode;
+    }
+
+    public void setBankSwiftCode(String bankSwiftCode) {
+        this.bankSwiftCode = bankSwiftCode;
+    }
+
+    public String getBankAccount() {
+        return bankAccount;
+    }
+
+    public void setBankAccount(String bankAccount) {
+        this.bankAccount = bankAccount;
+    }
+
+    public String getBankName1() {
+        return bankName1;
+    }
+
+    public void setBankName1(String bankName1) {
+        this.bankName1 = bankName1;
+    }
+
+    public String getBankAddress1() {
+        return bankAddress1;
+    }
+
+    public void setBankAddress1(String bankAddress1) {
+        this.bankAddress1 = bankAddress1;
+    }
+
+    public String getBankAccount1() {
+        return bankAccount1;
+    }
+
+    public void setBankAccount1(String bankAccount1) {
+        this.bankAccount1 = bankAccount1;
+    }
+
+    public String getBankName2() {
+        return bankName2;
+    }
+
+    public void setBankName2(String bankName2) {
+        this.bankName2 = bankName2;
+    }
+
+    public String getBankAddress2() {
+        return bankAddress2;
+    }
+
+    public void setBankAddress2(String bankAddress2) {
+        this.bankAddress2 = bankAddress2;
+    }
+
+    public String getIntermediarySwiftCode2() {
+        return intermediarySwiftCode2;
+    }
+
+    public void setIntermediarySwiftCode2(String intermediarySwiftCode2) {
+        this.intermediarySwiftCode2 = intermediarySwiftCode2;
+    }
+
+    public String getBankAccount2() {
+        return bankAccount2;
+    }
+
+    public void setBankAccount2(String bankAccount2) {
+        this.bankAccount2 = bankAccount2;
+    }
+
+    public String getPersonalAccount() {
+        return personalAccount;
+    }
+
+    public void setPersonalAccount(String personalAccount) {
+        this.personalAccount = personalAccount;
+    }
+
+    public String getBudgetClassificationCode() {
+        return budgetClassificationCode;
+    }
+
+    public void setBudgetClassificationCode(String budgetClassificationCode) {
+        this.budgetClassificationCode = budgetClassificationCode;
+    }
+
+    public String getOktmo() {
+        return oktmo;
+    }
+
+    public void setOktmo(String oktmo) {
+        this.oktmo = oktmo;
+    }
 }