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

итоговая МКР создание PaymentInstruction по сделкам bugfix

Browse source
This commit is contained in:
ialbert 2023-06-08 14:00:04 +03:00
parent e7d2b420d4
commit d8e519c838
2 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/builder/PaymentInstructionBuilderFinalMkr.java → clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/builder/PaymentInstructionBuilderFinalMkrDeals.java
View file

@ -25,8 +25,8 @@ import java.util.concurrent.atomic.AtomicLong;
/**
* Builder для кейса итоговой сессии МКР, 7 шаг, кейс - по сделкам
*/
public class PaymentInstructionBuilderFinalMkr {
private final static Logger log = LoggerFactory.getLogger(PaymentInstructionBuilderFinalMkr.class);
public class PaymentInstructionBuilderFinalMkrDeals {
private final static Logger log = LoggerFactory.getLogger(PaymentInstructionBuilderFinalMkrDeals.class);
private Registry cm_t;
@ -43,38 +43,38 @@ public class PaymentInstructionBuilderFinalMkr {
protected AtomicLong documentNumberId = new AtomicLong(0L); // порядковый номер (сквозной по всем компаниям за день
private static final DateTimeFormatter DATE_FORMATTER_ddMMyy = DateTimeFormatter.ofPattern("ddMMyy");
public static PaymentInstructionBuilderFinalMkr builder(ImdgProvider imdgProvider) {
return new PaymentInstructionBuilderFinalMkr(imdgProvider);
public static PaymentInstructionBuilderFinalMkrDeals builder(ImdgProvider imdgProvider) {
return new PaymentInstructionBuilderFinalMkrDeals(imdgProvider);
}
private PaymentInstructionBuilderFinalMkr(ImdgProvider imdgProvider) {
private PaymentInstructionBuilderFinalMkrDeals(ImdgProvider imdgProvider) {
this.accountImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_Account, Account.class);
this.companyImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_Company, Company.class);
this.companySymbolsImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_CompanySymbols, CompanySymbols.class);
this.securityImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_Security, Security.class);
}
public PaymentInstructionBuilderFinalMkr lm_t(Registry lm_t) {
public PaymentInstructionBuilderFinalMkrDeals lm_t(Registry lm_t) {
this.lm_t = lm_t;
return this;
}
public PaymentInstructionBuilderFinalMkr cm_t(Registry cm_t) {
public PaymentInstructionBuilderFinalMkrDeals cm_t(Registry cm_t) {
this.cm_t = cm_t;
return this;
}
public PaymentInstructionBuilderFinalMkr tranAcc(Account account) {
public PaymentInstructionBuilderFinalMkrDeals tranAcc(Account account) {
this.tranAccount = account;
return this;
}
public PaymentInstructionBuilderFinalMkr sessionId(Long sessionId) {
public PaymentInstructionBuilderFinalMkrDeals sessionId(Long sessionId) {
this.sessionId = sessionId;
return this;
}
public PaymentInstructionBuilderFinalMkr amount(BigDecimal amount) {
public PaymentInstructionBuilderFinalMkrDeals amount(BigDecimal amount) {
this.amount = amount;
return this;
}
@ -237,7 +237,7 @@ public class PaymentInstructionBuilderFinalMkr {
Account account = accountImdg.getSingleObjectByFieldValues(Map.of(
"companyId", companyId,
"accountType", accountType.getKey(),
"accountStatus", accountStatus.getKey(),
"status", accountStatus.getKey(),
"processingSign", processingSign.getKey()
));
if (account == null) {

4
clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/FormingPaymentInstructionDealsFinalMkr.java
View file

@ -18,7 +18,7 @@ import ru.spcex.clearing.imdg.IMDGDistributedNames;
import ru.spcex.clearing.platform.messaging.domain.Consts;
import ru.spcex.clearing.platform.messaging.domain.cud.balance.ExportToFileRequest;
import ru.spcex.clearing.platform.messaging.service.sender.KafkaSender;
import ru.spcex.clearing.service.builder.PaymentInstructionBuilderFinalMkr;
import ru.spcex.clearing.service.builder.PaymentInstructionBuilderFinalMkrDeals;
import ru.spcex.clearing.session.stage.ISessionStage;
import ru.spcex.clearing.session.stage.StageResult;
import ru.spcex.clearing.session.stage.Task;
@ -145,7 +145,7 @@ public class FormingPaymentInstructionDealsFinalMkr implements ISessionStage {
groupId,
rgsCmt.getId(),
rgsLmt.getId());
Pair<PaymentInstruction, PaymentInstruction> pmtInstrs = PaymentInstructionBuilderFinalMkr
Pair<PaymentInstruction, PaymentInstruction> pmtInstrs = PaymentInstructionBuilderFinalMkrDeals
.builder(imdgProvider)
.cm_t(rgsCmt)
.lm_t(rgsLmt)