VPN/remnawave-bedolaga-telegram-bot
1
0
Fork 0
mirror of https://github.com/BEDOLAGA-DEV/remnawave-bedolaga-telegram-bot.git synced 2026-01-20 03:40:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2066 from BEDOLAGA-DEV/dev5

Browse Source 
Dev5
This commit is contained in:
Egor
2025-11-28 00:03:34 +03:00
committed by GitHub
parent 58187cecdb 6c7bbba7ed
commit e1377ad7a0
3 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/config.py
View File

@@ -1336,13 +1336,13 @@ class Settings(BaseSettings):
packages = []
config_str = self.TRAFFIC_PACKAGES_CONFIG.strip()
logger.info(f"CONFIG STRING: '{config_str}'")
logger.debug(f"CONFIG STRING: '{config_str}'")
if not config_str:
logger.info("CONFIG EMPTY, USING FALLBACK")
logger.debug("CONFIG EMPTY, USING FALLBACK")
return self._get_fallback_traffic_packages()
logger.info("PARSING CONFIG...")
logger.debug("PARSING CONFIG...")
for package_config in config_str.split(','):
package_config = package_config.strip()
@@ -1366,7 +1366,7 @@ class Settings(BaseSettings):
except ValueError:
continue
logger.info(f"PARSED {len(packages)} packages from config")
logger.debug(f"PARSED {len(packages)} packages from config")
return packages if packages else self._get_fallback_traffic_packages()
except Exception as e:

12
app/database/crud/subscription.py
View File

@@ -988,8 +988,8 @@ async def calculate_subscription_total_cost(
]
}
logger.info(f"📊 Расчет стоимости подписки на {period_days} дней ({months_in_period} мес):")
logger.info(f" Базовый период: {base_price/100}₽")
logger.debug(f"📊 Расчет стоимости подписки на {period_days} дней ({months_in_period} мес):")
logger.debug(f" Базовый период: {base_price/100}₽")
if total_traffic_price > 0:
message = (
f" Трафик: {traffic_price_per_month/100}₽/мес × {months_in_period} = {total_traffic_price/100}₽"
@@ -998,7 +998,7 @@ async def calculate_subscription_total_cost(
message += (
f" (скидка {traffic_discount_percent}%: -{total_traffic_discount/100}₽)"
)
logger.info(message)
logger.debug(message)
if total_servers_price > 0:
message = (
f" Серверы: {servers_price_per_month/100}₽/мес × {months_in_period} = {total_servers_price/100}₽"
@@ -1007,7 +1007,7 @@ async def calculate_subscription_total_cost(
message += (
f" (скидка {servers_discount_percent}%: -{total_servers_discount/100}₽)"
)
logger.info(message)
logger.debug(message)
if total_devices_price > 0:
message = (
f" Устройства: {devices_price_per_month/100}₽/мес × {months_in_period} = {total_devices_price/100}₽"
@@ -1016,8 +1016,8 @@ async def calculate_subscription_total_cost(
message += (
f" (скидка {devices_discount_percent}%: -{total_devices_discount/100}₽)"
)
logger.info(message)
logger.info(f" ИТОГО: {total_cost/100}₽")
logger.debug(message)
logger.debug(f" ИТОГО: {total_cost/100}₽")
return total_cost, details

48
app/services/subscription_service.py
View File

@@ -521,36 +521,36 @@ class SubscriptionService:
total_price = base_price + discounted_traffic_price + total_servers_price + discounted_devices_price
logger.info(f"Расчет стоимости новой подписки:")
logger.debug("Расчет стоимости новой подписки:")
base_log = f" Период {period_days} дней: {base_price_original/100}₽"
if base_discount_total > 0:
base_log += (
f" → {base_price/100}₽"
f" (скидка {period_discount_percent}%: -{base_discount_total/100}₽)"
)
logger.info(base_log)
logger.debug(base_log)
if discounted_traffic_price > 0:
message = f" Трафик {traffic_gb} ГБ: {traffic_price/100}₽"
if traffic_discount > 0:
message += (
f" (скидка {traffic_discount_percent}%: -{traffic_discount/100}₽ → {discounted_traffic_price/100}₽)"
)
logger.info(message)
logger.debug(message)
if total_servers_price > 0:
message = f" Серверы ({len(server_squad_ids)}): {total_servers_price/100}₽"
if servers_discount_percent > 0:
message += (
f" (скидка {servers_discount_percent}% применяется ко всем серверам)"
)
logger.info(message)
logger.debug(message)
if discounted_devices_price > 0:
message = f" Устройства ({devices}): {devices_price/100}₽"
if devices_discount > 0:
message += (
f" (скидка {devices_discount_percent}%: -{devices_discount/100}₽ → {discounted_devices_price/100}₽)"
)
logger.info(message)
logger.info(f" ИТОГО: {total_price/100}₽")
logger.debug(message)
logger.debug(f" ИТОГО: {total_price/100}₽")
return total_price, server_prices
@@ -634,36 +634,36 @@ class SubscriptionService:
+ discounted_traffic_price
)
logger.info(f"💰 Расчет стоимости продления для подписки {subscription.id} (по текущим ценам):")
logger.debug(f"💰 Расчет стоимости продления для подписки {subscription.id} (по текущим ценам):")
base_log = f" 📅 Период {period_days} дней: {base_price_original/100}₽"
if base_discount_total > 0:
base_log += (
f" → {base_price/100}₽"
f" (скидка {period_discount_percent}%: -{base_discount_total/100}₽)"
)
logger.info(base_log)
logger.debug(base_log)
if servers_price > 0:
message = f" 🌍 Серверы ({len(subscription.connected_squads)}) по текущим ценам: {discounted_servers_price/100}₽"
if servers_discount > 0:
message += (
f" (скидка {servers_discount_percent}%: -{servers_discount/100}₽ от {servers_price/100}₽)"
)
logger.info(message)
logger.debug(message)
if devices_price > 0:
message = f" 📱 Устройства ({device_limit}): {discounted_devices_price/100}₽"
if devices_discount > 0:
message += (
f" (скидка {devices_discount_percent}%: -{devices_discount/100}₽ от {devices_price/100}₽)"
)
logger.info(message)
logger.debug(message)
if traffic_price > 0:
message = f" 📊 Трафик ({subscription.traffic_limit_gb} ГБ): {discounted_traffic_price/100}₽"
if traffic_discount > 0:
message += (
f" (скидка {traffic_discount_percent}%: -{traffic_discount/100}₽ от {traffic_price/100}₽)"
)
logger.info(message)
logger.info(f" 💎 ИТОГО: {total_price/100}₽")
logger.debug(message)
logger.debug(f" 💎 ИТОГО: {total_price/100}₽")
return total_price
@@ -855,14 +855,14 @@ class SubscriptionService:
total_price = base_price + total_traffic_price + total_servers_price + total_devices_price
logger.info(f"Расчет стоимости новой подписки на {period_days} дней ({months_in_period} мес):")
logger.debug(f"Расчет стоимости новой подписки на {period_days} дней ({months_in_period} мес):")
base_log = f" Период {period_days} дней: {base_price_original/100}₽"
if base_discount_total > 0:
base_log += (
f" → {base_price/100}₽"
f" (скидка {period_discount_percent}%: -{base_discount_total/100}₽)"
)
logger.info(base_log)
logger.debug(base_log)
if total_traffic_price > 0:
message = (
f" Трафик {traffic_gb} ГБ: {traffic_price_per_month/100}₽/мес x {months_in_period} = {total_traffic_price/100}₽"
@@ -871,14 +871,14 @@ class SubscriptionService:
message += (
f" (скидка {traffic_discount_percent}%: -{traffic_discount_per_month * months_in_period/100}₽)"
)
logger.info(message)
logger.debug(message)
if total_servers_price > 0:
message = f" Серверы ({len(server_squad_ids)}): {total_servers_price/100}₽"
if servers_discount_percent > 0:
message += (
f" (скидка {servers_discount_percent}% применяется ко всем серверам)"
)
logger.info(message)
logger.debug(message)
if total_devices_price > 0:
message = (
f" Устройства ({additional_devices}): {devices_price_per_month/100}₽/мес x {months_in_period} = {total_devices_price/100}₽"
@@ -887,8 +887,8 @@ class SubscriptionService:
message += (
f" (скидка {devices_discount_percent}%: -{devices_discount_per_month * months_in_period/100}₽)"
)
logger.info(message)
logger.info(f" ИТОГО: {total_price/100}₽")
logger.debug(message)
logger.debug(f" ИТОГО: {total_price/100}₽")
return total_price, server_prices
@@ -972,14 +972,14 @@ class SubscriptionService:
total_price = base_price + total_servers_price + total_devices_price + total_traffic_price
logger.info(f"💰 Расчет стоимости продления подписки {subscription.id} на {period_days} дней ({months_in_period} мес):")
logger.debug(f"💰 Расчет стоимости продления подписки {subscription.id} на {period_days} дней ({months_in_period} мес):")
base_log = f" 📅 Период {period_days} дней: {base_price_original/100}₽"
if base_discount_total > 0:
base_log += (
f" → {base_price/100}₽"
f" (скидка {period_discount_percent}%: -{base_discount_total/100}₽)"
)
logger.info(base_log)
logger.debug(base_log)
if total_servers_price > 0:
message = (
f" 🌍 Серверы: {servers_price_per_month/100}₽/мес x {months_in_period} = {total_servers_price/100}₽"
@@ -988,7 +988,7 @@ class SubscriptionService:
message += (
f" (скидка {servers_discount_percent}%: -{servers_discount_per_month * months_in_period/100}₽)"
)
logger.info(message)
logger.debug(message)
if total_devices_price > 0:
message = (
f" 📱 Устройства: {devices_price_per_month/100}₽/мес x {months_in_period} = {total_devices_price/100}₽"
@@ -997,7 +997,7 @@ class SubscriptionService:
message += (
f" (скидка {devices_discount_percent}%: -{devices_discount_per_month * months_in_period/100}₽)"
)
logger.info(message)
logger.debug(message)
if total_traffic_price > 0:
message = (
f" 📊 Трафик: {traffic_price_per_month/100}₽/мес x {months_in_period} = {total_traffic_price/100}₽"
@@ -1006,8 +1006,8 @@ class SubscriptionService:
message += (
f" (скидка {traffic_discount_percent}%: -{traffic_discount_per_month * months_in_period/100}₽)"
)
logger.info(message)
logger.info(f" 💎 ИТОГО: {total_price/100}₽")
logger.debug(message)
logger.debug(f" 💎 ИТОГО: {total_price/100}₽")
return total_price