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 13b4362a5..320d3fdbf 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 @@ -107,6 +107,7 @@ public class CompanyInfoService extends QueueConsumer implements InitializingBea 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/controller/inbound/request/company/CompanyInfo.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/request/company/CompanyInfo.java index c56a76148..29c6cdc12 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/request/company/CompanyInfo.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/request/company/CompanyInfo.java @@ -57,6 +57,13 @@ public class CompanyInfo implements WithCompanyId { ) private String residence; + @JsonProperty("Признак резидентства: RES; NORES; MO") + @ApiModelProperty( + value = "Признак резидентства", + example = "RES" + ) + private String residenceType; + @Override public UUID getCompanyId() { return companyId; @@ -105,4 +112,12 @@ public class CompanyInfo implements WithCompanyId { public void setProfessionalSign(String professionalSign) { this.professionalSign = professionalSign; } + + public String getResidenceType() { + return residenceType; + } + + public void setResidenceType(String residenceType) { + this.residenceType = residenceType; + } } 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 6ec2e0833..8d9a7b070 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 @@ -50,15 +50,19 @@ public class CompanyRequestAdapter { companyInfoUpdateRequest.setLegalKind(companyInfo.getLegalKind()); companyInfoUpdateRequest.setOrganizationType(companyInfo.getOrganizationType()); + String residence; - if (counterCodeId == 643L) { - residence = "RUS"; - } else if (counterCodeId == 998L) { - residence = "WRLD"; + if (companyInfo.getResidenceType() != null) { + switch (companyInfo.getResidenceType()) { + case "NORES" -> residence = "XTRN"; + case "MO" -> residence = "WRLD"; + default -> residence = "RUS"; + } } else { - residence = "XTRN"; + residence = "RUS"; } companyInfoUpdateRequest.setResidence(residence); + companyInfoUpdateRequest.setResidenceCode(companyInfo.getResidence()); return companyInfoUpdateRequest; }