treshenkov/clearing
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

http://jira.mfd.msk:8088/browse/CLS-907

Browse source
This commit is contained in:
etreschenkov 2025-09-26 13:10:04 +03:00
parent 7a403cafa0
commit a5fef272ba
3 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/CompanyInfoService.java
View file

@ -103,11 +103,18 @@ public class CompanyInfoService extends QueueConsumer implements InitializingBea
countryCode = countryCodeDictionary.getCode(); countryCode = countryCodeDictionary.getCode();
} }
companyInfo.setCountryCode(countryCode); 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.setProfessionalSign(req.getProfessionalSign());
companyInfo.setLegalKind(req.getLegalKind()); companyInfo.setLegalKind(req.getLegalKind());
companyInfo.setOrganizationType(req.getOrganizationType()); companyInfo.setOrganizationType(req.getOrganizationType());
companyInfo.setResidence(req.getResidence()); companyInfo.setResidence(req.getResidence());
companyInfo.setResidenceCode(req.getResidenceCode());
companyInfo.setCorporationSoleType(req.getCorporationSoleType()); companyInfo.setCorporationSoleType(req.getCorporationSoleType());
companyInfo.setDescription(req.getDescription()); companyInfo.setDescription(req.getDescription());

3
clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/adapter/CompanyRequestAdapter.java
View file

@ -62,7 +62,8 @@ public class CompanyRequestAdapter {
residence = "RUS"; residence = "RUS";
} }
companyInfoUpdateRequest.setResidence(residence); companyInfoUpdateRequest.setResidence(residence);
companyInfoUpdateRequest.setResidenceCode(companyInfo.getResidence()); Long residenceCodeId = Long.valueOf(companyInfo.getResidence());
companyInfoUpdateRequest.setResidenceCodeId(residenceCodeId);
return companyInfoUpdateRequest; return companyInfoUpdateRequest;
} }

10
platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/company/CompanyInfoUpdateRequest.java
View file

@ -45,6 +45,8 @@ public class CompanyInfoUpdateRequest {
private LocalDate registrationDate; private LocalDate registrationDate;
@JsonProperty @JsonProperty
private String residenceCode; private String residenceCode;
@JsonProperty
private Long residenceCodeId;
public Long getId() { public Long getId() {
return id; return id;
@ -181,4 +183,12 @@ public class CompanyInfoUpdateRequest {
public void setResidenceCode(String residenceCode) { public void setResidenceCode(String residenceCode) {
this.residenceCode = residenceCode; this.residenceCode = residenceCode;
} }
public Long getResidenceCodeId() {
return residenceCodeId;
}
public void setResidenceCodeId(Long residenceCodeId) {
this.residenceCodeId = residenceCodeId;
}
} }