From 13e7340b9d91395821456a96618a7684e9fa8323 Mon Sep 17 00:00:00 2001
From: yechenhao <yechenhao>
Date: Thu, 21 May 2020 21:23:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kiisoo/ic/customer/mapper/OpVipDOMapper.java  |  1 +
 .../ic/customer/service/CustomerViewService.java  |  8 ++++++--
 src/main/resources/mapper/OpVipDOMapper.xml       | 15 +++++++++++++++
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/kiisoo/ic/customer/mapper/OpVipDOMapper.java b/src/main/java/com/kiisoo/ic/customer/mapper/OpVipDOMapper.java
index ff5254d..ef381a3 100644
--- a/src/main/java/com/kiisoo/ic/customer/mapper/OpVipDOMapper.java
+++ b/src/main/java/com/kiisoo/ic/customer/mapper/OpVipDOMapper.java
@@ -25,4 +25,5 @@ public interface OpVipDOMapper extends BaseMapper<OpVip> {
 
     Long selectVipCountNew();
 
+    Long selectVipCountByStoreIds(@Param("shopIds")List<Long> shopIdList);
 }
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 3b1c847..0e2f5f8 100644
--- a/src/main/java/com/kiisoo/ic/customer/service/CustomerViewService.java
+++ b/src/main/java/com/kiisoo/ic/customer/service/CustomerViewService.java
@@ -174,6 +174,8 @@ public class CustomerViewService {
      */
     public CustomerViewVO selectCustomerViewMain(Long userId, String selectStartTime, String selectEndTime, String startTime, String endTime){
         CustomerViewVO customerViewVO = new CustomerViewVO();
+        //会员总数
+        Long vipCount = 0L;
         //shopIds
         List<Long> shopIdList = new ArrayList<>();
         PrivilageRoleDO privilageRoleDO = privilageRoleDOMapper.selectRoleByUserId(userId);
@@ -183,6 +185,7 @@ public class CustomerViewService {
         //店长
         if(privilageRoleDO.getCode().equals(RoleEnum.ROLE_CODE_DZ.getRoleCode())) {
             shopIdList = poiStoreStaffDOMapper.selectByUserId(userId);
+            vipCount = opVipDOMapper.selectVipCountByStoreIds(shopIdList);
         }
         //运营人员
         else if (privilageRoleDO.getCode().equals(RoleEnum.ROLE_CODE_YYRY.getRoleCode())) {
@@ -192,10 +195,12 @@ public class CustomerViewService {
             //查询零售公司的门店
             List<PoiStore> list1 = retailCompanyService.selectShopByCompany(pm.get(0).getOrgId());
             shopIdList = list1.stream().map(PoiStore::getId).collect(Collectors.toList());
+            vipCount = opVipDOMapper.selectVipCountByStoreIds(shopIdList);
         }
         //管理员/总运营人员
         else if (privilageRoleDO.getCode().equals(RoleEnum.ROLE_CODE_GLY.getRoleCode()) || privilageRoleDO.getCode().equals(RoleEnum.ROLE_CODE_ALL_YYRY.getRoleCode())) {
             shopIdList = poiStoreStaffDOMapper.selectAllShopId(null,null);
+            vipCount = opVipDOMapper.selectVipCountNew();
         }
 
         if(CollectionUtils.isEmpty(shopIdList)){
@@ -204,8 +209,7 @@ public class CustomerViewService {
         //柱状图好友趋势图
         List<OpCustomer> customerList = opCustomerDOMapper.selectCustomerList(shopIdList, null, null, startTime, endTime);
 
-        //会员总数
-        Long vipCount = opVipDOMapper.selectVipCountNew();
+
         customerViewVO.setAllVipCount(vipCount);
 
         //设置趋势柱状图list
diff --git a/src/main/resources/mapper/OpVipDOMapper.xml b/src/main/resources/mapper/OpVipDOMapper.xml
index 68ae2d6..1a3a487 100644
--- a/src/main/resources/mapper/OpVipDOMapper.xml
+++ b/src/main/resources/mapper/OpVipDOMapper.xml
@@ -43,6 +43,21 @@
 
     </select>
 
+    <!--会员总数-->
+    <select id="selectVipCountByStoreIds" resultType="Long">
+        select count(t1.id)
+        from op_vip t1,op_customer t2
+        <where>
+            <if test="shopIds != null and shopIds.size > 0">
+                and t2.register_store_id in
+                <foreach collection="shopIds" separator="," item="item" index="index" close=")" open="(">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+
+    </select>
+
     <select id="selectVipCountNew" resultType="Long">
         select count(t1.id)
         from op_vip t1