From 55eb47b8f7745143313f3620dfb5b7a5d1d43534 Mon Sep 17 00:00:00 2001 From: yixian Date: Tue, 21 Aug 2018 09:31:02 +0800 Subject: [PATCH] fix clearing date display --- .../payment/manage/mappers/payment/TransactionMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml index 8e7dd2698..bcf7b05c3 100644 --- a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml +++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml @@ -283,8 +283,8 @@ SELECT t.client_id,DATE(t.transaction_time) clearing_time, ifnull(cd.report_date,date(t.transaction_time)) report_date, SUM(t.clearing_amount) total, - sum(if(LOCATE('MERCHANT',t.system_transaction_id),clearing_amount,0)) income, - sum(if(LOCATE('SURCHARGE',t.system_transaction_id),clearing_amount,0)) fee, + sum(if(LOCATE('MERCHANT',t.system_transaction_id),t.clearing_amount,0)) income, + sum(if(LOCATE('SURCHARGE',t.system_transaction_id),t.clearing_amount,0)) fee, (SELECT min(r.rate_value) FROM sys_client_rates r WHERE r.client_id = t.client_id AND date(r.expiry_time) >= DATE(t.clearing_time) AND date(r.active_time) <= DATE(t.clearing_time)) rate,