From 9729b6fe094e8363e0b7746475415dace6c4cf46 Mon Sep 17 00:00:00 2001
From: wyj2080 <1603068044@qq.com>
Date: Fri, 24 Apr 2020 09:46:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8B=89=E9=BB=91=E5=A5=BD=E5=8F=8B=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ic/customer/service/CustomerViewService.java |  5 +----
 .../mapper/PoiCustomerContactDataStatMapper.java |  9 +++++++--
 .../PoiCustomerContactDataStatDOMapper.xml       | 16 ++++++++++++++++
 3 files changed, 24 insertions(+), 6 deletions(-)
 create mode 100644 src/main/resources/mapper/PoiCustomerContactDataStatDOMapper.xml

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 b03fd4a..47b21f7 100644
--- a/src/main/java/com/kiisoo/ic/customer/service/CustomerViewService.java
+++ b/src/main/java/com/kiisoo/ic/customer/service/CustomerViewService.java
@@ -3,7 +3,6 @@ package com.kiisoo.ic.customer.service;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
-import com.kiisoo.ic.customer.bean.OpCustomerDTO;
 import com.kiisoo.ic.customer.entity.*;
 import com.kiisoo.ic.customer.mapper.OpCustomerDOMapper;
 import com.kiisoo.ic.customer.mapper.OpVipDOMapper;
@@ -109,9 +108,7 @@ public class CustomerViewService {
         //好友总数（去重）
         Long validCustomerCount = opCustomerDOMapper.selectCustomerCount(shopIds, VALID, null, null);
         //删除拉黑数
-        QueryWrapper<PoiCustomerContactDataStat> wrapper = new QueryWrapper<>();
-        wrapper.in("store_id", shopIds).le("stat_time", selectEndTime).ge("stat_time", selectStartTime);
-        Long validDeleteCustomerCount = poiCustomerContactDataStatMapper.selectList(wrapper).stream()
+        Long validDeleteCustomerCount = poiCustomerContactDataStatMapper.selectDeleteCustomer(shopIds).stream()
                 .filter(contactDO -> contactDO.getNegativeFeedbackCnt() != null)
                 .map(PoiCustomerContactDataStat::getNegativeFeedbackCnt).mapToLong(a -> a).sum();
         //会员总数
diff --git a/src/main/java/com/kiisoo/ic/generalize/mapper/PoiCustomerContactDataStatMapper.java b/src/main/java/com/kiisoo/ic/generalize/mapper/PoiCustomerContactDataStatMapper.java
index 5911c90..6291c63 100644
--- a/src/main/java/com/kiisoo/ic/generalize/mapper/PoiCustomerContactDataStatMapper.java
+++ b/src/main/java/com/kiisoo/ic/generalize/mapper/PoiCustomerContactDataStatMapper.java
@@ -2,10 +2,15 @@ package com.kiisoo.ic.generalize.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.kiisoo.ic.generalize.entity.PoiCustomerContactDataStat;
-import com.kiisoo.ic.generalize.entity.PrivilageOrganizationalMember;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 @Repository
 public interface PoiCustomerContactDataStatMapper extends BaseMapper<PoiCustomerContactDataStat> {
-
+    /**
+     * 拉黑客户list
+     */
+    List<PoiCustomerContactDataStat> selectDeleteCustomer(@Param("shopIds")List<Long> shopIds);
 }
diff --git a/src/main/resources/mapper/PoiCustomerContactDataStatDOMapper.xml b/src/main/resources/mapper/PoiCustomerContactDataStatDOMapper.xml
new file mode 100644
index 0000000..a2d87e5
--- /dev/null
+++ b/src/main/resources/mapper/PoiCustomerContactDataStatDOMapper.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.kiisoo.ic.generalize.mapper.PoiCustomerContactDataStatMapper">
+    <!--拉黑-->
+    <select id="selectDeleteCustomer" resultType="com.kiisoo.ic.generalize.entity.PoiCustomerContactDataStat">
+        select id as id, store_id as storeId, region_id as regionId, negative_feedback_cnt as  negativeFeedbackCnt,
+        new_contact_cnt as newContactCnt, stat_time as statTime, create_time as createTime
+        from poi_customer_contact_data_stat t1 where stat_time =
+        (select max(stat_time) from poi_customer_contact_data_stat t2 where t1.store_id=t2.store_id)
+        and t1.store_id in
+        <foreach collection="shopIds" separator="," item="item" index="index" close=")" open="(">
+            #{item}
+        </foreach>
+    </select>
+
+</mapper>