From 1c7fc80815f24ec8951f1b2316ea1ff4759af6f5 Mon Sep 17 00:00:00 2001
From: duLingLing <dll19920503@qq.com>
Date: Wed, 21 Aug 2019 23:52:34 +0800
Subject: [PATCH] =?UTF-8?q?Upd:=E4=BF=AE=E5=A4=8D=E5=90=88=E4=BC=99?=
 =?UTF-8?q?=E4=BA=BA=E9=94=80=E9=87=8F=E6=95=B0=E6=8D=AE=E5=88=86=E6=9E=90?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=98=BE=E7=A4=BA=E6=95=B0=E6=8D=AE=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                     | 2 +-
 .../manage/analysis/core/impls/OrgAnalysisServiceImp.java   | 1 +
 .../manage/mappers/log/StatisticsBDSalesReportMapper.xml    | 6 +++---
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 0882f06da..5c69a347d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>manage</artifactId>
-    <version>1.1.23</version>
+    <version>1.1.24</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/OrgAnalysisServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/OrgAnalysisServiceImp.java
index 0d72739be..39c91dcae 100644
--- a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/OrgAnalysisServiceImp.java
+++ b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/OrgAnalysisServiceImp.java
@@ -64,6 +64,7 @@ public class OrgAnalysisServiceImp implements OrgAnalysisService {
                         }
                     }
                     if (!flag) {
+                        todayOrgTransactionItem.put("amount",todayOrgTransactionItem.getString("clearing_amount"));
                         newOrgTransaction.add(todayOrgTransactionItem);
                     }
                 }
diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/log/StatisticsBDSalesReportMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/log/StatisticsBDSalesReportMapper.xml
index f8b574cb2..f92f48fae 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/mappers/log/StatisticsBDSalesReportMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/log/StatisticsBDSalesReportMapper.xml
@@ -42,7 +42,7 @@
         SUM(pay_amount) AS total,
         SUM(refund_amount) AS refund_fee
         FROM statistics_bd_sales
-        WHERE isOrg = 1
+        WHERE isOrg = 1 AND org_id!=1
             <if test="org_id != null">
                 AND org_id = #{org_id}
             </if>
@@ -59,8 +59,8 @@
                 AND org_id in
                 <foreach collection="org_ids" item="org_id" open="(" close=")" separator=",">#{org_id}</foreach>
             </if>
-        GROUP BY bd_id
-        ORDER BY total DESC
+        GROUP BY org_id
+        ORDER BY clearing_amount DESC
     </select>
 
     <select id="findByBDIdAndLogDate" resultType="com.alibaba.fastjson.JSONObject">