消息格式变化

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/MessageServiceImpl.java

@@ -183,15 +183,25 @@ public class MessageServiceImpl implements MessageService {
                     dto.setFansId(messageRequestDto.getReceiverId());
                     List<FollowFansRecord> followFansRecordList = followFansRecordDao.findList(dto);
                     List<Long> followerIdList = followFansRecordList.stream().map(FollowFansRecord::getFollowerId).collect(Collectors.toList());
-                    if (followerIdList.contains(messageContentMap.get(m.getMessageId()).getSenderId())) {
-                        contentMap.put("relation", FollowFansEnum.RelationEnum.BOTH_FOLLOWED.getDes());
+                    contentMap.put("id", messageContentText.getId());
+                    contentMap.put("idType", messageContentText.getIdType());
+                    //查询之前关注的人是否目前还在关注,用来判断relation
+                    FollowFansRecordRequestDto fansRecordRequestDto = new FollowFansRecordRequestDto();
+                    fansRecordRequestDto.setFansId(messageContentText.getId());
+                    fansRecordRequestDto.setFollowerId(messageRequestDto.getReceiverId());
+                    FollowFansRecord followFansRecord = followFansRecordDao.findOne(fansRecordRequestDto);
+                    if (followFansRecord == null && followerIdList.contains(messageContentMap.get(m.getMessageId()).getSenderId())) {
+                        contentMap.put("relation", FollowFansEnum.RelationEnum.FOLLOWED.getDes());
                         contentMap.put("isFollowed", true);
-                        int id = followFansRecordList.stream().filter(f->f.getFollowerId().longValue() == messageContentMap.get(m.getMessageId()).getSenderId()).map(FollowFansRecord::getId).findFirst().get();
-                        contentMap.put("id", id);
-                        contentMap.put("idType", messageContentText.getIdType());
-                    } else {
+                    } else if (followFansRecord == null && !followerIdList.contains(messageContentMap.get(m.getMessageId()).getSenderId())) {
+                        contentMap.put("relation",  FollowFansEnum.RelationEnum.NO_FOLLOWED.getDes());
+                        contentMap.put("isFollowed", false);
+                    } else if (followFansRecord != null && !followerIdList.contains(messageContentMap.get(m.getMessageId()).getSenderId())) {
                         contentMap.put("relation",  FollowFansEnum.RelationEnum.BACK_FOLLOWED.getDes());
                         contentMap.put("isFollowed", false);
+                    } else {
+                        contentMap.put("relation", FollowFansEnum.RelationEnum.BOTH_FOLLOWED.getDes());
+                        contentMap.put("isFollowed", true);
                     }
                 }
                 contentMap.put("time", time);