From 9bd6ee6b9b49335813233f5521097931c4e95fa7 Mon Sep 17 00:00:00 2001 From: Fadli Date: Wed, 12 Oct 2022 10:41:40 +0700 Subject: [PATCH] - fix total commision query --- src/transaction/transaction.service.ts | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/transaction/transaction.service.ts b/src/transaction/transaction.service.ts index 47a94a2..6ccb2cf 100644 --- a/src/transaction/transaction.service.ts +++ b/src/transaction/transaction.service.ts @@ -2109,9 +2109,8 @@ export class TransactionService { const { total_expense } = await baseQuery .select('SUM(transaction_journal.amount) as total_expense') .innerJoin('transactions.transactionJournal', 'transaction_journal') - .innerJoin('user', 'user') .where( - `transaction_journal.type = '0' and transaction_journal.amount < product_price.price and transactions.status = 1 and user.partner_id is NULL`, + `transaction_journal.type = '0' and transaction_journal.amount < product_price.price`, ) .getRawOne(); @@ -2122,7 +2121,7 @@ export class TransactionService { total_transaction: parseInt(data.total_transaction), total_modal: parseInt(data.total_modal), total_profit: parseInt(data.total_profit), - total_commission: parseInt(data.total_profit) - parseInt(total_expense), + total_commission: - parseInt(total_expense) - parseInt(data.total_profit), }; }