From b65a39b67275fe3f044a52c2f9620af4285e45a7 Mon Sep 17 00:00:00 2001 From: vladp Date: Tue, 10 Mar 2026 12:26:43 +0700 Subject: [PATCH] dev temp set urk --- .../ru/soune/nocopy/service/payment/PaymentService.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/ru/soune/nocopy/service/payment/PaymentService.java b/src/main/java/ru/soune/nocopy/service/payment/PaymentService.java index 8a05b74..81f4233 100644 --- a/src/main/java/ru/soune/nocopy/service/payment/PaymentService.java +++ b/src/main/java/ru/soune/nocopy/service/payment/PaymentService.java @@ -124,12 +124,12 @@ public class PaymentService { } private void activateTariffForUser(User user, Tariff tariff) { - String type = tariff.getType(); + String type = tariff.getTariffAccountType(); + TariffInfo activeTariffInfo = user.getActiveTariffInfo(); if (type.equals("token")) { - TariffInfo activeTariffInfo = user.getActiveTariffInfo(); - Integer tokens = activeTariffInfo.getTokens() + tariff.getTokens(); - activeTariffInfo.setTokens(tokens); + Integer tokens = activeTariffInfo.getBoughtTokens(); + activeTariffInfo.setBoughtTokens(tokens + tariff.getTokens()); tariffInfoRepository.save(activeTariffInfo); } else { @@ -138,6 +138,7 @@ public class PaymentService { tariffInfo.setStartTariff(LocalDateTime.now()); tariffInfo.setEndTariff(LocalDateTime.now().plusMonths(1)); tariffInfo.setTokens(tariff.getTokens()); + tariffInfo.setBoughtTokens(activeTariffInfo.getBoughtTokens()); tariffInfo.setTariff(tariff); tariffInfoService.linkUserTariffInfo(user, tariffInfoService.addTariffInfo(tariffInfo));