Merge branch 'quanku_v2.1' into quanku_v2.2

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

@@ -104,12 +104,21 @@ public class CollectionItemsRelationServiceImpl implements CollectionItemsRelati
                     followFansRecordRequestDto.setFansId(dto.getUserId());
                     followFansRecordRequestDto.setIntroducerId(collectionShareRecord.getSharerId());
                     followFansRecordService.follow(followFansRecordRequestDto);
-                    logger.info("用户id:{} 关注了 用户id为 {}， 介绍人为", dto.getUserId(), collectionShareRecord.getItemUserId(), collectionShareRecord.getSharerId());
-
+                    logger.info("用户id:{} 关注了 用户id为 {}， 介绍人为 {}", dto.getUserId(), collectionShareRecord.getItemUserId(), collectionShareRecord.getSharerId());
                 }
             } else {
                 if (dto.getTargetUserId() != null) {
                     searchUserId = dto.getTargetUserId();
+                    if (searchUserId.longValue() != dto.getUserId().longValue()) {
+                        collectionBookVo.setIsMine(false);
+                        //客态进入别人的藏馆，自动关注
+                        FollowFansRecordRequestDto followFansRecordRequestDto = new FollowFansRecordRequestDto();
+                        followFansRecordRequestDto.setFollowerId(searchUserId);
+                        followFansRecordRequestDto.setFansId(dto.getUserId());
+                        followFansRecordRequestDto.setIntroducerId(dto.getUserId());
+                        followFansRecordService.follow(followFansRecordRequestDto);
+                        logger.info("用户id:{} 关注了 用户id为 {}， 介绍人为 {}", dto.getUserId(), searchUserId, dto.getUserId());
+                    }
                 } else {
                     return Result.failed("targetUserId不能为空");
                 }