diff --git a/src/main/java/ru/soune/nocopy/controller/UserController.java b/src/main/java/ru/soune/nocopy/controller/UserController.java index a215866..2725b99 100644 --- a/src/main/java/ru/soune/nocopy/controller/UserController.java +++ b/src/main/java/ru/soune/nocopy/controller/UserController.java @@ -110,7 +110,6 @@ public class UserController { .build(); userDTO.setTariffInfo(infoDTO); - userDTO.setSubscriptionType(infoDTO.getTariffName()); } userDTO.setPhone(user.getPhone()); diff --git a/src/main/java/ru/soune/nocopy/service/tariff/TariffInfoService.java b/src/main/java/ru/soune/nocopy/service/tariff/TariffInfoService.java index 7076cb7..f5a29ad 100644 --- a/src/main/java/ru/soune/nocopy/service/tariff/TariffInfoService.java +++ b/src/main/java/ru/soune/nocopy/service/tariff/TariffInfoService.java @@ -157,6 +157,11 @@ public class TariffInfoService { @Transactional public void linkUserTariffInfo(User user, TariffInfo tariffInfo) { user.setPersonalTariffInfo(tariffInfo); + Company company = user.getCompany(); + + if (company != null) { + company.setTariffInfo(tariffInfo); + } userRepository.save(user); }