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

fix CompanyService

Browse source
This commit is contained in:
etreschenkov 2023-06-14 18:46:31 +03:00
parent acbd5c4b05
commit abaf107700
3 changed files with 14 additions and 12 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

@ -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();

8
clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/CompanyService.java
View file

@ -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.");

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

@ -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;