diff --git a/payment_backend/api/tronscan.py b/payment_backend/api/tronscan.py index 36395dc..ad36673 100644 --- a/payment_backend/api/tronscan.py +++ b/payment_backend/api/tronscan.py @@ -12,6 +12,7 @@ trc20token_info = { "vip": True} } + @singleton class Tronscan: def __init__(self, api_key): @@ -137,7 +138,7 @@ class Tronscan: return response.json() def transfer(self, sort="-timestamp", start=0, limit=10, count="true", - address=None, from_address=None, to_address=None, tokens=None, block=None): + address=None, from_address=None, to_address=None, tokens=None, block=None): """ Get account's transfer list. :param sort: Sort type @@ -207,7 +208,7 @@ class Tronscan: return response.json() def token_trc20_transfers_with_status(self, start=0, limit=10, trc20Id=None, address=None, - direction=0, db_version=0, reverse="false"): + direction=0, db_version=0, reverse="false"): """ Get account's transaction data. :param start: Start index, default is 0 @@ -406,6 +407,8 @@ class Tronscan: if __name__ == '__main__': + # address = "TSKmkBbEUFefUjGSp5Vp4hd7GFW188bZQ1" address = "TB592A5QwHvvcJoCmvALmzT3S9Pux91Gub" tronscan = Tronscan(api_key='cc87d361-7cd6-4f69-a57b-f0a77a213355') - print(tronscan.transfer_trc20(address, trc20token_info["usdt"]["tokenId"])) + print(tronscan.token_trc20_transfers(limit=100, + from_address=address, to_address='TNrzRLi2ArZhiMx51zusBEHHh1qyB9Ldq2')) diff --git a/payment_backend/config/param.ini b/payment_backend/config/param.ini index 4c8d738..541268a 100644 --- a/payment_backend/config/param.ini +++ b/payment_backend/config/param.ini @@ -2,8 +2,8 @@ tronscan = cc87d361-7cd6-4f69-a57b-f0a77a213355 [PaymentAddresses] -usdt = TB592A5QwHvvcJoCmvALmzT3S9Pux91Gub -;usdt=TNrzRLi2ArZhiMx51zusBEHHh1qyB9Ldq2 +;usdt = TB592A5QwHvvcJoCmvALmzT3S9Pux91Gub +usdt=TNrzRLi2ArZhiMx51zusBEHHh1qyB9Ldq2 ;[MYSQL] ;user = wystan diff --git a/payment_backend/services/payment.py b/payment_backend/services/payment.py index fa8db1b..dd1484a 100644 --- a/payment_backend/services/payment.py +++ b/payment_backend/services/payment.py @@ -15,6 +15,7 @@ class PaymentService: # return 1, 1 if end_timestamp is None: end_timestamp = current_timestamp() + logger.debug(f'检查从{from_address}到{to_address}的转账交易信息') result = self.tronscan.token_trc20_transfers(limit=100, from_address=from_address, to_address=to_address, start_timestamp=order_create_timestamp, end_timestamp=end_timestamp) diff --git a/payment_backend/services/user.py b/payment_backend/services/user.py index 641ce97..d9daea2 100644 --- a/payment_backend/services/user.py +++ b/payment_backend/services/user.py @@ -16,7 +16,7 @@ class UserService: logger.debug(f'query wallet addresses by phone {phone} or email {email}') users = self.user_repo.get_and_update(User(name=name, phone=phone, email=email, payment_method=payment_method)) - addresses = set(user.address for user in users if user.wallet_address) + addresses = set(user.wallet_address for user in users if user.wallet_address) return list(addresses) return []