From 7851c9f922c0e2be61856dc7943ac84bec62ee28 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Thu, 2 Apr 2020 14:44:41 +0800
Subject: [PATCH] fix pom.xml

---
 pom.xml                                              |  2 +-
 .../manage/mappers/payment/TransactionMapper.xml     | 12 +++++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 0a506a47f..6d3f361c9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
-    <version>1.4.25</version>
+    <version>1.4.26</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jib-maven-plugin.version>1.8.0</jib-maven-plugin.version>
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 3c67c1566..64d543bf5 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
@@ -561,9 +561,15 @@
     <select id="listSettlementLog" resultType="com.alibaba.fastjson.JSONObject">
         SELECT t.client_id,DATE(t.transaction_time) clearing_time,
         ifnull(cd.report_date,date(t.transaction_time)) report_date,
-        <if test="merge_settle!=null">1 as merge_settle,</if>
-        SUM(cd.tax_amount) tax_amount,
-		SUM(cd.total_charge) total_charge,
+        <if test="merge_settle!=null">
+            SUM(cd.tax_amount) tax_amount,
+            SUM(cd.total_charge) total_charge,
+        1 as merge_settle,
+        </if>
+        <if test="merge_settle==null">
+            cd.tax_amount,
+            cd.total_charge,
+        </if>
         SUM(t.clearing_amount) total,
           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,