|
|
|
|
@ -92,7 +92,7 @@ class User(AbstractUser): |
|
|
|
|
|
|
|
|
|
@property |
|
|
|
|
def balance(self): |
|
|
|
|
aggregate = self.balances.filter( |
|
|
|
|
income = self.balances.filter( |
|
|
|
|
type=0, |
|
|
|
|
payment__isnull=False, |
|
|
|
|
payment__status__isnull=False |
|
|
|
|
@ -100,9 +100,13 @@ class User(AbstractUser): |
|
|
|
|
models.Sum('amount'), |
|
|
|
|
models.Sum('commission'), |
|
|
|
|
) |
|
|
|
|
amount = aggregate.get('amount__sum') or 0 |
|
|
|
|
commission = aggregate.get('commission__sum') or 0 |
|
|
|
|
return amount - commission |
|
|
|
|
income_amount = income.get('amount__sum') or 0 |
|
|
|
|
income_commission = income.get('commission__sum') or 0 |
|
|
|
|
|
|
|
|
|
payout = self.balances.filter(type=1).aggregate(models.Sum('amount')) |
|
|
|
|
payout_amount = income.get('amount__sum') or 0 |
|
|
|
|
|
|
|
|
|
return income_amount - income_commission - payout_amount |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@receiver(post_save, sender=User) |
|
|
|
|
|