|
|
|
@ -103,8 +103,8 @@ class User(AbstractUser): |
|
|
|
income_amount = income.get('amount__sum') or 0 |
|
|
|
income_amount = income.get('amount__sum') or 0 |
|
|
|
income_commission = income.get('commission__sum') or 0 |
|
|
|
income_commission = income.get('commission__sum') or 0 |
|
|
|
|
|
|
|
|
|
|
|
payout = self.balances.filter(type=1).aggregate(models.Sum('amount')) |
|
|
|
payout = self.balances.filter(type=1, status=1).aggregate(models.Sum('amount')) |
|
|
|
payout_amount = income.get('amount__sum') or 0 |
|
|
|
payout_amount = payout.get('amount__sum') or 0 |
|
|
|
|
|
|
|
|
|
|
|
return income_amount - income_commission - payout_amount |
|
|
|
return income_amount - income_commission - payout_amount |
|
|
|
|
|
|
|
|
|
|
|
|