From 299ecd9b264385779e112e6c92fc844b0e9ce575 Mon Sep 17 00:00:00 2001 From: AKurakin Date: Tue, 17 Jan 2023 13:25:50 +0300 Subject: [PATCH] =?UTF-8?q?account-service=20http://jira.mfd.msk:8088/brow?= =?UTF-8?q?se/CLS-230=20(=D0=BF=D0=B5=D1=80=D0=B5=D0=B4=D0=B5=D0=BB=D0=B0?= =?UTF-8?q?=D0=BB)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../clearing/account/service/BankAccountService.java | 2 +- .../request/cud/account/BankAccountNewAction.java | 4 ++++ .../domain/cud/account/BankAccountNewRequest.java | 8 ++++++++ 3 files changed, 13 insertions(+), 1 deletion(-) 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 636d6064f..e5bf7c090 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 @@ -90,6 +90,7 @@ public class BankAccountService extends QueueConsumer implements InitializingBea bankAccount.setTaxpayerIdentificationNumber(req.getTaxpayerIdentificationNumber()); bankAccount.setTaxRegistrationReasonCode(req.getTaxRegistrationReasonCode()); bankAccount.setAccount(req.getAccount()); + bankAccount.setCompanyId(req.getCompanyId()); Account account = new Account(); account.setAccount(req.account); @@ -101,7 +102,6 @@ public class BankAccountService extends QueueConsumer implements InitializingBea if (relationByCompany != null) { account.setRelationId(relationByCompany.getId()); account.setCompanyId(relationByCompany.getConsumerId()); - bankAccount.setCompanyId(relationByCompany.getConsumerId()); } else { log.warn("Not found relation by condition: {}", relationSqlCondition); } 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 4eb28f6c3..a758e3e93 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 @@ -44,6 +44,9 @@ public class BankAccountNewAction implements IAction { @ApiModelProperty(value = "Номер счета", example = "1234567") @JsonProperty private String account; + @ApiModelProperty(value = "Компания", example = "1234") + @JsonProperty + private Long companyId; @Override public Collection validate() { @@ -88,6 +91,7 @@ public class BankAccountNewAction implements IAction { req.setTaxpayerIdentificationNumber(this.taxpayerIdentificationNumber); req.setTaxRegistrationReasonCode(this.taxRegistrationReasonCode); req.setAccount(this.account); + req.setCompanyId(this.companyId); return req; } 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 4d7300722..640ea0c19 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 @@ -95,4 +95,12 @@ public class BankAccountNewRequest { public void setAccount(String account) { this.account = account; } + + public Long getCompanyId() { + return companyId; + } + + public void setCompanyId(Long companyId) { + this.companyId = companyId; + } }