From cb9084e7680875ca0b1a64835821d17dbc0143c0 Mon Sep 17 00:00:00 2001
From: "eason.qian" <eason.qian@royalpay.com.au>
Date: Thu, 22 Feb 2018 14:40:12 +0800
Subject: [PATCH] fix exchange rate

---
 .../manage/analysis/mappers/TransactionAnalysisMapper.xml      | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

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 c1bb983c1..3b153bfac 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
@@ -592,9 +592,8 @@
          SELECT max(t.transaction_time) mx,t.exchange_rate,date(t.transaction_time) `date`
                            FROM
                                pmt_transactions t
-                           WHERE date(t.transaction_time) >= #{begin} #AND date(t.transaction_time) <= #{end} AND
+                           WHERE date(t.transaction_time) >= #{begin} and date(t.transaction_time) <= #{end} AND
                                 and t.transaction_type ='Credit' AND t.channel =#{channel}
-
                            GROUP BY
                                date(t.transaction_time)
 						  order by `date` asc