This commit is contained in:
@@ -6,6 +6,7 @@ import lombok.extern.slf4j.Slf4j;
|
|||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
import org.springframework.transaction.annotation.Transactional;
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
import ru.soune.nocopy.dto.tarriff.TariffInfoDTO;
|
import ru.soune.nocopy.dto.tarriff.TariffInfoDTO;
|
||||||
|
import ru.soune.nocopy.entity.company.Company;
|
||||||
import ru.soune.nocopy.entity.tarif.Tariff;
|
import ru.soune.nocopy.entity.tarif.Tariff;
|
||||||
import ru.soune.nocopy.entity.tarif.TariffInfo;
|
import ru.soune.nocopy.entity.tarif.TariffInfo;
|
||||||
import ru.soune.nocopy.entity.tarif.TariffStatus;
|
import ru.soune.nocopy.entity.tarif.TariffStatus;
|
||||||
@@ -51,16 +52,16 @@ public class TariffInfoService {
|
|||||||
return tariffInfoRepository.save(tariffInfo);
|
return tariffInfoRepository.save(tariffInfo);
|
||||||
}
|
}
|
||||||
|
|
||||||
// @Transactional
|
@Transactional
|
||||||
public void writeOffTokens(long userId, Integer value, OperationType operationType) throws MessagingException, IOException {
|
public void writeOffTokens(long userId, Integer value, OperationType operationType) throws MessagingException, IOException {
|
||||||
User user = userRepository.findById(userId).orElseThrow();
|
User user = userRepository.findById(userId).orElseThrow();
|
||||||
|
Company company = user.getCompany();
|
||||||
TariffInfo activeTariffInfo;
|
TariffInfo activeTariffInfo;
|
||||||
|
|
||||||
if (user.getCompany() == null) {
|
if (company == null) {
|
||||||
activeTariffInfo = user.getPersonalTariffInfo();
|
activeTariffInfo = user.getPersonalTariffInfo();
|
||||||
} else {
|
} else {
|
||||||
activeTariffInfo = user.getCompany().getTariffInfo();
|
activeTariffInfo = company.getTariffInfo();
|
||||||
}
|
}
|
||||||
|
|
||||||
writeOffTokensForTariff(activeTariffInfo, value);
|
writeOffTokensForTariff(activeTariffInfo, value);
|
||||||
|
|||||||
Reference in New Issue
Block a user