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

http://jira.mfd.msk:8088/browse/CLS-794 remove "-" for parentId

Browse source
This commit is contained in:
akulikov 2024-11-29 16:51:31 +03:00
parent 75ac48c00d
commit dd19fa74d9
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/SDFProcessService.java
View file

@ -117,7 +117,7 @@ public class SDFProcessService {
newSdf.setGenerationTime(now); newSdf.setGenerationTime(now);
newSdf.setGenerationId(sdf52.getGenerationId()); newSdf.setGenerationId(sdf52.getGenerationId());
newSdf.setMessageId(String.valueOf(sdf52.getGenerationId())); newSdf.setMessageId(String.valueOf(sdf52.getGenerationId()));
newSdf.setParentId(sdf52.getMessageId()); newSdf.setParentId(sdf52.getMessageId() != null ? sdf52.getMessageId().replaceAll("-", "") : null);
if (!Objects.equals(newGenerationId, newSdf.getGenerationId())) { // never if (!Objects.equals(newGenerationId, newSdf.getGenerationId())) { // never
log.warn("Different GenerationId={} for sdf53[{}] and GenerationId={} for group of sdf52", log.warn("Different GenerationId={} for sdf53[{}] and GenerationId={} for group of sdf52",
newSdf.getGenerationId(), newSdf.getId(), newGenerationId newSdf.getGenerationId(), newSdf.getId(), newGenerationId

4
clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf01Executor.java
View file

@ -302,7 +302,7 @@ public class Sdf01Executor extends AbstractExecutor<SDf01> {
sDf02.setGenerationId(generationIdForGroup); sDf02.setGenerationId(generationIdForGroup);
sDf02.setGenerationTime(Instant.now()); sDf02.setGenerationTime(Instant.now());
sDf02.setMessageId(String.valueOf(sdf01.getGenerationId())); sDf02.setMessageId(String.valueOf(sdf01.getGenerationId()));
sDf02.setParentId(sdf01.getMessageId()); sDf02.setParentId(sdf01.getMessageId() != null ? sdf01.getMessageId().replaceAll("-", "") : null);
return sDf02; return sDf02;
} }
@ -325,7 +325,7 @@ public class Sdf01Executor extends AbstractExecutor<SDf01> {
sDf02.setGenerationTime(Instant.now()); sDf02.setGenerationTime(Instant.now());
sDf02.setResult(SdfResult.OK.getKey()); sDf02.setResult(SdfResult.OK.getKey());
sDf02.setMessageId(String.valueOf(sdf01.getGenerationId())); sDf02.setMessageId(String.valueOf(sdf01.getGenerationId()));
sDf02.setParentId(sdf01.getMessageId()); sDf02.setParentId(sdf01.getMessageId() != null ? sdf01.getMessageId().replaceAll("-", "") : null);
return sDf02; return sDf02;
} }

2
clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf06Executor.java
View file

@ -358,7 +358,7 @@ public class Sdf06Executor {
sDf07.setDoc_num(sdf06.getDoc_num()); sDf07.setDoc_num(sdf06.getDoc_num());
sDf07.setPay_val(sdf06.getPay_val()); sDf07.setPay_val(sdf06.getPay_val());
sDf07.setMessageId(String.valueOf(sdf06.getGenerationId())); sDf07.setMessageId(String.valueOf(sdf06.getGenerationId()));
sDf07.setParentId(sdf06.getMessageId()); sDf07.setParentId(sdf06.getMessageId() != null ? sdf06.getParentId().replaceAll("-", "") : null);
return sDf07; return sDf07;
} }