From 40c2bdc64a06f90df30777f5c5f121cb9dd62ead Mon Sep 17 00:00:00 2001 From: AKurakin Date: Tue, 20 Jun 2023 14:40:47 +0300 Subject: [PATCH] =?UTF-8?q?account-service=20http://jira.mfd.msk:8088/brow?= =?UTF-8?q?se/CLS-271=20=D0=A2=D0=9A=D0=A0,=20=D1=87=D0=B0=D1=81=D1=82?= =?UTF-8?q?=D1=8C,=20=D0=BE=D1=81=D1=82=D0=B0=D0=BB=D1=8C=D0=BD=D0=BE?= =?UTF-8?q?=D0=B5=20=D1=81=D0=BC.=20company-service=20=D1=87=D1=82=D0=BE?= =?UTF-8?q?=20=D0=BF=D1=80=D0=B8=D1=81=D1=8B=D0=BB=D0=B0=D0=B5=D1=82.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/TradingClearingRegistryService.java | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/TradingClearingRegistryService.java b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/TradingClearingRegistryService.java index 701d367b3..a8ccb28b8 100644 --- a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/TradingClearingRegistryService.java +++ b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/TradingClearingRegistryService.java @@ -356,20 +356,12 @@ public class TradingClearingRegistryService extends QueueConsumer implements Ini TradingClearingRegistryUpdateRequest req = userRequest.getRequestPayload(); TradingClearingRegistry tradingClearingRegistry = tradingClearingRegistryImdg.getSingleObjectByID(req.getId()); -// // Дополнительная проверка -// if (req.getMoneyAccountId() == null && (req.getMoneyAccountId() == null || req.getDepoAccountId() == null)) { -// TradingClearingRegistry registryByCompany = tradingClearingRegistryImdg.getSingleObjectByFieldValues(Map.of("companyId", tradingClearingRegistry.getCompanyId())); -// if (registryByCompany == null) { // never -// return requestHelper.makeErrorResponse(userRequest, -// AccountError.TradingClearingRegistryNotFound, -// "companyId=" + req.getCompanyId()); -// } -// } - if (req.getStatus() != null) tradingClearingRegistry.setStatus(req.getStatus()); Instant now = Instant.now(); tradingClearingRegistry.setUpdated(now); + tradingClearingRegistry.setMoneyAccountId(req.getMoneyAccountId()); + tradingClearingRegistry.setDepoAccountId(req.getDepoAccountId()); tradingClearingRegistryImdg.update(tradingClearingRegistry);