This commit is contained in:
@@ -249,18 +249,10 @@ public class PaymentService {
|
|||||||
|
|
||||||
user.setPersonalTariffInfo(tariffInfo);
|
user.setPersonalTariffInfo(tariffInfo);
|
||||||
|
|
||||||
Company company = user.getCompany();
|
TariffInfo addedTariffInfo = tariffInfoService.addTariffInfo(tariffInfo);
|
||||||
if (company != null) {
|
|
||||||
company.setTariffInfo(tariffInfo);
|
|
||||||
}
|
|
||||||
|
|
||||||
tariffInfoService.addTariffInfo(tariffInfo);
|
tariffInfoService.linkUserTariffInfo(user, addedTariffInfo);
|
||||||
|
tariffInfoService.linkCompanyTariffInfo(user.getId(), addedTariffInfo);
|
||||||
userRepository.save(user);
|
|
||||||
|
|
||||||
if (company != null) {
|
|
||||||
companyRepository.save(company);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -165,10 +165,11 @@ public class TariffInfoService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Transactional
|
@Transactional
|
||||||
public void linkCompanyTariffInfo(User user, TariffInfo tariffInfo) {
|
public void linkCompanyTariffInfo(Long userId, TariffInfo tariffInfo) {
|
||||||
Company company = user.getCompany();
|
User user = userRepository.findById(userId).orElse(null);
|
||||||
|
|
||||||
if (company != null) {
|
if (user != null && user.getCompany() != null) {
|
||||||
|
Company company = user.getCompany();
|
||||||
company.setTariffInfo(tariffInfo);
|
company.setTariffInfo(tariffInfo);
|
||||||
|
|
||||||
companyRepository.save(company);
|
companyRepository.save(company);
|
||||||
|
|||||||
Reference in New Issue
Block a user