From a5fef272baf4a26b9ca0352b145d9d36609447f3 Mon Sep 17 00:00:00 2001 From: etreschenkov Date: Fri, 26 Sep 2025 13:10:04 +0300 Subject: [PATCH] http://jira.mfd.msk:8088/browse/CLS-907 --- .../clearing/company/service/CompanyInfoService.java | 9 ++++++++- .../service/adapter/CompanyRequestAdapter.java | 3 ++- .../domain/cud/company/CompanyInfoUpdateRequest.java | 10 ++++++++++ 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/CompanyInfoService.java b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/CompanyInfoService.java index 320d3fdbf..c2648221e 100644 --- a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/CompanyInfoService.java +++ b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/CompanyInfoService.java @@ -103,11 +103,18 @@ public class CompanyInfoService extends QueueConsumer implements InitializingBea countryCode = countryCodeDictionary.getCode(); } companyInfo.setCountryCode(countryCode); + + String residenceCode = req.getResidenceCode(); + if (req.getResidenceCodeId() != null) { + CountryCodeDictionary countryCodeDictionary = countryCodeDictionaryImdg.getSingleObjectByID(req.getResidenceCodeId()); + residenceCode = countryCodeDictionary.getCode(); + } + companyInfo.setResidenceCode(residenceCode); + companyInfo.setProfessionalSign(req.getProfessionalSign()); companyInfo.setLegalKind(req.getLegalKind()); companyInfo.setOrganizationType(req.getOrganizationType()); companyInfo.setResidence(req.getResidence()); - companyInfo.setResidenceCode(req.getResidenceCode()); companyInfo.setCorporationSoleType(req.getCorporationSoleType()); companyInfo.setDescription(req.getDescription()); diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/adapter/CompanyRequestAdapter.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/adapter/CompanyRequestAdapter.java index 8d9a7b070..4b5460042 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/adapter/CompanyRequestAdapter.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/adapter/CompanyRequestAdapter.java @@ -62,7 +62,8 @@ public class CompanyRequestAdapter { residence = "RUS"; } companyInfoUpdateRequest.setResidence(residence); - companyInfoUpdateRequest.setResidenceCode(companyInfo.getResidence()); + Long residenceCodeId = Long.valueOf(companyInfo.getResidence()); + companyInfoUpdateRequest.setResidenceCodeId(residenceCodeId); return companyInfoUpdateRequest; } diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/company/CompanyInfoUpdateRequest.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/company/CompanyInfoUpdateRequest.java index 5e519c030..3ae945704 100644 --- a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/company/CompanyInfoUpdateRequest.java +++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/company/CompanyInfoUpdateRequest.java @@ -45,6 +45,8 @@ public class CompanyInfoUpdateRequest { private LocalDate registrationDate; @JsonProperty private String residenceCode; + @JsonProperty + private Long residenceCodeId; public Long getId() { return id; @@ -181,4 +183,12 @@ public class CompanyInfoUpdateRequest { public void setResidenceCode(String residenceCode) { this.residenceCode = residenceCode; } + + public Long getResidenceCodeId() { + return residenceCodeId; + } + + public void setResidenceCodeId(Long residenceCodeId) { + this.residenceCodeId = residenceCodeId; + } }