This commit is contained in:
@@ -95,7 +95,14 @@ public class UserController {
|
||||
fileStatsService.filesCompanyCount(user.getId()):
|
||||
fileStatsService.filesUserCount(user.getId());
|
||||
|
||||
TariffInfo personalTariffInfo = user.getPersonalTariffInfo();
|
||||
TariffInfo personalTariffInfo;
|
||||
|
||||
if (user.getCompany() == null) {
|
||||
personalTariffInfo = user.getPersonalTariffInfo();
|
||||
} else {
|
||||
personalTariffInfo = user.getCompany().getTariffInfo();
|
||||
}
|
||||
|
||||
Tariff tariff = personalTariffInfo.getTariff();
|
||||
|
||||
TariffInfoDTO infoDTO = TariffInfoDTO.builder().tokens(personalTariffInfo.getTokens())
|
||||
|
||||
@@ -53,7 +53,7 @@ public class TariffInfoService {
|
||||
|
||||
Integer tokens = activeTariffInfo.getTokens();
|
||||
|
||||
if (tokens > 0 && (tokens - TariffConstants.TOKEN_VALUE) > 0) {
|
||||
if (tokens - TariffConstants.TOKEN_VALUE > 0) {
|
||||
activeTariffInfo.setTokens(activeTariffInfo.getTokens() - TariffConstants.TOKEN_VALUE);
|
||||
|
||||
tariffInfoRepository.save(activeTariffInfo);
|
||||
|
||||
Reference in New Issue
Block a user