From e4067e770345befdab5c0cdd74d1b9b1825c085e Mon Sep 17 00:00:00 2001
From: kevin jiang <kevin.jiang@kiisoo.com>
Date: Sun, 31 May 2020 19:08:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8E=A5=E5=8F=A3=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ic/customer/service/CustomerViewService.java    | 13 +++++++++----
 .../ic/employee/mapper/PrivilageCpUserDOMapper.java |  4 ++--
 .../resources/mapper/PrivilageCpUserDOMapper.xml    |  8 ++++----
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/kiisoo/ic/customer/service/CustomerViewService.java b/src/main/java/com/kiisoo/ic/customer/service/CustomerViewService.java
index d5bf7b2..da20fbc 100644
--- a/src/main/java/com/kiisoo/ic/customer/service/CustomerViewService.java
+++ b/src/main/java/com/kiisoo/ic/customer/service/CustomerViewService.java
@@ -665,18 +665,23 @@ public class CustomerViewService {
             shopIdList = list1.stream().map(PoiStore::getId).collect(Collectors.toList());
             List<String> cpUserIds = privilageCpUserStoreDOMapper.selectCpUserIdsByStoreIds(shopIdList);
             Long all = privilageCpUserDOMapper.selectStoresCount(cpUserIds);
-            Long dis = privilageCpUserDOMapper.selectDistinctStoresCount(cpUserIds);
+            List<Map<String, String>> dis = privilageCpUserDOMapper.selectDistinctStoresCount(cpUserIds);
 
             result.setAllCustomer(all);
-            result.setAllValidCustomer(dis);
+            if(null != dis){
+                result.setAllValidCustomer(Long.parseLong(dis.get(0).get("rows")));
+            }
+
         }
         //管理员/总运营人员
         else if (privilageRoleDO.getCode().equals(RoleEnum.ROLE_CODE_GLY.getRoleCode()) || privilageRoleDO.getCode().equals(RoleEnum.ROLE_CODE_ALL_YYRY.getRoleCode())) {
             Long all = privilageCpUserDOMapper.selectAllCount();
-            Long dis = privilageCpUserDOMapper.selectDistinctAllCount();
+            List<Map<String, String>> dis = privilageCpUserDOMapper.selectDistinctAllCount();
 
             result.setAllCustomer(all);
-            result.setAllValidCustomer(dis);
+            if(null != dis){
+                result.setAllValidCustomer(Long.parseLong(dis.get(0).get("rows")));
+            }
         }
 
         return result;
diff --git a/src/main/java/com/kiisoo/ic/employee/mapper/PrivilageCpUserDOMapper.java b/src/main/java/com/kiisoo/ic/employee/mapper/PrivilageCpUserDOMapper.java
index 6da2e30..8e6211f 100644
--- a/src/main/java/com/kiisoo/ic/employee/mapper/PrivilageCpUserDOMapper.java
+++ b/src/main/java/com/kiisoo/ic/employee/mapper/PrivilageCpUserDOMapper.java
@@ -19,7 +19,7 @@ public interface PrivilageCpUserDOMapper extends BaseMapper<PrivilageCpUserDO> {
 
     Long selectAllCount();
 
-    Long selectDistinctAllCount();
+    List<Map<String, String>> selectDistinctAllCount();
 
     List<String> selectCustomerIdsByCpUserId(@Param("cpUserId")String cpUserId);
 
@@ -29,7 +29,7 @@ public interface PrivilageCpUserDOMapper extends BaseMapper<PrivilageCpUserDO> {
 
     Long selectStoresCount(@Param("cpUserIds")List<String> cpUserIds);
 
-    Long selectDistinctStoresCount(@Param("cpUserIds")List<String> cpUserIds);
+    List<Map<String, String>> selectDistinctStoresCount(@Param("cpUserIds")List<String> cpUserIds);
 
     Long selectStoresCountById(@Param("shopIds")List<Long> shopIds);
 
diff --git a/src/main/resources/mapper/PrivilageCpUserDOMapper.xml b/src/main/resources/mapper/PrivilageCpUserDOMapper.xml
index 23b83e0..28b7af0 100644
--- a/src/main/resources/mapper/PrivilageCpUserDOMapper.xml
+++ b/src/main/resources/mapper/PrivilageCpUserDOMapper.xml
@@ -22,8 +22,8 @@
         select count(id) from op_cp_user_customer_relation
     </select>
 
-    <select id="selectDistinctAllCount" resultType="java.lang.Long">
-        select count(distinct customer_user_id) from op_cp_user_customer_relation
+    <select id="selectDistinctAllCount" resultType="java.util.Map">
+        EXPLAIN select count(distinct customer_user_id) from op_cp_user_customer_relation
     </select>
 
     <select id="selectStoreCount" resultType="java.lang.Long">
@@ -38,8 +38,8 @@
         </foreach>
     </select>
 
-    <select id="selectDistinctStoresCount" resultType="java.lang.Long">
-        select count(distinct customer_user_id) from op_cp_user_customer_relation where cp_user_id in
+    <select id="selectDistinctStoresCount" resultType="java.util.Map">
+        EXPLAIN select count(distinct customer_user_id) from op_cp_user_customer_relation where cp_user_id in
         <foreach collection="cpUserIds" separator="," item="item" close=")" index="index" open="(">
             #{item}
         </foreach>