diff --git a/pom.xml b/pom.xml index ded40941b..a93200a3d 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ 4.0.0 manage - 1.1.19 + 1.1.20 UTF-8 diff --git a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/BDAnalysisMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/BDAnalysisMapper.xml index 6e06c0c03..83c14dbac 100644 --- a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/BDAnalysisMapper.xml +++ b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/BDAnalysisMapper.xml @@ -203,7 +203,7 @@ org.type AS org_type, org.name AS org_name, if(org.org_id=1,1,0) AS isOrg, - SUM( IF ( temp.transaction_type = 'Credit', temp.clearing_amount, 0 )) clearing_amount, + SUM( IF ( temp.transaction_type = 'Credit', temp.clearing_amount, -t.clearing_amount )) clearing_amount, SUM(if(temp.transaction_type = 'Credit',temp.clearing_amount * clinetBD.proportion, -temp.clearing_amount * clinetBD.proportion)) pay_amount, ifnull(SUM(if(temp.refund_id IS NOT NULL, if(temp.transaction_type='Debit', temp.clearing_amount, -temp.clearing_amount) * clinetBD.proportion, 0)), 0) refund_amount, (SUM(if(temp.transaction_type = 'Credit', temp.clearing_amount * clinetBD.proportion, -temp.clearing_amount * clinetBD.proportion))) - (ifnull(SUM(if(temp.refund_id IS NOT NULL, if(temp.transaction_type='Debit', temp.clearing_amount, -temp.clearing_amount) * clinetBD.proportion, 0)), 0)) AS net_amount diff --git a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.xml index 7990d193a..50d9072a6 100644 --- a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.xml +++ b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.xml @@ -719,7 +719,7 @@ SELECT org.org_id, org.name org_name, - SUM(if(trans.transaction_type='Credit',trans.clearing_amount,0)) AS amount + SUM(if(trans.transaction_type='Credit',trans.clearing_amount,-t.clearing_amount)) AS amount FROM pmt_transactions AS trans RIGHT JOIN sys_clients AS clinet ON trans.client_id = clinet.client_id