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

Merge remote-tracking branch 'origin/dev' into dev

Browse source
This commit is contained in:
ialbert 2022-09-13 20:37:02 +03:00
commit 1e622e5de5
2 changed files with 3 additions and 3 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/config/settings/AccountServiceSettings.java
View file

@ -8,7 +8,7 @@ import ru.spcex.platform.imdg.iml.hazelcast.config.HazelcastClientParams;
@Component @Component
@PropertySource("file:${spring.config.location}/application.properties") @PropertySource("file:${spring.config.location}/application.properties")
@ConfigurationProperties("utility-service") @ConfigurationProperties("account-service")
public class AccountServiceSettings { public class AccountServiceSettings {
private HazelcastClientParams hazelcast; private HazelcastClientParams hazelcast;
private KafkaConsumerSettings kafka; private KafkaConsumerSettings kafka;

4
clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/BankAccountService.java
View file

@ -44,7 +44,7 @@ public class BankAccountService extends QueueConsumer implements InitializingBea
private void bankAccountNew(BaseRequest<BankAccountNewRequest> userRequest) { private void bankAccountNew(BaseRequest<BankAccountNewRequest> userRequest) {
BankAccountNewRequest req = userRequest.getRequestPayload(); BankAccountNewRequest req = userRequest.getRequestPayload();
log.debug("MoneyMarketSecurityNewRequest received"); log.debug("BankAccountNewRequest received");
BankAccount bankAccount = new BankAccount(); BankAccount bankAccount = new BankAccount();
bankAccount.setBankIdentificationCode(req.getBankIdentificationCode()); bankAccount.setBankIdentificationCode(req.getBankIdentificationCode());
bankAccount.setBankName(req.getBankName()); bankAccount.setBankName(req.getBankName());
@ -61,7 +61,7 @@ public class BankAccountService extends QueueConsumer implements InitializingBea
private void bankAccountUpdate(BaseRequest<BankAccountUpdateRequest> userRequest) { private void bankAccountUpdate(BaseRequest<BankAccountUpdateRequest> userRequest) {
BankAccountUpdateRequest req = userRequest.getRequestPayload(); BankAccountUpdateRequest req = userRequest.getRequestPayload();
log.debug("MoneyMarketSecurityUpdateRequest received id = {}", req.getId()); log.debug("BankAccountUpdateRequest received id = {}", req.getId());
BankAccount bankAccount = bankAccountMap.getSingleObjectByID(req.getId()); BankAccount bankAccount = bankAccountMap.getSingleObjectByID(req.getId());
bankAccount.setBankIdentificationCode(req.getBankIdentificationCode()); bankAccount.setBankIdentificationCode(req.getBankIdentificationCode());
bankAccount.setBankName(req.getBankName()); bankAccount.setBankName(req.getBankName());