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

Update tribute_service.py

Browse Source
This commit is contained in:
Egor
2025-08-30 03:00:03 +03:00
committed by GitHub
parent 2c64c57edd
commit fad5ecbb89
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/services/tribute_service.py
View File

@@ -117,8 +117,8 @@ class TributeService:
logger.info(f" Amount: {existing_transaction.amount_kopeks} коп")
logger.info(f" Created: {existing_transaction.created_at}")
if existing_transaction.is_completed:
logger.warning(f"❌ Транзакция с donation_request_id {payment_id} уже обработана и завершена")
if existing_transaction.is_completed and existing_transaction.amount_kopeks == amount_kopeks:
logger.warning(f"❌ Транзакция с donation_request_id {payment_id} и суммой {amount_kopeks} коп уже обработана")
user = await get_user_by_telegram_id(session, user_id)
if user:
@@ -126,6 +126,14 @@ class TributeService:
else:
logger.error(f"❌ Пользователь {user_id} не найден при проверке баланса")
return
elif existing_transaction.is_completed and existing_transaction.amount_kopeks != amount_kopeks:
logger.warning(f"⚠️ Найден платеж с тем же ID {payment_id}, но другой суммой:")
logger.warning(f" Существующий: {existing_transaction.amount_kopeks} коп")
logger.warning(f" Новый: {amount_kopeks} коп")
logger.warning(f" Обрабатываем как новый платеж...")
external_id = f"donation_{payment_id}_{amount_kopeks}_{int(datetime.utcnow().timestamp())}"
logger.info(f"🔧 Создан уникальный external_id: {external_id}")
else:
logger.info(f"⚠️ Найдена незавершенная транзакция {existing_transaction.id}, завершаем...")
await complete_transaction(session, existing_transaction)
@@ -154,7 +162,7 @@ class TributeService:
user_id=user.id,
type=TransactionType.DEPOSIT,
amount_kopeks=amount_kopeks,
description=f"Пополнение через Tribute: {amount_kopeks/100}₽",
description=f"Пополнение через Tribute: {amount_kopeks/100}₽ (ID: {payment_id})",
payment_method=PaymentMethod.TRIBUTE,
external_id=external_id,
is_completed=True