根据链接查询群组信息接口修改

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java

@@ -35,6 +35,7 @@ import com.epmet.feign.MessageFeignClient;
 import com.epmet.modules.constant.UserMessageConstant;
 import com.epmet.modules.feign.EpmetUserFeignClient;
 import com.epmet.modules.group.dao.ResiGroupDao;
+import com.epmet.modules.group.entity.ResiGroupEntity;
 import com.epmet.modules.group.service.ResiGroupService;
 import com.epmet.modules.invitation.dao.GroupInvitationDao;
 import com.epmet.modules.invitation.entity.GroupInvitationEntity;
@@ -58,6 +59,8 @@ import com.epmet.resi.group.dto.invitation.result.LinkGroupInfoResultDTO;
 import com.epmet.resi.group.dto.member.GroupMemeberOperationDTO;
 import com.epmet.resi.group.dto.member.ResiGroupMemberDTO;
 import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -72,7 +75,7 @@ import java.util.*;
  */
 @Service
 public class GroupInvitationServiceImpl extends BaseServiceImpl<GroupInvitationDao, GroupInvitationEntity> implements GroupInvitationService {
-
+	private Logger logger = LoggerFactory.getLogger(getClass());
 	@Autowired
 	private ResiGroupMemberDao resiGroupMemberDao;
 
@@ -199,9 +202,39 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl<GroupInvitationD
 			return new Result<LinkGroupInfoResultDTO>().error(validResult.getCode(),validResult.getMsg());
 		}
 		LinkGroupInfoResultDTO linkGroupInfoResultDTO = baseDao.selectLinkGroupInfo(validResult.getData().getResiGroupId());
+		//获取组长信息
+		Result<UserResiInfoDTO> groupLeaderUserInfo = this.getGroupLeaderUserInfo(linkGroupInfoResultDTO.getGroupId());
+		if (groupLeaderUserInfo.success() && null != groupLeaderUserInfo.getData()) {
+			linkGroupInfoResultDTO.setLeaderName(groupLeaderUserInfo.getData().getShowName());
+		} else {
+			logger.info("组长注册信息查询失败" + groupLeaderUserInfo.getMsg());
+		}
 		return new Result<LinkGroupInfoResultDTO>().ok(linkGroupInfoResultDTO);
 	}
 
+	/**
+	 * @param groupId
+	 * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.UserResiInfoDTO>
+	 * @Author yinzuomei
+	 * @Description 根据组id查询组长信息
+	 * @Date 2020/3/30 15:07
+	 **/
+	private Result<UserResiInfoDTO> getGroupLeaderUserInfo(String groupId) {
+		//群主名称需要调用feign查询
+		ResiGroupEntity resiGroupEntity = resiGroupDao.selectById(groupId);
+		if (null == resiGroupEntity) {
+			return new Result<>();
+		}
+		ResiGroupMemberDTO groupMemberDTO = resiGroupDao.selectGroupLeader(groupId);
+		if (null == groupMemberDTO) {
+			return new Result<>();
+		}
+		UserResiInfoFormDTO resiUserInfoFormDTO = new UserResiInfoFormDTO();
+		resiUserInfoFormDTO.setCustomerId(resiGroupEntity.getCustomerId());
+		resiUserInfoFormDTO.setUserId(groupMemberDTO.getCustomerUserId());
+		return epmetUserFeignClient.getUserResiInfoDTO(resiUserInfoFormDTO);
+	}
+
 	private Result<GroupInvitationDTO> checkLinkValid(String invitationId){
 		//校验是否存在该邀请连接
 		GroupInvitationDTO groupInvitationDTO = this.get(invitationId);