diff --git a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/ClearingAccountService.java b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/ClearingAccountService.java index f5c2277b3..a79c57146 100644 --- a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/ClearingAccountService.java +++ b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/ClearingAccountService.java @@ -113,7 +113,7 @@ public class ClearingAccountService extends QueueConsumer implements Initializin @Qualifier("clearingAccountNewRequestValidator") Function clearingAccountNewRequestValidator, @Qualifier("clearingAccountUpdateRequestValidator") - Function clearingAccountUpdateRequestValidator, Imdg rgsImdg) { + Function clearingAccountUpdateRequestValidator) { super(kafkaQueue, kafkaResponseQueue); this.kafkaSender = kafkaSender; this.accountService = accountService; @@ -135,7 +135,7 @@ public class ClearingAccountService extends QueueConsumer implements Initializin this.tradingClearingRegistryImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_TradingClearingRegistry, TradingClearingRegistry.class); this.notificationImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_Notification, Notification.class); this.clearingAccountTypeDictionaryImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_ClearingAccountTypeDictionary, ClearingAccountTypeDictionary.class); - this.rgsImdg = rgsImdg; + this.rgsImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_Registry, Registry.class); } @Override diff --git a/clearing-parent/backend-api/src/main/resources/meta/meta.json b/clearing-parent/backend-api/src/main/resources/meta/meta.json index ad3c1050f..08719a24e 100644 --- a/clearing-parent/backend-api/src/main/resources/meta/meta.json +++ b/clearing-parent/backend-api/src/main/resources/meta/meta.json @@ -1,6 +1,6 @@ { - "version": "3.23.295.155", + "version": "3.23.295.156", "enums": { @@ -10862,7 +10862,7 @@ } , {"code": "date", - "type": 6,"name": "Дата торгов","shortname": "Дата торгов","searchable": true,"sortable": true,"visible": false + "type": 6,"name": "Дата торгов","shortname": "Дата торгов","searchable": true,"sortable": true,"visible": true } , {"code": "currency", diff --git a/clearing-parent/backend-api/src/main/resources/meta/meta.xml b/clearing-parent/backend-api/src/main/resources/meta/meta.xml index eaff9fb60..976ad44a0 100644 --- a/clearing-parent/backend-api/src/main/resources/meta/meta.xml +++ b/clearing-parent/backend-api/src/main/resources/meta/meta.xml @@ -1,6 +1,6 @@ - + @@ -2515,7 +2515,7 @@ - + diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/GatewayService.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/GatewayService.java index a9042d6b7..10a077f1e 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/GatewayService.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/GatewayService.java @@ -216,10 +216,10 @@ public class GatewayService extends QueueConsumer implements InitializingBean { outboundRequestByUuid.put(settleRateReq.getId(), settleRateReq); outboundRequestByUuid.put(cbRateReq.getId(), cbRateReq); - log.debug("LORT task 1/2 complete (SETTLE_RATE)"); sendRequest(settleRateReq); - log.debug("LORT task 2/2 complete (CB_RATE)"); + log.debug("LORT task 1/2 complete (SETTLE_RATE)"); sendRequest(cbRateReq); + log.debug("LORT task 2/2 complete (CB_RATE)"); } public void requestOnAsset(BaseRequest request) {