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 c3199aca8..e7648af78 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 @@ -11,7 +11,6 @@ import org.springframework.stereotype.Service; import ru.clearing.classes.statics.data.company.Company; import ru.clearing.classes.statics.data.profile.CompanyInfo; import ru.spcex.clearing.company.error.CompanyErrors; -import ru.spcex.clearing.util.services.RequestHelper; import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.clearing.platform.messaging.domain.BaseRequest; import ru.spcex.clearing.platform.messaging.domain.Consts; @@ -19,6 +18,7 @@ import ru.spcex.clearing.platform.messaging.domain.cud.company.CompanyInfoUpdate import ru.spcex.clearing.platform.messaging.service.QueueConsumer; import ru.spcex.clearing.platform.messaging.service.RequestInfoUpdate; import ru.spcex.clearing.util.security.UserRoleVerification; +import ru.spcex.clearing.util.services.RequestHelper; import ru.spcex.clearing.validation.common.ValidationHelper; import ru.spcex.platform.imdg.api.Imdg; import ru.spcex.platform.imdg.api.ImdgProvider; @@ -89,18 +89,17 @@ public class CompanyInfoService extends QueueConsumer implements InitializingBea company.setUpdated(Instant.now()); CompanyInfo companyInfo = company.getProfile(); - companyInfo.setCorporationSoleType(req.getCorporationSoleType()); companyInfo.setCountryCode(req.getCountryCode()); - companyInfo.setDescription(req.getDescription()); companyInfo.setProfessionalSign(req.getProfessionalSign()); companyInfo.setLegalKind(req.getLegalKind()); companyInfo.setOrganizationType(req.getOrganizationType()); companyInfo.setResidence(req.getResidence()); + + companyInfo.setCorporationSoleType(req.getCorporationSoleType()); + companyInfo.setDescription(req.getDescription()); companyInfo.setShortNameEng(req.getShortNameEng()); companyInfo.setFullNameEng(req.getFullNameEng()); - company.setShortName(req.getShortName()); - company.setFullName(req.getFullName()); boolean simpleUpdate = true; if (req.getWorkflowStatus() != null) { String prevStatus = company.getWorkflowStatus(); diff --git a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/CompanyService.java b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/CompanyService.java index 9840b6db3..ebca476fb 100644 --- a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/CompanyService.java +++ b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/CompanyService.java @@ -76,7 +76,6 @@ public class CompanyService extends QueueConsumer implements InitializingBean { super(kafkaQueue, kafkaProducer); this.imdgProvider = imdgProvider; this.requestHelper = requestHelper.setLogger(log); - this.idSequence = imdgProvider.getImdgIdGenerator(); this.userRoleVerification = userRoleVerification; userRoleVerification.setRoleForVerification(UserRole.Admin); @@ -409,6 +408,10 @@ public class CompanyService extends QueueConsumer implements InitializingBean { company.setShortName(req.getShortName()); company.setFullName(req.getFullName()); + company.setTradingCode(req.getTradingCode()); + company.setClearingCode(req.getClearingCode()); + company.setRegistrationCode(req.getRegistrationCode()); +// company.setInitiatorCode(req.getInitiatorCode()); ImdgTransaction transaction = imdgProvider.newTransaction(); transaction.beginTransaction(); @@ -442,6 +445,9 @@ public class CompanyService extends QueueConsumer implements InitializingBean { company.setUpdated(Instant.now()); company.setShortName(req.getShortName()); company.setFullName(req.getFullName()); + company.setTradingCode(req.getTradingCode()); + company.setClearingCode(req.getClearingCode()); + company.setRegistrationCode(req.getRegistrationCode()); if (req.getCompanySymbol() != null || req.getCompanySymbolValue() != null) { log.trace("Request field CompanySymbol, CompanySymbolValue ignore for update company request."); diff --git a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/MultiCompanyService.java b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/MultiCompanyService.java index 0511f22f9..4a00ab8c0 100644 --- a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/MultiCompanyService.java +++ b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/MultiCompanyService.java @@ -73,16 +73,13 @@ public class MultiCompanyService ContactService contactService, AccountNotificationHelper accountNotification, RelationService relationService, - ValidationHelper validationHelper + ValidationHelper validationHelper, + UserRoleVerification userRoleVerification ) { super(kafkaQueue, kafkaProducer); this.imdgProvider = imdgProvider; this.requestHelper = requestHelper.setLogger(log); - -// this.idSequence = imdgProvider.getImdgIdGenerator(); -// this.userRoleVerification = userRoleVerification; -// userRoleVerification.setRoleForVerification(UserRole.Admin); -// this.validationHelper = validationHelper; + this.userRoleVerification = userRoleVerification; this.companyService = companyService; this.companyInfoService = companyInfoService; this.profileDocumentService = profileDocumentService;