From fded1b982d55186387eb0b56bcbd8812255a6b5d Mon Sep 17 00:00:00 2001
From: dulingling <dll19920503@qq.com>
Date: Mon, 10 Aug 2020 15:50:30 +0800
Subject: [PATCH] =?UTF-8?q?upd:=E4=BB=A3=E7=90=86=E5=95=86=E6=8F=90?=
 =?UTF-8?q?=E6=88=90sql=E8=B0=83=E6=95=B4=EF=BC=8C=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E4=B8=BA=E8=B4=9F=E6=95=B0=EF=BC=8Csql=E8=BD=AC=E5=90=8E?=
 =?UTF-8?q?=E5=8F=98=E4=B8=BA=E6=AD=A3=E6=95=B0=EF=BC=8C=E5=AF=BC=E8=87=B4?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=AE=A1=E7=AE=97=E5=87=BA=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pom.xml b/pom.xml
index 2b0065cdc..2f7647441 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
-    <version>2.3.56</version>
+    <version>2.3.57</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jib-maven-plugin.version>2.4.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 242c3f775..256c10b7e 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
@@ -938,11 +938,11 @@
                t.channel,
                t.surcharge_rate,
                t.transaction_time,
-               if(t.transaction_type = 'Credit', t.clearing_amount, -t.clearing_amount)     clearing_amount,
-               if(t.transaction_type = 'Credit', t.total_surcharge, -t.total_surcharge)     total_surcharge,
-               if(t.transaction_type = 'Credit', t.transaction_fee, -t.transaction_fee)     transaction_fee,
-               if(t.transaction_type = 'Credit', t.channel_surcharge, -t.channel_surcharge) channel_surcharge,
-               if(t.transaction_type = 'Credit', t.settle_amount, -t.settle_amount)         settle_amount,
+               IF( t.transaction_type = 'Credit', t.clearing_amount,-(if(t.clearing_amount>=0,t.clearing_amount, - t.clearing_amount))) clearing_amount,
+               IF( t.transaction_type = 'Credit', t.total_surcharge, -(if(t.total_surcharge>=0,t.total_surcharge, - t.total_surcharge))) total_surcharge,
+               IF( t.transaction_type = 'Credit', t.transaction_fee, -(if(t.transaction_fee>=0,t.transaction_fee, - t.transaction_fee))) transaction_fee,
+               IF( t.transaction_type = 'Credit', t.channel_surcharge, - (if(t.channel_surcharge>=0,t.channel_surcharge, - t.channel_surcharge))) channel_surcharge,
+               IF( t.transaction_type = 'Credit', t.settle_amount, - (if(t.settle_amount>=0,t.settle_amount, - t.settle_amount)) ) settle_amount,
                t.order_id,
                t.org_rate,
                t.surcharge_cashback,