From 014fb0a3695c4b923b98a1ffb132efcdde14f7e8 Mon Sep 17 00:00:00 2001
From: "taylor.dang" <taylor.dang@globalfreepay.com>
Date: Thu, 20 Sep 2018 09:23:58 +0800
Subject: [PATCH] =?UTF-8?q?[Y]=20dashboard=E5=B1=95=E7=A4=BA=E6=89=80?=
 =?UTF-8?q?=E6=9C=89=E5=95=86=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../analysis/core/impls/DashboardServiceImpl.java   |  5 ++++-
 .../analysis/mappers/ClientAnalysisMapper.java      |  3 +++
 .../analysis/mappers/ClientAnalysisMapper.xml       | 13 +++++++++++++
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/DashboardServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/DashboardServiceImpl.java
index 75cff47fa..9584e26f5 100644
--- a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/DashboardServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/DashboardServiceImpl.java
@@ -102,7 +102,10 @@ public class DashboardServiceImpl implements DashboardService,DashboardAnalysisT
         }
         JSONObject res = new JSONObject();
         res.put("new_partners", clientAnalysisMapper.countNewClients(params));
-        res.put("total_partners", clientAnalysisMapper.countClients(params));
+
+        //res.put("total_partners", clientAnalysisMapper.countClients(params));
+        // 统计所有的商户，包括禁用的
+        res.put("total_partners", clientAnalysisMapper.countClientsAll(params));
         stringRedisTemplate.boundValueOps("org_commonAnalysis3"+params.getString("org_id")+params.getString("begin")).set(res.toJSONString(), 5, TimeUnit.MINUTES);
         return res;
     }
diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/mappers/ClientAnalysisMapper.java b/src/main/java/au/com/royalpay/payment/manage/analysis/mappers/ClientAnalysisMapper.java
index e74edaa7b..dd4272dd2 100644
--- a/src/main/java/au/com/royalpay/payment/manage/analysis/mappers/ClientAnalysisMapper.java
+++ b/src/main/java/au/com/royalpay/payment/manage/analysis/mappers/ClientAnalysisMapper.java
@@ -22,6 +22,9 @@ public interface ClientAnalysisMapper {
 
     int countClients(JSONObject params);
 
+    // 统计所有的商户，包括禁用的
+    int countClientsAll(JSONObject params);
+
     @AutoSql(type = SqlType.COUNT)
     @AdvanceSelect(addonWhereClause = "sub_merchant_id is not null")
     int countTotalPartners();
diff --git a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/ClientAnalysisMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/ClientAnalysisMapper.xml
index c5462dae2..6afef4190 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/ClientAnalysisMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/ClientAnalysisMapper.xml
@@ -40,6 +40,19 @@
         </if>
         GROUP BY a.datelist
     </select>
+    <!--显示所有的商户，包括禁用的-->
+    <select id="countClientsAll" resultType="java.lang.Integer">
+        <![CDATA[
+        SELECT count(client_id)
+        FROM sys_clients
+        WHERE
+            create_time <= #{end} and (approve_result is null or approve_result !=0)
+        ]]>
+        <if test="org_id!=null and org_ids==null">and org_id=#{org_id}</if>
+        <if test="org_ids!=null">and org_id in
+            <foreach collection="org_ids" item="org_id" open="(" close=")" separator=",">#{org_id}</foreach></if>
+    </select>
+
     <select id="countClients" resultType="java.lang.Integer">
         <![CDATA[
         SELECT count(client_id)