From 72859382413dd60fb030251357ee69b58d4693ea Mon Sep 17 00:00:00 2001 From: Fadli Date: Tue, 11 Oct 2022 11:40:54 +0700 Subject: [PATCH 1/5] - fix total commision --- src/transaction/transaction.service.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/transaction/transaction.service.ts b/src/transaction/transaction.service.ts index d2fac58..8e76020 100644 --- a/src/transaction/transaction.service.ts +++ b/src/transaction/transaction.service.ts @@ -2119,7 +2119,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(total_expense) - parseInt(data.total_profit), + total_commission: parseInt(data.total_profit) - parseInt(total_expense), }; } From fdd9802d6cdc6d68e72c70c99a86b648ec5f305c Mon Sep 17 00:00:00 2001 From: Fadli Date: Wed, 12 Oct 2022 09:53:05 +0700 Subject: [PATCH 2/5] - fix total commision query --- src/transaction/transaction.service.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/transaction/transaction.service.ts b/src/transaction/transaction.service.ts index 8e76020..ca32d2c 100644 --- a/src/transaction/transaction.service.ts +++ b/src/transaction/transaction.service.ts @@ -2110,7 +2110,7 @@ export class TransactionService { .select('SUM(transaction_journal.amount) as total_expense') .innerJoin('transactions.transactionJournal', 'transaction_journal') .where( - `transaction_journal.type = '0' and transaction_journal.amount < product_price.price`, + `transaction_journal.type = '0' and transaction_journal.amount < product_price.price and transactions.status = 1 and partner_trx_id is NULL`, ) .getRawOne(); From 65ba23c7f60179f6227954a28794662cabb9bcda Mon Sep 17 00:00:00 2001 From: Fadli Date: Wed, 12 Oct 2022 09:59:20 +0700 Subject: [PATCH 3/5] - fix total commision query --- src/transaction/transaction.service.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/transaction/transaction.service.ts b/src/transaction/transaction.service.ts index ca32d2c..6fea5c5 100644 --- a/src/transaction/transaction.service.ts +++ b/src/transaction/transaction.service.ts @@ -2114,6 +2114,8 @@ export class TransactionService { ) .getRawOne(); + console.log("totalprofitni", data.total_profit); + console.log("totalexpenseni", total_expense); return { total_amount: parseInt(data.total_amount), total_transaction: parseInt(data.total_transaction), From d7bac800e218dd0b1c0bcdc0ad92e7509ba0ef53 Mon Sep 17 00:00:00 2001 From: Fadli Date: Wed, 12 Oct 2022 10:06:18 +0700 Subject: [PATCH 4/5] - fix total commision query --- src/transaction/transaction.service.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/transaction/transaction.service.ts b/src/transaction/transaction.service.ts index 6fea5c5..ac0f21c 100644 --- a/src/transaction/transaction.service.ts +++ b/src/transaction/transaction.service.ts @@ -2109,6 +2109,7 @@ export class TransactionService { const { total_expense } = await baseQuery .select('SUM(transaction_journal.amount) as total_expense') .innerJoin('transactions.transactionJournal', 'transaction_journal') + .innerJoin('transactions', 'transactions') .where( `transaction_journal.type = '0' and transaction_journal.amount < product_price.price and transactions.status = 1 and partner_trx_id is NULL`, ) From 16be12ff696adbeaf1bfaab08dc990df0b9bbc80 Mon Sep 17 00:00:00 2001 From: Fadli Date: Wed, 12 Oct 2022 10:24:30 +0700 Subject: [PATCH 5/5] - fix total commision query --- src/transaction/transaction.service.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/transaction/transaction.service.ts b/src/transaction/transaction.service.ts index ac0f21c..47a94a2 100644 --- a/src/transaction/transaction.service.ts +++ b/src/transaction/transaction.service.ts @@ -2109,9 +2109,9 @@ export class TransactionService { const { total_expense } = await baseQuery .select('SUM(transaction_journal.amount) as total_expense') .innerJoin('transactions.transactionJournal', 'transaction_journal') - .innerJoin('transactions', 'transactions') + .innerJoin('user', 'user') .where( - `transaction_journal.type = '0' and transaction_journal.amount < product_price.price and transactions.status = 1 and partner_trx_id is NULL`, + `transaction_journal.type = '0' and transaction_journal.amount < product_price.price and transactions.status = 1 and user.partner_id is NULL`, ) .getRawOne();