diff --git a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/BankAccountService.java b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/BankAccountService.java index a8513210c..ded1d1dec 100644 --- a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/BankAccountService.java +++ b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/BankAccountService.java @@ -138,6 +138,7 @@ public class BankAccountService extends QueueConsumer implements InitializingBea bankAccount.setCompanyId(req.getCompanyId()); bankAccount.setAccountId(accountId); bankAccount.setSwiftCode(req.getSwiftCode()); + bankAccount.setIntermediarySwiftCode(req.getIntermediarySwiftCode()); bankAccountId = bankAccountMap.insert(bankAccount); txOk = true; @@ -176,6 +177,7 @@ public class BankAccountService extends QueueConsumer implements InitializingBea bankAccount.setTaxRegistrationReasonCode(req.getTaxRegistrationReasonCode()); bankAccount.setAccount(req.getAccount()); bankAccount.setSwiftCode(req.getSwiftCode()); + bankAccount.setIntermediarySwiftCode(req.getIntermediarySwiftCode()); Account account = accountMap.getSingleObjectByID(bankAccount.getAccountId()); account.setAccount(req.account); 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 a8d013425..7f252b347 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 @@ -50,6 +50,9 @@ public class BankAccountNewAction implements IAction { @ApiModelProperty(value = "SWIFT", example = "ABCDE") @JsonProperty private String swiftCode; + @ApiModelProperty(value = "Код SWIFT посредника", example = "ABCDE") + @JsonProperty + private String intermediarySwiftCode; @Override public BankAccountNewRequest toRequest() { @@ -65,6 +68,7 @@ public class BankAccountNewAction implements IAction { req.setAccount(this.account); req.setCompanyId(this.companyId); req.setSwiftCode(swiftCode); + req.setIntermediarySwiftCode(intermediarySwiftCode); return req; } @@ -161,4 +165,12 @@ public class BankAccountNewAction implements IAction { public void setSwiftCode(String swiftCode) { this.swiftCode = swiftCode; } + + public String getIntermediarySwiftCode() { + return intermediarySwiftCode; + } + + public void setIntermediarySwiftCode(String intermediarySwiftCode) { + this.intermediarySwiftCode = intermediarySwiftCode; + } } 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 9418aa266..bbdfff7be 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 @@ -41,6 +41,9 @@ public class BankAccountUpdateAction implements IAction - + @@ -1169,6 +1169,7 @@ + @@ -1182,6 +1183,7 @@ + diff --git a/clearing-parent/backend-api/src/test/resources/meta.json b/clearing-parent/backend-api/src/test/resources/meta.json index 6dffc7608..17439b927 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.12.0.91", + "version": "3.12.0.92", "enums": { @@ -5030,6 +5030,10 @@ {"code": "destination", "type": 2,"length": 255,"name": "Назначение платежа","shortname": "Назначение платежа","visible": true } + , + {"code": "intermediarySwiftCode", + "type": 2,"length": 255,"name": "Код SWIFT посредника","shortname": "SWIFT посредника","searchable": true,"sortable": true,"visible": true + } ] } , @@ -5085,6 +5089,10 @@ {"code": "destination", "type": 2,"length": 255,"name": "Назначение платежа","shortname": "Назначение платежа","visible": true } + , + {"code": "intermediarySwiftCode", + "type": 2,"length": 255,"name": "Код SWIFT посредника","shortname": "SWIFT посредника","searchable": true,"sortable": true,"visible": true + } ] } , 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 dcc8df01b..964b8b449 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 @@ -27,6 +27,8 @@ public class BankAccountNewRequest { public Long companyId; @JsonProperty public String swiftCode; + @JsonProperty + private String intermediarySwiftCode; public String getBankIdentificationCode() { return bankIdentificationCode; @@ -123,4 +125,12 @@ public class BankAccountNewRequest { public void setSwiftCode(String swiftCode) { this.swiftCode = swiftCode; } + + public String getIntermediarySwiftCode() { + return intermediarySwiftCode; + } + + public void setIntermediarySwiftCode(String intermediarySwiftCode) { + this.intermediarySwiftCode = intermediarySwiftCode; + } } 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 688a473e0..ff513688a 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 @@ -25,6 +25,8 @@ public class BankAccountUpdateRequest { public String account;//Номер счета @JsonProperty public String swiftCode; + @JsonProperty + private String intermediarySwiftCode; public Long getId() { return id; @@ -113,4 +115,12 @@ public class BankAccountUpdateRequest { public void setSwiftCode(String swiftCode) { this.swiftCode = swiftCode; } + + public String getIntermediarySwiftCode() { + return intermediarySwiftCode; + } + + public void setIntermediarySwiftCode(String intermediarySwiftCode) { + this.intermediarySwiftCode = intermediarySwiftCode; + } }