diff --git 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 index 04f55964b..a8d013425 100644 --- 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 @@ -47,6 +47,9 @@ public class BankAccountNewAction implements IAction { @ApiModelProperty(value = "Компания", example = "1234") @JsonProperty private Long companyId; + @ApiModelProperty(value = "SWIFT", example = "ABCDE") + @JsonProperty + private String swiftCode; @Override public BankAccountNewRequest toRequest() { @@ -61,6 +64,7 @@ public class BankAccountNewAction implements IAction { req.setTaxRegistrationReasonCode(this.taxRegistrationReasonCode); req.setAccount(this.account); req.setCompanyId(this.companyId); + req.setSwiftCode(swiftCode); return req; } @@ -149,4 +153,12 @@ public class BankAccountNewAction implements IAction { public void setCompanyId(Long companyId) { this.companyId = companyId; } + + public String getSwiftCode() { + return swiftCode; + } + + public void setSwiftCode(String swiftCode) { + this.swiftCode = swiftCode; + } } diff --git 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 index f5073d567..9418aa266 100644 --- 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 @@ -38,6 +38,9 @@ public class BankAccountUpdateAction implements IAction + @@ -1178,6 +1179,7 @@ + diff --git a/clearing-parent/backend-api/src/test/resources/meta.json b/clearing-parent/backend-api/src/test/resources/meta.json index 03c6f56b7..7f56007f7 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.11.0.86", + "version": "3.11.0.87", "enums": { @@ -5018,6 +5018,10 @@ {"code": "companyId", "type": 1,"name": "Компания","shortname": "Компания","link": "company","linkCode": "shortName","visible": false } + , + {"code": "swiftCode", + "type": 2,"length": 255,"shortname": "SWIFT" + } ] } , @@ -5069,6 +5073,10 @@ {"code": "destination", "type": 2,"length": 255,"name": "Назначение платежа","shortname": "Назначение платежа","visible": false } + , + {"code": "swiftCode", + "type": 2,"length": 255,"shortname": "SWIFT" + } ] } , @@ -5865,6 +5873,10 @@ {"code": "debitLeg_accountId", "type": 1,"group": "Получатель","name": "Наименование счета получателя","shortname": "Счет получателя","link": "bankAccount","linkCode": "correspondentAccount" } + , + {"code": "swiftCode", + "type": 2,"length": 255,"group": "Получатель","shortname": "SWIFT","enabled": false + } ] } , diff --git 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 index 76f32994d..dcc8df01b 100644 --- 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 @@ -25,6 +25,8 @@ public class BankAccountNewRequest { public String status; @JsonProperty public Long companyId; + @JsonProperty + public String swiftCode; public String getBankIdentificationCode() { return bankIdentificationCode; @@ -113,4 +115,12 @@ public class BankAccountNewRequest { public void setCompanyId(Long companyId) { this.companyId = companyId; } + + public String getSwiftCode() { + return swiftCode; + } + + public void setSwiftCode(String swiftCode) { + this.swiftCode = swiftCode; + } } diff --git 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 index 5ee6fc958..688a473e0 100644 --- 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 @@ -23,6 +23,8 @@ public class BankAccountUpdateRequest { public String taxRegistrationReasonCode;//Код причины постановки (КПП) @JsonProperty public String account;//Номер счета + @JsonProperty + public String swiftCode; public Long getId() { return id; @@ -103,4 +105,12 @@ public class BankAccountUpdateRequest { public void setAccount(String account) { this.account = account; } + + public String getSwiftCode() { + return swiftCode; + } + + public void setSwiftCode(String swiftCode) { + this.swiftCode = swiftCode; + } }