From 45cf9bb8fbf63e9fc03bb313a0e275f48b932c3e Mon Sep 17 00:00:00 2001
From: yechenhao <yechenhao>
Date: Sun, 31 May 2020 00:54:08 +0800
Subject: [PATCH 1/9] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=A5=BD=E5=8F=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/EmployeeController.java        |  6 ++--
 .../kiisoo/ic/employee/entity/EmployeeDO.java |  4 +++
 .../ic/employee/service/EmployeeService.java  | 29 ++++++++-----------
 .../kiisoo/ic/store/entity/StoreUserDTO.java  | 12 ++++++++
 .../mapper/PrivilageCpUserStoreDOMapper.xml   | 15 +++++++---
 5 files changed, 43 insertions(+), 23 deletions(-)

diff --git a/src/main/java/com/kiisoo/ic/employee/controller/EmployeeController.java b/src/main/java/com/kiisoo/ic/employee/controller/EmployeeController.java
index 2076fbe..5eb1091 100644
--- a/src/main/java/com/kiisoo/ic/employee/controller/EmployeeController.java
+++ b/src/main/java/com/kiisoo/ic/employee/controller/EmployeeController.java
@@ -197,9 +197,11 @@ public class EmployeeController extends BaseController {
      */
     @RequestMapping(value = "update",method = RequestMethod.POST)
     @ResponseBody
-    public Map<String,Object> updateUser(@RequestBody EmployeeDO employee){
+    public Map<String,Object> updateUser(@RequestParam("id")Long id,@RequestParam("mobile")String mobile,
+                                         @RequestParam("cpUserName")String cpUserName,@RequestParam("cpUserId")String cpUserId,
+                                         @RequestParam("alias")String alias){
         try {
-            Boolean hasAdd = employeeService.updateUser(employee);
+            Boolean hasAdd = employeeService.updateUser(id,cpUserId,mobile,cpUserName,alias);
             return data(hasAdd);
         }catch (Exception e){
             log.error("修改用户失败",e);
diff --git a/src/main/java/com/kiisoo/ic/employee/entity/EmployeeDO.java b/src/main/java/com/kiisoo/ic/employee/entity/EmployeeDO.java
index 15db79a..634daa4 100644
--- a/src/main/java/com/kiisoo/ic/employee/entity/EmployeeDO.java
+++ b/src/main/java/com/kiisoo/ic/employee/entity/EmployeeDO.java
@@ -28,6 +28,10 @@ public class EmployeeDO {
      * 员工名
      */
     private String name;
+    /**
+     * 企业微信名称
+     */
+    private String cpUserName;
     /**
      * 成员所属部门id列表,不超过20个(企业微信部门id，非数据库部门id)
      */
diff --git a/src/main/java/com/kiisoo/ic/employee/service/EmployeeService.java b/src/main/java/com/kiisoo/ic/employee/service/EmployeeService.java
index 31eaabf..c1590aa 100644
--- a/src/main/java/com/kiisoo/ic/employee/service/EmployeeService.java
+++ b/src/main/java/com/kiisoo/ic/employee/service/EmployeeService.java
@@ -33,6 +33,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import javax.imageio.ImageIO;
 import javax.servlet.ServletOutputStream;
@@ -262,31 +263,25 @@ public class EmployeeService {
      * @throws WxErrorException
      */
     @Transactional(rollbackFor = Exception.class)
-    public Boolean updateUser(EmployeeDO employee) throws Exception {
+    public Boolean updateUser(Long id, String cpUserId,String mobile,String cpUserName,String alias) throws Exception {
         PrivilageCpUserDO privilageCpUserDO = new PrivilageCpUserDO();
-        BeanUtils.copyProperties(employee, privilageCpUserDO);
-        privilageCpUserDO.setCpUserId(employee.getUserId());
-
+        privilageCpUserDO.setId(id);
+        privilageCpUserDO.setMobile(mobile);
+        privilageCpUserDO.setName(cpUserName);
+        privilageCpUserDO.setAlias(alias);
 
         int update = privilageCpUserDOMapper.updateById(privilageCpUserDO);
         if (update == 0) {
             throw new Exception("修改成员失败");
         }
 
-        //维护部门关系——删除原有部门关系
-        QueryWrapper<PrivilageCpUserDepartmentDO> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq(DATABASE_CP_USER_ID_KEY, privilageCpUserDO.getId());
-        privilageCpUserDepartmentDOMapper.delete(queryWrapper);
-
-        Long[] departIds = employee.getDepartIds();
-        Integer[] orders = employee.getOrders();
-        Integer[] isLeaderInDept = employee.getIsLeaderInDept();
-        for (int i = 0; i < departIds.length; i++) {
-            PrivilageCpUserDepartmentDO relation = new PrivilageCpUserDepartmentDO(privilageCpUserDO.getId(), departIds[i], orders[i], isLeaderInDept[i]);
-            privilageCpUserDepartmentDOMapper.insert(relation);
-        }
-
         //成功则添加用户到企业微信
+        EmployeeDO employee = new EmployeeDO();
+        employee.setName(cpUserName);
+        employee.setId(id);
+        employee.setAlias(alias);
+        employee.setUserId(cpUserId);
+        employee.setMobile(mobile);
         qwMailListManageService.updateUser(employee);
         return true;
     }
diff --git a/src/main/java/com/kiisoo/ic/store/entity/StoreUserDTO.java b/src/main/java/com/kiisoo/ic/store/entity/StoreUserDTO.java
index a73a0cd..6c583aa 100644
--- a/src/main/java/com/kiisoo/ic/store/entity/StoreUserDTO.java
+++ b/src/main/java/com/kiisoo/ic/store/entity/StoreUserDTO.java
@@ -18,6 +18,18 @@ public class StoreUserDTO extends PoiStore{
      * 企业微信账号
      */
     private String cpUserId;
+    /**
+     * 企业微信账号
+     */
+    private String cpUserName;
+    /**
+     * 别名
+     */
+    private String alias;
+    /**
+     * 手机号
+     */
+    private String mobile;
     /**
      * privilage_cp_user 主键id
      */
diff --git a/src/main/resources/mapper/PrivilageCpUserStoreDOMapper.xml b/src/main/resources/mapper/PrivilageCpUserStoreDOMapper.xml
index 6fc9eb1..47a0582 100644
--- a/src/main/resources/mapper/PrivilageCpUserStoreDOMapper.xml
+++ b/src/main/resources/mapper/PrivilageCpUserStoreDOMapper.xml
@@ -3,8 +3,16 @@
 <mapper namespace="com.kiisoo.ic.store.mapper.PrivilageCpUserStoreDOMapper">
 
     <select id="selectCpUserByShops" resultType="com.kiisoo.ic.store.entity.StoreUserDTO">
-
-        select distinct pcu.cp_user_id as cpUserId,pcu.qr_code as qrCodeAction,pcus.store_id as id,pcu.id as userId ,t.name,t.code
+        select distinct
+        pcu.cp_user_id as cpUserId,
+        pcu.qr_code as qrCodeAction,
+        pcus.store_id as id,
+        pcu.id as userId ,
+        pcu.name as cpUserName ,
+        pcu.mobile as mobile ,
+        pcu.alias as alias ,
+        t.name,
+        t.code
         from poi_store t join privilage_domain_entity t2 on t.id = t2.entity_id and t2.type = 3
         left join privilage_cp_user_store pcus on t.id = pcus.store_id
         left join privilage_cp_user pcu on pcus.cp_user_id = pcu.id and pcu.status in (1,4)
@@ -17,8 +25,7 @@
                 </foreach>
             </if>
         </where>
-        order by  pcu.id desc
-
+        order by pcu.id desc
     </select>
 
     <select id="selectOneByCpUserId" resultType="java.lang.Long">

From b45a69b159127827daf6467c58d4b003c3aca94d Mon Sep 17 00:00:00 2001
From: yechenhao <yechenhao>
Date: Sun, 31 May 2020 00:56:35 +0800
Subject: [PATCH 2/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/kiisoo/ic/employee/service/EmployeeService.java     | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/kiisoo/ic/employee/service/EmployeeService.java b/src/main/java/com/kiisoo/ic/employee/service/EmployeeService.java
index c1590aa..66c2e98 100644
--- a/src/main/java/com/kiisoo/ic/employee/service/EmployeeService.java
+++ b/src/main/java/com/kiisoo/ic/employee/service/EmployeeService.java
@@ -258,7 +258,11 @@ public class EmployeeService {
     /**
      * 修改成员
      *
-     * @param employee 成员实体
+     * @param id
+     * @param cpUserId 账号
+     * @param mobile 手机号
+     * @param cpUserName 名称
+     * @param alias 别名
      * @return
      * @throws WxErrorException
      */

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

---
 src/main/java/com/kiisoo/ic/job/detail/CustomerDataJob.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/main/java/com/kiisoo/ic/job/detail/CustomerDataJob.java b/src/main/java/com/kiisoo/ic/job/detail/CustomerDataJob.java
index dfb5755..a6cf968 100644
--- a/src/main/java/com/kiisoo/ic/job/detail/CustomerDataJob.java
+++ b/src/main/java/com/kiisoo/ic/job/detail/CustomerDataJob.java
@@ -1,6 +1,7 @@
 package com.kiisoo.ic.job.detail;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.kiisoo.ic.common.utils.RedisUtil;
 import com.kiisoo.ic.customer.CustomerService;
 import com.kiisoo.ic.customer.entity.OpSellerCustomerRelation;
 import com.kiisoo.ic.customer.mapper.OpSellerCustomerRelationDOMapper;
@@ -55,6 +56,9 @@ public class CustomerDataJob {
     @Autowired
     private CustomerService customerService;
 
+    @Autowired
+    private RedisUtil redisUtil;
+
 
     public void handle(String cpUserIds) {
 
@@ -128,6 +132,7 @@ public class CustomerDataJob {
                 opSellerCustomerRelationDOMapper.delete(relationQueryWrapper);
                 Long storeId = privilageCpUserStoreDOMapper.selectOneByCpUserId(cpUserId);
 
+
                 ProduceDTO produceDTO = new ProduceDTO();
                 produceDTO.setIndex(index);
                 produceDTO.setStoreId(storeId);

From 36dcef8b841f041d2390aadc58d8f9787d7e5d3e Mon Sep 17 00:00:00 2001
From: kevin jiang <kevin.jiang@kiisoo.com>
Date: Sun, 31 May 2020 15:24:36 +0800
Subject: [PATCH 4/9] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=89=8B=E6=9C=BA?=
 =?UTF-8?q?=E7=AB=AF=E9=A6=96=E9=A1=B5=E5=92=8C=E5=A5=BD=E5=8F=8B=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=8E=A5=E5=8F=A3=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kiisoo/ic/customer/CustomerService.java   | 93 ++++---------------
 .../controller/CustomerController.java        |  7 +-
 .../OpSellerCustomerRelationDOMapper.java     | 21 +++--
 .../ic/store/bean/PoiStoreStaffDTO.java       |  2 +
 4 files changed, 33 insertions(+), 90 deletions(-)

diff --git a/src/main/java/com/kiisoo/ic/customer/CustomerService.java b/src/main/java/com/kiisoo/ic/customer/CustomerService.java
index 6b62abc..de1703d 100644
--- a/src/main/java/com/kiisoo/ic/customer/CustomerService.java
+++ b/src/main/java/com/kiisoo/ic/customer/CustomerService.java
@@ -1,6 +1,7 @@
 package com.kiisoo.ic.customer;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -665,102 +666,46 @@ public class CustomerService {
             return results;
         }
         Long shopId = stafferInfoVOS.get(0).getStoreId();
-        List<FriendDTO> thisList;
-        PageHelper.startPage(pageNum, pageSize);
+        IPage<FriendDTO> thisList;
+//        PageHelper.startPage(pageNum, pageSize);
+        com.baomidou.mybatisplus.extension.plugins.pagination.Page<FriendDTO> page = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(pageNum,pageSize);
+
         if (roleCode.equals(RoleEnum.ROLE_CODE_DZ.getRoleCode())) {
             // 0、新增好友  1、累计好友
             if (flag == 0) {
-                thisList = opSellerCustomerRelationDOMapper.selectFriendListByShopId(shopId, sellerId, search, startDate, endDate, type);
+                thisList = opSellerCustomerRelationDOMapper.selectFriendListByShopId(page,shopId, sellerId, search, startDate, endDate, type);
+
             } else {
-                thisList = opSellerCustomerRelationDOMapper.selectFriendListByShopIdAndDate(shopId, sellerId, search, startDate, endDate, type);
+                thisList = opSellerCustomerRelationDOMapper.selectFriendListByShopIdAndDate(page, shopId, sellerId, search, startDate, endDate, type);
             }
 
-            if (CollectionUtils.isNotEmpty(thisList)) {
-                for (int i = 0; i < thisList.size(); i++) {
+            if (CollectionUtils.isNotEmpty(thisList.getRecords())) {
+                for (int i = 0; i < thisList.getRecords().size(); i++) {
                     // 设置导购名称
-                    if (!thisList.get(i).getInviteSellerId().equals(0L)) {
+                    if (!thisList.getRecords().get(i).getInviteSellerId().equals(0L)) {
                         Map<String, Object> map = new HashMap<>();
-                        map.put("id", thisList.get(i).getInviteSellerId());
-                        String userName = poiStoreStaffDOMapper.selectUserNameById(thisList.get(i).getInviteSellerId());
+                        map.put("id", thisList.getRecords().get(i).getInviteSellerId());
+                        String userName = poiStoreStaffDOMapper.selectUserNameById(thisList.getRecords().get(i).getInviteSellerId());
                         if (StringUtils.isNotEmpty(userName)) {
-                            thisList.get(i).setInviteSellerName(userName);
+                            thisList.getRecords().get(i).setInviteSellerName(userName);
                         } else {
-                            thisList.get(i).setInviteSellerName("");
+                            thisList.getRecords().get(i).setInviteSellerName("");
                         }
                     } else {
-                        thisList.get(i).setInviteSellerName("");
+                        thisList.getRecords().get(i).setInviteSellerName("");
                     }
                 }
             }
         } else {
             // 0、新增好友  1、累计好友
             if (flag == 0) {
-                thisList = opSellerCustomerRelationDOMapper.selectFriendListBySeller(userId, search, startDate, endDate, type);
+                thisList = opSellerCustomerRelationDOMapper.selectFriendListBySeller(page, userId, search, startDate, endDate, type);
             } else {
-                thisList = opSellerCustomerRelationDOMapper.selectFriendListBySellerAndDate(userId, search, startDate, endDate, type);
+                thisList = opSellerCustomerRelationDOMapper.selectFriendListBySellerAndDate(page, userId, search, startDate, endDate, type);
             }
         }
 
-        results.put("this", new PageInfo<>(thisList));
-        return results;
-    }
-
-    /**
-     * @param userId
-     * @param sellerId
-     * @param search
-     * @param roleCode
-     */
-    public Map<String, Object> listCustomer(Long userId, Long sellerId, String search, String roleCode, Integer type, Date startDate, Date endDate) throws Exception {
-        Map<String, Object> results = new HashMap<>();
-        Date thisDate = new Date();
-        DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
-        Calendar calendar = Calendar.getInstance();
-        calendar.set(Calendar.HOUR_OF_DAY, -24);
-        Date lastDate = dateFormat.parse(dateFormat.format(calendar.getTime()));
-        calendar.set(Calendar.HOUR_OF_DAY, -24);
-        Date earlyDate = dateFormat.parse(dateFormat.format(calendar.getTime()));
-        List<StafferInfoVO> stafferInfoVOS = poiStoreStaffDOMapper.selectInfoById(userId);
-        if (CollectionUtils.isEmpty(stafferInfoVOS)) {
-            results.put("this", null);
-            results.put("last", null);
-            results.put("early", null);
-            return results;
-        }
-        Long shopId = stafferInfoVOS.get(0).getStoreId();
-        if (roleCode.equals(RoleEnum.ROLE_CODE_DZ.getRoleCode())) {
-            List<FriendDTO> thisList = opSellerCustomerRelationDOMapper.selectFriendListByShopId(shopId, sellerId, search, startDate, endDate, type);
-            thisList.forEach(friendDTO -> {
-                String inviteSellerName = opSellerCustomerRelationDOMapper.selectStaffName(friendDTO.getInviteSellerId());
-                if (StringUtils.isNotBlank(inviteSellerName)) {
-                    friendDTO.setInviteSellerName(inviteSellerName);
-                }
-            });
-            List<FriendDTO> lastList = opSellerCustomerRelationDOMapper.selectFriendListByShopId(shopId, sellerId, search, lastDate, lastDate, type);
-            lastList.forEach(friendDTO -> {
-                String inviteSellerName = opSellerCustomerRelationDOMapper.selectStaffName(friendDTO.getInviteSellerId());
-                if (StringUtils.isNotBlank(inviteSellerName)) {
-                    friendDTO.setInviteSellerName(inviteSellerName);
-                }
-            });
-            List<FriendDTO> earlyList = opSellerCustomerRelationDOMapper.selectFriendListByShopId(shopId, sellerId, search, null, earlyDate, type);
-            earlyList.forEach(friendDTO -> {
-                String inviteSellerName = opSellerCustomerRelationDOMapper.selectStaffName(friendDTO.getInviteSellerId());
-                if (StringUtils.isNotBlank(inviteSellerName)) {
-                    friendDTO.setInviteSellerName(inviteSellerName);
-                }
-            });
-            results.put("this", thisList);
-            results.put("last", lastList);
-            results.put("early", earlyList);
-        } else {
-            List<FriendDTO> thisList = opSellerCustomerRelationDOMapper.selectFriendListBySeller(userId, search, startDate, endDate, type);
-            results.put("this", thisList);
-            List<FriendDTO> lastList = opSellerCustomerRelationDOMapper.selectFriendListBySeller(userId, search, lastDate, lastDate, type);
-            results.put("last", lastList);
-            List<FriendDTO> earlyList = opSellerCustomerRelationDOMapper.selectFriendListBySeller(userId, search, null, earlyDate, type);
-            results.put("early", earlyList);
-        }
+        results.put("this", new PageInfo<>(thisList.getRecords()));
         return results;
     }
 
diff --git a/src/main/java/com/kiisoo/ic/customer/controller/CustomerController.java b/src/main/java/com/kiisoo/ic/customer/controller/CustomerController.java
index 4a9d3d7..0cb1ea6 100644
--- a/src/main/java/com/kiisoo/ic/customer/controller/CustomerController.java
+++ b/src/main/java/com/kiisoo/ic/customer/controller/CustomerController.java
@@ -90,12 +90,7 @@ public class CustomerController extends BaseController {
                                             Date endDate,
                                             String version, @RequestParam("flag") int flag,int pageNum, int pageSize){
         try {
-            Map<String, Object> stringObjectMap;
-            if(StringUtils.isNotBlank(version)){
-                stringObjectMap = customerService.listCustomerNew(userId, sellerId, search, roleCode, type, startDate, endDate, flag, pageNum, pageSize);
-            }else{
-                stringObjectMap = customerService.listCustomer(userId, sellerId, search, roleCode, type, startDate, endDate);
-            }
+            Map<String, Object> stringObjectMap = customerService.listCustomerNew(userId, sellerId, search, roleCode, type, startDate, endDate, flag, pageNum, pageSize);
             return data(stringObjectMap);
         } catch (Exception e) {
             log.error("查询好友列表:",e);
diff --git a/src/main/java/com/kiisoo/ic/customer/mapper/OpSellerCustomerRelationDOMapper.java b/src/main/java/com/kiisoo/ic/customer/mapper/OpSellerCustomerRelationDOMapper.java
index b29b8ad..9e951f1 100644
--- a/src/main/java/com/kiisoo/ic/customer/mapper/OpSellerCustomerRelationDOMapper.java
+++ b/src/main/java/com/kiisoo/ic/customer/mapper/OpSellerCustomerRelationDOMapper.java
@@ -1,6 +1,8 @@
 package com.kiisoo.ic.customer.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.kiisoo.ic.customer.bean.FriendDTO;
 import com.kiisoo.ic.customer.entity.OpSellerCustomerRelation;
 import org.apache.ibatis.annotations.Param;
@@ -25,7 +27,7 @@ public interface OpSellerCustomerRelationDOMapper extends BaseMapper<OpSellerCus
      * @param type
      * @return
      */
-    List<FriendDTO> selectFriendListBySeller(@Param("userId") Long userId,
+    IPage<FriendDTO> selectFriendListBySeller(Page<FriendDTO> page,@Param("userId") Long userId,
                                          @Param("search") String search,
                                          @Param("startDate") Date startDate,
                                          @Param("endDate") Date endDate,
@@ -41,12 +43,12 @@ public interface OpSellerCustomerRelationDOMapper extends BaseMapper<OpSellerCus
      * @param type
      * @return
      */
-    List<FriendDTO> selectFriendListByShopId(@Param("shopId") Long shopId,
-                                         @Param("sellerId") Long sellerId,
-                                         @Param("search") String search,
-                                         @Param("startDate") Date startDate,
-                                         @Param("endDate") Date endDate,
-                                         @Param("type") Integer type);
+    IPage<FriendDTO> selectFriendListByShopId(Page<FriendDTO> page, @Param("shopId") Long shopId,
+                                              @Param("sellerId") Long sellerId,
+                                              @Param("search") String search,
+                                              @Param("startDate") Date startDate,
+                                              @Param("endDate") Date endDate,
+                                              @Param("type") Integer type);
 
     /**
      * 根据导购id查询导购名
@@ -73,7 +75,7 @@ public interface OpSellerCustomerRelationDOMapper extends BaseMapper<OpSellerCus
      * @author dexiang.jiang
      * @date 2020/05/10 21:50
      */
-    List<FriendDTO> selectFriendListByShopIdAndDate(@Param("shopId") Long shopId,
+    IPage<FriendDTO> selectFriendListByShopIdAndDate(Page<FriendDTO> page, @Param("shopId") Long shopId,
                                              @Param("sellerId") Long sellerId,
                                              @Param("search") String search,
                                              @Param("startDate") Date startDate,
@@ -91,7 +93,7 @@ public interface OpSellerCustomerRelationDOMapper extends BaseMapper<OpSellerCus
      * @author dexiang.jiang
      * @date 2020/05/10 22:01
      */
-    List<FriendDTO> selectFriendListBySellerAndDate(@Param("userId") Long userId,
+    IPage<FriendDTO> selectFriendListBySellerAndDate(Page<FriendDTO> page,@Param("userId") Long userId,
                                              @Param("search") String search,
                                              @Param("startDate") Date startDate,
                                              @Param("endDate") Date endDate,
@@ -99,7 +101,6 @@ public interface OpSellerCustomerRelationDOMapper extends BaseMapper<OpSellerCus
 
     Long selectSellerCustomerRelation(@Param("customerId") Long customerId, @Param("userId") Long userId, @Param("storeId") Long storeId);
 
-    Integer countStoreCustomers(@Param("customerId") Long customerId, @Param("userId") Long userId, @Param("storeId") Long storeId);
 
     List<Map<String, Object>> selectCustomersByCpUserId();
 
diff --git a/src/main/java/com/kiisoo/ic/store/bean/PoiStoreStaffDTO.java b/src/main/java/com/kiisoo/ic/store/bean/PoiStoreStaffDTO.java
index 543b9f3..cbfb707 100644
--- a/src/main/java/com/kiisoo/ic/store/bean/PoiStoreStaffDTO.java
+++ b/src/main/java/com/kiisoo/ic/store/bean/PoiStoreStaffDTO.java
@@ -2,10 +2,12 @@ package com.kiisoo.ic.store.bean;
 
 import com.kiisoo.ic.store.entity.PoiStoreStaff;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 /**
  * 店铺人员具体信息
  */
+@EqualsAndHashCode(callSuper = true)
 @Data
 public class PoiStoreStaffDTO extends PoiStoreStaff {
     /**名称*/

From 3f0d76d70f752f44d8de8c5c7cd5650afe55fae6 Mon Sep 17 00:00:00 2001
From: kevin jiang <kevin.jiang@kiisoo.com>
Date: Sun, 31 May 2020 15:34:15 +0800
Subject: [PATCH 5/9] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=89=8B=E6=9C=BA?=
 =?UTF-8?q?=E7=AB=AF=E9=A6=96=E9=A1=B5=E5=92=8C=E5=A5=BD=E5=8F=8B=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=8E=A5=E5=8F=A3=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pom.xml b/pom.xml
index 7ce8045..698febd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -247,6 +247,12 @@
                     <useDefaultDelimiters>false</useDefaultDelimiters>
                 </configuration>
             </plugin>
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <skipTests>true</skipTests>
+                </configuration>
+            </plugin>
         </plugins>
         <finalName>youke</finalName>
 

From d27a23905e97333004bf5104adabd87db9b60b54 Mon Sep 17 00:00:00 2001
From: kevin jiang <kevin.jiang@kiisoo.com>
Date: Sun, 31 May 2020 15:59:45 +0800
Subject: [PATCH 6/9] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=89=8B=E6=9C=BA?=
 =?UTF-8?q?=E7=AB=AF=E9=A6=96=E9=A1=B5=E5=92=8C=E5=A5=BD=E5=8F=8B=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=8E=A5=E5=8F=A3=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/kiisoo/ic/customer/CustomerService.java | 4 ++++
 .../resources/mapper/OpSellerCustomerRelationDOMapper.xml | 8 ++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/kiisoo/ic/customer/CustomerService.java b/src/main/java/com/kiisoo/ic/customer/CustomerService.java
index de1703d..4df293d 100644
--- a/src/main/java/com/kiisoo/ic/customer/CustomerService.java
+++ b/src/main/java/com/kiisoo/ic/customer/CustomerService.java
@@ -670,6 +670,10 @@ public class CustomerService {
 //        PageHelper.startPage(pageNum, pageSize);
         com.baomidou.mybatisplus.extension.plugins.pagination.Page<FriendDTO> page = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(pageNum,pageSize);
 
+        if(startDate.getTime() == endDate.getTime()){
+            endDate = null;
+        }
+
         if (roleCode.equals(RoleEnum.ROLE_CODE_DZ.getRoleCode())) {
             // 0、新增好友  1、累计好友
             if (flag == 0) {
diff --git a/src/main/resources/mapper/OpSellerCustomerRelationDOMapper.xml b/src/main/resources/mapper/OpSellerCustomerRelationDOMapper.xml
index e1de24d..c90fcf2 100644
--- a/src/main/resources/mapper/OpSellerCustomerRelationDOMapper.xml
+++ b/src/main/resources/mapper/OpSellerCustomerRelationDOMapper.xml
@@ -37,10 +37,10 @@
             CONCAT('%',#{search},'%'))
         </if>
         <if test="startDate != null">
-            and date(t1.create_time) &gt;= #{startDate}
+            and t1.create_time &gt;= #{startDate}
         </if>
         <if test="endDate != null">
-            and date(t1.create_time) &lt;= #{endDate}
+            and t1.create_time &lt;= #{endDate}
         </if>
         order by t1.create_time desc
     </select>
@@ -79,10 +79,10 @@
             CONCAT('%',#{search},'%'))
         </if>
         <if test="startDate != null">
-            and date(t1.create_time) &gt;= #{startDate}
+            and t1.create_time &gt;= #{startDate}
         </if>
         <if test="endDate != null">
-            and date(t1.create_time) &lt;= #{endDate}
+            and t1.create_time &lt;= #{endDate}
         </if>
         order by t1.create_time desc
     </select>

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 7/9] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=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>

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

---
 .../kiisoo/ic/customer/service/CustomerViewService.java   | 8 ++++----
 .../ic/employee/mapper/PrivilageCpUserDOMapper.java       | 4 ++--
 2 files changed, 6 insertions(+), 6 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 da20fbc..572d7d2 100644
--- a/src/main/java/com/kiisoo/ic/customer/service/CustomerViewService.java
+++ b/src/main/java/com/kiisoo/ic/customer/service/CustomerViewService.java
@@ -665,22 +665,22 @@ public class CustomerViewService {
             shopIdList = list1.stream().map(PoiStore::getId).collect(Collectors.toList());
             List<String> cpUserIds = privilageCpUserStoreDOMapper.selectCpUserIdsByStoreIds(shopIdList);
             Long all = privilageCpUserDOMapper.selectStoresCount(cpUserIds);
-            List<Map<String, String>> dis = privilageCpUserDOMapper.selectDistinctStoresCount(cpUserIds);
+            List<Map<String, Object>> dis = privilageCpUserDOMapper.selectDistinctStoresCount(cpUserIds);
 
             result.setAllCustomer(all);
             if(null != dis){
-                result.setAllValidCustomer(Long.parseLong(dis.get(0).get("rows")));
+                result.setAllValidCustomer(Long.parseLong(dis.get(0).get("rows").toString()));
             }
 
         }
         //管理员/总运营人员
         else if (privilageRoleDO.getCode().equals(RoleEnum.ROLE_CODE_GLY.getRoleCode()) || privilageRoleDO.getCode().equals(RoleEnum.ROLE_CODE_ALL_YYRY.getRoleCode())) {
             Long all = privilageCpUserDOMapper.selectAllCount();
-            List<Map<String, String>> dis = privilageCpUserDOMapper.selectDistinctAllCount();
+            List<Map<String, Object>> dis = privilageCpUserDOMapper.selectDistinctAllCount();
 
             result.setAllCustomer(all);
             if(null != dis){
-                result.setAllValidCustomer(Long.parseLong(dis.get(0).get("rows")));
+                result.setAllValidCustomer(Long.parseLong(dis.get(0).get("rows").toString()));
             }
         }
 
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 8e6211f..ca882d6 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();
 
-    List<Map<String, String>> selectDistinctAllCount();
+    List<Map<String, Object>> 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);
 
-    List<Map<String, String>> selectDistinctStoresCount(@Param("cpUserIds")List<String> cpUserIds);
+    List<Map<String, Object>> selectDistinctStoresCount(@Param("cpUserIds")List<String> cpUserIds);
 
     Long selectStoresCountById(@Param("shopIds")List<Long> shopIds);
 

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

---
 src/main/resources/application-prod.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index ef26e15..698e149 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -1,6 +1,6 @@
 logging:
   level:
-    root: warn
+    root: info
 
 mybatis:
   mapperLocations: classpath:mapper/*.xml