diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/builder/PaymentInstructionBuilderFinalMkrDeals.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/builder/PaymentInstructionBuilderFinalMkrDeals.java index aa745265d..d5cf1554d 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/builder/PaymentInstructionBuilderFinalMkrDeals.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/builder/PaymentInstructionBuilderFinalMkrDeals.java @@ -92,24 +92,31 @@ public class PaymentInstructionBuilderFinalMkrDeals { payment1.setClearingDate(TimeUtil.toLocalDate(now)); payment1.setSenderId(lm_t.getCompanyId()); payment1.setAddresseeId(Sender.One.getId()); - String symbol1 = selectSymbolValue(payment1.getAddresseeId(), CompanySymbol.BIC); - if (symbol1 == null) { - log.warn("CompanySymbols BIC not found for companyId={}", payment1.getAddresseeId()); - } else { - payment1.setAdresseeBic(symbol1); + { + String addresseeBic = selectSymbolValue(payment1.getAddresseeId(), CompanySymbol.BIC); + if (addresseeBic == null) { + log.warn("CompanySymbols BIC not found for companyId={}", payment1.getAddresseeId()); + } else { + payment1.setAdresseeBic(addresseeBic); + } } - - Company companyPRC = companyImdg.getSingleObjectByID(Sender.Prc.getId()); // 2 "НКО АО ПРЦ" - String companyPRCName = null; - if (companyPRC == null) { - log.warn("Company.id={} not found", Sender.Prc.getId()); - } else { - companyPRCName = companyPRC.getShortName(); + { + Company companyPRC = companyImdg.getSingleObjectByID(Sender.Prc.getId()); // 2 "НКО АО ПРЦ" + if (companyPRC == null) { + log.warn("Company.id={} not found", Sender.Prc.getId()); + } else { + payment1.setPayeeBankName(companyPRC.getShortName()); + payment1.setAddresseeBankName(companyPRC.getShortName()); + } + } + { + String payeeBic = selectSymbolValue(payment1.getSenderId(), CompanySymbol.BIC); + if (payeeBic == null) { + log.warn("payeeBic by senderId={} not found", payment1.getSenderId()); + } else { + payment1.setPayeeBic(payeeBic); + } } - payment1.setPayeeBankName(companyPRCName); - payment1.setPayeeBic(symbolPRC); - - payment1.setAddresseeBankName(companyPRCName); payment1.setPaymentDate(TimeUtil.localDateToInstant(lm_t.getSettlementDate()));