From 532db849f414fc9ca1d395b98abdb72e853dfe68 Mon Sep 17 00:00:00 2001
From: yechenhao <yechenhao>
Date: Fri, 29 May 2020 01:29:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=AE=A2=E6=88=B7=E5=AF=BC?=
 =?UTF-8?q?=E8=B4=AD=E5=85=B3=E7=B3=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../customer/service/CustomerViewService.java   | 10 ++++------
 .../mapper/PrivilageCpUserDOMapper.java         |  4 ++++
 .../mapper/PrivilageCpUserDOMapper.xml          | 17 +++++++++++++++--
 3 files changed, 23 insertions(+), 8 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 e9e7ba2..630b682 100644
--- a/src/main/java/com/kiisoo/ic/customer/service/CustomerViewService.java
+++ b/src/main/java/com/kiisoo/ic/customer/service/CustomerViewService.java
@@ -647,9 +647,8 @@ public class CustomerViewService {
         //店长
         if(privilageRoleDO.getCode().equals(RoleEnum.ROLE_CODE_DZ.getRoleCode())) {
             shopIdList = poiStoreStaffDOMapper.selectByUserId(userId);
-            String cpUserId = privilageCpUserStoreDOMapper.selectCpUserIdByStoreId(shopIdList.get(0));
-            Long storeAll = privilageCpUserDOMapper.selectStoreCount(cpUserId);
-            Long storeDis = privilageCpUserDOMapper.selectDistinctStoreCount(cpUserId);
+            Long storeAll = privilageCpUserDOMapper.selectStoresCountById(shopIdList);
+            Long storeDis = privilageCpUserDOMapper.selectDistinctStoresCountById(shopIdList);
 
             result.setAllCustomer(storeAll);
             result.setAllValidCustomer(storeDis);
@@ -663,9 +662,8 @@ public class CustomerViewService {
             //查询零售公司的门店
             List<PoiStore> list1 = retailCompanyService.selectShopByCompany(pm.get(0).getOrgId());
             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);
+            Long all = privilageCpUserDOMapper.selectStoresCountById(shopIdList);
+            Long dis = privilageCpUserDOMapper.selectDistinctStoresCountById(shopIdList);
 
             result.setAllCustomer(all);
             result.setAllValidCustomer(dis);
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 492f78d..6da2e30 100644
--- a/src/main/java/com/kiisoo/ic/employee/mapper/PrivilageCpUserDOMapper.java
+++ b/src/main/java/com/kiisoo/ic/employee/mapper/PrivilageCpUserDOMapper.java
@@ -31,6 +31,10 @@ public interface PrivilageCpUserDOMapper extends BaseMapper<PrivilageCpUserDO> {
 
     Long selectDistinctStoresCount(@Param("cpUserIds")List<String> cpUserIds);
 
+    Long selectStoresCountById(@Param("shopIds")List<Long> shopIds);
+
+    Long selectDistinctStoresCountById(@Param("shopIds")List<Long> shopIds);
+
     int deleteCount(@Param("customerUserId")String customerUserId, @Param("cpUserId")String cpUserId);
 
 }
diff --git a/src/main/resources/mapper/PrivilageCpUserDOMapper.xml b/src/main/resources/mapper/PrivilageCpUserDOMapper.xml
index 541e36a..5138520 100644
--- a/src/main/resources/mapper/PrivilageCpUserDOMapper.xml
+++ b/src/main/resources/mapper/PrivilageCpUserDOMapper.xml
@@ -18,11 +18,11 @@
     </select>
 
     <select id="selectAllCount" resultType="java.lang.Long">
-        select count(id) from op_cp_user_customer_relation
+        select count(id) from op_seller_customer_relation
     </select>
 
     <select id="selectDistinctAllCount" resultType="java.lang.Long">
-        select count(distinct customer_user_id) from op_cp_user_customer_relation
+        select count(distinct customer_id) from op_seller_customer_relation
     </select>
 
     <select id="selectStoreCount" resultType="java.lang.Long">
@@ -47,6 +47,19 @@
             #{item}
         </foreach>
     </select>
+    <select id="selectStoresCountById" resultType="java.lang.Long">
+        select count(id) from op_seller_customer_relation where store_id in
+        <foreach collection="shopIds" separator="," item="item" close=")" index="index" open="(">
+            #{item}
+        </foreach>
+    </select>
+
+    <select id="selectDistinctStoresCountById" resultType="java.lang.Long">
+        select count(distinct customer_id) from op_seller_customer_relation where store_id in
+        <foreach collection="shopIds" separator="," item="item" close=")" index="index" open="(">
+            #{item}
+        </foreach>
+    </select>
 
 
     <select id="selectCustomerIdsByCpUserId" resultType="java.lang.String">