diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/company/CompanyInfoUpdateAction.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/company/CompanyInfoUpdateAction.java index e9ec48c61..1e74c7cb8 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/company/CompanyInfoUpdateAction.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/company/CompanyInfoUpdateAction.java @@ -1,10 +1,15 @@ package ru.spcex.clearing.backendapi.controller.request.cud.company; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; import io.swagger.annotations.ApiModelProperty; +import java.time.LocalDate; import ru.spcex.clearing.backendapi.domain.actions.IAction; import ru.spcex.clearing.platform.messaging.domain.ActionType; import ru.spcex.clearing.platform.messaging.domain.cud.company.CompanyInfoUpdateRequest; +import ru.spcex.clearing.platform.messaging.domain.json.deserialize.LocalDateDeserializer; +import ru.spcex.clearing.platform.messaging.domain.json.serialize.LocalDateSerializer; public class CompanyInfoUpdateAction implements IAction { @ApiModelProperty(hidden = true) @@ -47,6 +52,14 @@ public class CompanyInfoUpdateAction implements IAction - + @@ -344,6 +344,11 @@ + + + + + @@ -444,6 +449,8 @@ + + @@ -460,6 +467,8 @@ + + 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 ccdd7723e..fccbe1798 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 @@ -104,6 +104,8 @@ public class CompanyInfoService extends QueueConsumer implements InitializingBea companyInfo.setDescription(req.getDescription()); companyInfo.setShortNameEng(req.getShortNameEng()); companyInfo.setFullNameEng(req.getFullNameEng()); + companyInfo.setTaxNumber(req.getTaxNumber()); + companyInfo.setRegistrationDate(req.getRegistrationDate()); boolean simpleUpdate = true; if (req.getWorkflowStatus() != null) { diff --git a/clearing-parent/trade-importer/src/main/java/ru/spcex/clearing/trade/importer/services/TradeImporterService.java b/clearing-parent/trade-importer/src/main/java/ru/spcex/clearing/trade/importer/services/TradeImporterService.java index 8add89ed9..2940ca7a5 100644 --- a/clearing-parent/trade-importer/src/main/java/ru/spcex/clearing/trade/importer/services/TradeImporterService.java +++ b/clearing-parent/trade-importer/src/main/java/ru/spcex/clearing/trade/importer/services/TradeImporterService.java @@ -185,19 +185,25 @@ public class TradeImporterService { * returns OK - everything is kk */ private boolean fillNessessaryFields(STrades tradesDb) { - Consumer logErr = (st) -> log.error("strades {} {} {}", tradesDb.getTradeDate(), tradesDb.getTradeNum(), st); + Consumer log = (st) -> { + if (tradesDb.getClassCode().contains("INSTR")) + this.log.warn("strades {} {} {}", tradesDb.getTradeDate(), tradesDb.getTradeNum(), st); + else { + this.log.error("strades {} {} {}", tradesDb.getTradeDate(), tradesDb.getTradeNum(), st); + } + }; try { Market market = marketImdg.getFirstObjectBySQL("code = '%s'".formatted(tradesDb.getClassCode())); if (market == null) { if (blacklistMarketImdg.getFirstObjectByFieldValues(Map.of("code", tradesDb.getClassCode())) == null) { - logErr.accept("couldn't find market.section for classCode " + tradesDb.getClassCode()); + log.accept("couldn't find market.section for classCode " + tradesDb.getClassCode()); } return false; } tradesDb.setSection(market.getSection()); return true; } catch (Exception e) { - logErr.accept(ExceptionUtils.getStackTrace(e)); + log.accept(ExceptionUtils.getStackTrace(e)); return false; } } 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 5a7cd8c5a..b465ec317 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 @@ -1,6 +1,11 @@ package ru.spcex.clearing.platform.messaging.domain.cud.company; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import java.time.LocalDate; +import ru.spcex.clearing.platform.messaging.domain.json.deserialize.LocalDateDeserializer; +import ru.spcex.clearing.platform.messaging.domain.json.serialize.LocalDateSerializer; public class CompanyInfoUpdateRequest { @JsonProperty @@ -30,6 +35,12 @@ public class CompanyInfoUpdateRequest { private String fullName; @JsonProperty private String workflowStatus; + @JsonProperty + private String taxNumber; + @JsonSerialize(using = LocalDateSerializer.class) + @JsonDeserialize(using = LocalDateDeserializer.class) + @JsonProperty + private LocalDate registrationDate; public Long getId() { return id; @@ -134,4 +145,20 @@ public class CompanyInfoUpdateRequest { public void setWorkflowStatus(String workflowStatus) { this.workflowStatus = workflowStatus; } + + public String getTaxNumber() { + return taxNumber; + } + + public void setTaxNumber(String taxNumber) { + this.taxNumber = taxNumber; + } + + public LocalDate getRegistrationDate() { + return registrationDate; + } + + public void setRegistrationDate(LocalDate registrationDate) { + this.registrationDate = registrationDate; + } }