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

http://jira.mfd.msk:8088/browse/CLS-631#comment-60200

Browse source
This commit is contained in:
etreschenkov 2024-05-31 15:40:38 +03:00
parent 5fb1b0526d
commit e327c3dbb1
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/ClearingAccountService.java
View file

@ -18,6 +18,7 @@ import org.springframework.beans.factory.InitializingBean;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
import ru.clearing.classes.statics.data.account.Account; import ru.clearing.classes.statics.data.account.Account;
import ru.clearing.classes.statics.data.account.ClearingAccount; import ru.clearing.classes.statics.data.account.ClearingAccount;
import ru.clearing.classes.statics.data.company.ClearingMemberCategory; import ru.clearing.classes.statics.data.company.ClearingMemberCategory;
@ -383,7 +384,7 @@ public class ClearingAccountService extends QueueConsumer implements Initializin
private synchronized Account createSdf52Account(String accountValue, String acctType, Long companyId, Long userRequestId) { private synchronized Account createSdf52Account(String accountValue, String acctType, Long companyId, Long userRequestId) {
{ // Валидация { // Валидация
boolean existClearingAccountTypeDictionary; boolean existClearingAccountTypeDictionary;
if (acctType == null) { if (!StringUtils.hasText(acctType)) {
existClearingAccountTypeDictionary = false; existClearingAccountTypeDictionary = false;
} else { } else {
ClearingAccountTypeDictionary catd = clearingAccountTypeDictionaryImdg.getFirstObjectByFieldValues( ClearingAccountTypeDictionary catd = clearingAccountTypeDictionaryImdg.getFirstObjectByFieldValues(

5
clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/TradingClearingRegistryService.java
View file

@ -279,9 +279,8 @@ public class TradingClearingRegistryService extends QueueConsumer implements Ini
} }
tradingClearingRegistry.setTradingClearingRegistryType(tradingRegistryType); tradingClearingRegistry.setTradingClearingRegistryType(tradingRegistryType);
TradingClearingRegistryPurpose registryPurpose; TradingClearingRegistryPurpose registryPurpose = TradingClearingRegistryPurpose.C;
if (req.getDepoAccountId() != null) registryPurpose = TradingClearingRegistryPurpose.C; //http://jira.mfd.msk:8088/browse/CLS-631#comment-60200
else registryPurpose = TradingClearingRegistryPurpose.M;
tradingClearingRegistry.setTradingClearingRegistryPurpose(registryPurpose.getKey()); tradingClearingRegistry.setTradingClearingRegistryPurpose(registryPurpose.getKey());
Company company = companyImdg.getSingleObjectByID(req.getCompanyId()); Company company = companyImdg.getSingleObjectByID(req.getCompanyId());