From f4302c7907e9905881e6671206855f0121cf21fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= <zhuhong.su@coolcollege.cn>
Date: Tue, 20 Jun 2023 20:34:40 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=81=E6=B5=B7=E7=BA=BF=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/HyPartnerLineInfoMapper.xml         | 18 +++++++++---------
 .../impl/HyPartnerLineInfoServiceImpl.java     |  9 ++++++++-
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml
index ac1bee0b4..a3ce2f473 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml
@@ -491,15 +491,15 @@
     <if test="storeKeywordType!=null and storeKeywordType==partnerMobile">
       AND hpuinfo.recommend_partner_mobile like concat('%',#{storeKeyword},'%')
     </if>
-    <if test="userIdList!=null and userIdList.size>0">
-      <foreach collection="userIdList" item="userId" open="and hpli.investment_manager in (" close=")" separator=",">
-        #{userId}
-      </foreach>
-    </if>
-    <if test="developmentManagerList!=null and developmentManagerList.size>0">
-      <foreach collection="developmentManagerList" item="developmentManager" open="and hpli.development_manager in (" close=")" separator=",">
-        #{developmentManager}
-      </foreach>
+<!--    <if test="userIdList!=null and userIdList.size>0">-->
+<!--      <foreach collection="userIdList" item="userId" open="and hpli.investment_manager in (" close=")" separator=",">-->
+<!--        #{userId}-->
+<!--      </foreach>-->
+<!--    </if>-->
+<!--    <if test="developmentManagerList!=null and developmentManagerList.size>0">-->
+<!--      <foreach collection="developmentManagerList" item="developmentManager" open="and hpli.development_manager in (" close=")" separator=",">-->
+<!--        #{developmentManager}-->
+<!--      </foreach>-->
     </if>
   </select>
 
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java
index eef861c2a..00ad320cb 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java
@@ -166,10 +166,16 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
         PageHelper.startPage(LineRequest.getPageNum(),LineRequest.getPageSize());
         PageInfo blackListDTOPageInfo = new PageInfo(hyPartnerLineInfoDAO.getBlackList(LineRequest.getUserNameKeyword(), LineRequest.getPhoneKeyword(),LineRequest.getIntentArea(), LineRequest.getAcceptAdjustType()));
         List<PartnerBlackListDTO> list = blackListDTOPageInfo.getList();
+        List<String> closeUserIdList = list.stream().map(PartnerBlackListDTO::getCloseUserId).collect(Collectors.toList());
+        List<EnterpriseUserDO> userInfoByUserIds = enterpriseUserDAO.getUserInfoByUserIds(closeUserIdList);
+        Map<String, String> userPhoneMap = userInfoByUserIds.stream().collect(Collectors.toMap(EnterpriseUserDO::getUserId, EnterpriseUserDO::getMobile));
         List<BlackListVO> result = new ArrayList<>();
         list.stream().forEach(x->{
             BlackListVO blackListVO = convertPartnerBlackListDTOToVo(x);
-            //todo su 员工名称手机号 手机号归属地
+            blackListVO.setCloseUserPhone(userPhoneMap.get(x.getCloseUserId()));
+            if (StringUtils.isNotEmpty(x.getMobile())){
+                blackListVO.setPhoneAddress(aliyunService.getPhoneNumberAttribute(x.getMobile()).getCity());
+            }
             result.add(blackListVO);
         });
         blackListDTOPageInfo.setList(result);
@@ -464,6 +470,7 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
         blackListVO.setCloseTime(partnerBlackListDTO.getCloseTime());
         blackListVO.setJoinBlackReason(partnerBlackListDTO.getJoinBlackReason());
         blackListVO.setCloseUserId(partnerBlackListDTO.getCloseUserId());
+        blackListVO.setCloseUserPhone(partnerBlackListDTO.getCloseUserId());
         return blackListVO;
     }