This commit is contained in:
@@ -245,6 +245,7 @@ public class PaymentService {
|
|||||||
tariffInfo.setPaymentMethodId(paymentMethodId);
|
tariffInfo.setPaymentMethodId(paymentMethodId);
|
||||||
|
|
||||||
tariffInfoService.linkUserTariffInfo(user, tariffInfoService.addTariffInfo(tariffInfo));
|
tariffInfoService.linkUserTariffInfo(user, tariffInfoService.addTariffInfo(tariffInfo));
|
||||||
|
tariffInfoService.linkCompanyTariffInfo(user, tariffInfoService.addTariffInfo(tariffInfo));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ import ru.soune.nocopy.entity.tarif.TariffType;
|
|||||||
import ru.soune.nocopy.entity.tokenoperation.OperationType;
|
import ru.soune.nocopy.entity.tokenoperation.OperationType;
|
||||||
import ru.soune.nocopy.entity.user.User;
|
import ru.soune.nocopy.entity.user.User;
|
||||||
import ru.soune.nocopy.exception.TariffNotFoundException;
|
import ru.soune.nocopy.exception.TariffNotFoundException;
|
||||||
|
import ru.soune.nocopy.repository.CompanyRepository;
|
||||||
import ru.soune.nocopy.repository.TariffInfoRepository;
|
import ru.soune.nocopy.repository.TariffInfoRepository;
|
||||||
import ru.soune.nocopy.repository.TariffRepository;
|
import ru.soune.nocopy.repository.TariffRepository;
|
||||||
import ru.soune.nocopy.repository.UserRepository;
|
import ru.soune.nocopy.repository.UserRepository;
|
||||||
@@ -40,6 +41,8 @@ public class TariffInfoService {
|
|||||||
|
|
||||||
private TokenOperationService tokenOperationService;
|
private TokenOperationService tokenOperationService;
|
||||||
|
|
||||||
|
private CompanyRepository companyRepository;
|
||||||
|
|
||||||
public TariffInfo createTariffInfo(LocalDateTime startTariff, LocalDateTime endTariff, TariffStatus tariffStatus,
|
public TariffInfo createTariffInfo(LocalDateTime startTariff, LocalDateTime endTariff, TariffStatus tariffStatus,
|
||||||
Integer tokens) {
|
Integer tokens) {
|
||||||
TariffInfo tariffInfo = new TariffInfo();
|
TariffInfo tariffInfo = new TariffInfo();
|
||||||
@@ -157,13 +160,18 @@ public class TariffInfoService {
|
|||||||
@Transactional
|
@Transactional
|
||||||
public void linkUserTariffInfo(User user, TariffInfo tariffInfo) {
|
public void linkUserTariffInfo(User user, TariffInfo tariffInfo) {
|
||||||
user.setPersonalTariffInfo(tariffInfo);
|
user.setPersonalTariffInfo(tariffInfo);
|
||||||
|
|
||||||
|
userRepository.save(user);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Transactional
|
||||||
|
public void linkCompanyTariffInfo(User user, TariffInfo tariffInfo) {
|
||||||
Company company = user.getCompany();
|
Company company = user.getCompany();
|
||||||
|
|
||||||
if (company != null) {
|
if (company != null) {
|
||||||
company.setTariffInfo(tariffInfo);
|
company.setTariffInfo(tariffInfo);
|
||||||
|
companyRepository.save(company);
|
||||||
}
|
}
|
||||||
|
|
||||||
userRepository.save(user);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void updateTariffInfoFromDTO(TariffInfo tariffInfo, TariffInfoDTO dto) {
|
private void updateTariffInfoFromDTO(TariffInfo tariffInfo, TariffInfoDTO dto) {
|
||||||
|
|||||||
Reference in New Issue
Block a user