From 1e6e6e53206a38f9888918d12be57cd1cf901504 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: Thu, 28 Dec 2023 11:36:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF=E9=80=9A=E7=9F=A5=20userId?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8=E9=A3=9E=E4=B9=A6userId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/HyPartnerUserInfoMapper.xml  |  2 +-
 .../com/cool/store/dto/partner/MobileCheckDTO.java     |  1 +
 .../store/service/impl/LineHighSeasServiceImpl.java    |  2 +-
 .../service/impl/exhibition/ExhibitionServiceImpl.java | 10 ++++++++--
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserInfoMapper.xml
index f7cf65927..23641e8b1 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserInfoMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserInfoMapper.xml
@@ -118,7 +118,7 @@
   <select id="selectByCheckMobile" resultType="com.cool.store.dto.partner.MobileCheckDTO">
     select  a.partner_id as  partnerId,a.mobile,a.username as partnerName,
     b.line_status as  lineStatus ,b.workflow_stage as  workflowStage ,b.workflow_status as  workflowStatus ,close_time as closeTime,b.id as lineId,
-    c.`name`as  investmentManager,c.mobile as  investmentManagerMobile
+    c.`name`as  investmentManagerName,c.mobile as  investmentManagerMobile,c.user_id as  investmentManager
     FROM  hy_partner_user_info a left join  hy_partner_line_info b  on a.partner_id=b.partner_id  and  b.deleted=0  left join  enterprise_user  c   on  b.investment_manager=c.user_id  and c.deleted=0   WHERE a.mobile=#{mobile}
   </select>
 
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/MobileCheckDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/MobileCheckDTO.java
index d88015c28..1fc2a3ad1 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/MobileCheckDTO.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/MobileCheckDTO.java
@@ -18,6 +18,7 @@ public class MobileCheckDTO {
     private String workflowStatus;
     private String closeTime;
     private String investmentManager;
+    private String investmentManagerName;
     private Long lineId;
     private String partnerName;
 
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineHighSeasServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineHighSeasServiceImpl.java
index 16362a9f7..16585a11b 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineHighSeasServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineHighSeasServiceImpl.java
@@ -288,7 +288,7 @@ public class LineHighSeasServiceImpl implements LineHighSeasService {
             if (mobileCheckDTO.getLineStatus().equals(LineStatusEnum.PUBLIC_SEAS.getCode())) {
                 throw new ServiceException(ErrorCodeEnum.PUBLIC_LINE_NOT_FOLLOW);
             } else {
-                String message = MessageFormat.format(ErrorCodeEnum.LINE_EXIST_FOLLOW.getMessage(), mobileCheckDTO.getInvestmentManager(), mobileCheckDTO.getInvestmentManagerMobile());
+                String message = MessageFormat.format(ErrorCodeEnum.LINE_EXIST_FOLLOW.getMessage(), mobileCheckDTO.getInvestmentManagerName(), mobileCheckDTO.getInvestmentManagerMobile());
                 return  new ResponseResult(ErrorCodeEnum.LINE_EXIST_FOLLOW.getCode(),message);
             }
         }
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/exhibition/ExhibitionServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/exhibition/ExhibitionServiceImpl.java
index adb3b9199..2298fbdb2 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/exhibition/ExhibitionServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/exhibition/ExhibitionServiceImpl.java
@@ -43,6 +43,7 @@ import javax.annotation.Resource;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 /**
@@ -512,7 +513,11 @@ public class ExhibitionServiceImpl implements ExhibitionService {
             BeanUtil.copyProperties(x,exhibitionLineBaseVO);
             result.add(exhibitionLineBaseVO);
         });
-        return result;
+        //去重
+        return result.stream()
+                .collect(Collectors.toMap(ExhibitionLineBaseVO::getMobile, Function.identity(), (existing, replacement) -> existing))
+                .values().stream()
+                .collect(Collectors.toList());
     }
 
     @Override
@@ -630,7 +635,8 @@ public class ExhibitionServiceImpl implements ExhibitionService {
         whetherInExhibition(Arrays.asList(lineId),Boolean.TRUE);
         if (sendNotice){
             //发送通知
-            eventCenterHttpRequest.sendFeiShuNotice(FeiShuNoticeMsgEnum.PARTNER_SIGNUP_EXHIBITION,Arrays.asList(investManager),mobileCheckDTO.getPartnerName(),mobileCheckDTO.getMobile(),
+            List<String> feishuUserIdListByUserIds = enterpriseUserDAO.getFeishuUserIdListByUserIds(Arrays.asList(investManager));
+            eventCenterHttpRequest.sendFeiShuNotice(FeiShuNoticeMsgEnum.PARTNER_SIGNUP_EXHIBITION,feishuUserIdListByUserIds,mobileCheckDTO.getPartnerName(),mobileCheckDTO.getMobile(),
                     DateUtils.format(hyExhibitionDO.getStartDate(),CoolDateUtils.DATE_FORMAT_DAY_2),hyExhibitionDO.getExhibitionName(),hyExhibitionDO.getLocation());
         }
         return new SignUpExhibitionVO(Boolean.TRUE,CommonConstants.ZERO,null);