From efef3adf74dc9d07ad33e30fe1a66288d697044a Mon Sep 17 00:00:00 2001
From: duLingLing <dll19920503@qq.com>
Date: Wed, 7 Aug 2019 09:54:41 +0800
Subject: [PATCH] =?UTF-8?q?Upd:=E8=B4=A2=E5=8A=A1=E6=8A=A5=E8=A1=A8?=
 =?UTF-8?q?=E4=BF=AE=E6=B8=85=E7=AE=97=E9=A2=9D=E4=BF=AE=E6=94=B9=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2sql?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pom.xml b/pom.xml
index 0c0afd557..eac46f33a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>manage</artifactId>
-    <version>1.0.38</version>
+    <version>1.0.39</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
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 a90f672a1..645f42769 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
@@ -1220,7 +1220,7 @@
     <select id="getSettleDataDailyReport" resultType="com.alibaba.fastjson.JSONObject">
         SELECT
             channel,
-            SUM(IF(transaction_type = 'Credit', settle_amount, 0)) AS settle_amount,
+            SUM(IF(transaction_type = 'Credit', settle_amount, -settle_amount)) AS settle_amount,
             SUM(IF(transaction_type = 'Credit', clearing_amount, 0)) AS credit_amount,
             SUM(IF(transaction_type = 'Credit', 0, -clearing_amount)) AS debit_amount,
             SUM(IF(transaction_type = 'Credit', clearing_amount, -clearing_amount)) AS net_trading,