关注列表

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

@@ -58,7 +58,6 @@ public class FollowFansRecordServiceImpl implements FollowFansRecordService {
     CommunityAttributeReadService communityAttributeReadService;
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     public Result follow(FollowFansRecordRequestDto dto) {
         try {
             if (dto.getFollowerId() == null || dto.getFansId() == null) {
@@ -100,7 +99,6 @@ public class FollowFansRecordServiceImpl implements FollowFansRecordService {
             return Result.success(map);
         } catch (Exception e) {
             logger.error("{} 关注 {} error {}", dto.getFansId(), dto.getFollowerId(), e);
-            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
         }
         return Result.failed();
     }
@@ -182,15 +180,6 @@ public class FollowFansRecordServiceImpl implements FollowFansRecordService {
                 followFansRecordVo.setFollowerName(cacheUtil.getAppletUserNameById(f.getFollowerId()));
                 followFansRecordVo.setFollowerIcon(cacheUtil.getAppletUserById(f.getFollowerId()).getAvatar());
                 followFansRecordVo.setIntroducerName(cacheUtil.getAppletUserById(f.getIntroducerId()).getNickname());
-               /* try {
-                    CloudServerResponse<CommunityUserAttributeDO> response = communityAttributeReadService.getCommunityUserAttributeByUserId(f.getFollowerId());
-                    if (response.isSuccess()) {
-                        followFansRecordVo.setFollowerProfile(response.getResult() == null ? null : response.getResult().getSignature());
-                    }
-                } catch (Exception e) {
-                    logger.error(">>>>>>>>> 调用社区用户查询接口获取用户签名出错:{}", e);
-                }
-*/
                 if (fansIdList.contains(f.getFollowerId().longValue())) {
                     followFansRecordVo.setRelation("互相关注");
                     followFansRecordVo.setRelationCode(FollowFansEnum.RelationEnum.BOTH_FOLLOWED.getCode());

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

@@ -12,11 +12,13 @@ import com.wwdz.ch.db.dao.distribution.CollectionShareRecordDao;
 import com.wwdz.ch.db.dao.distribution.ItemCollectedRecordDao;
 import com.wwdz.ch.db.dao.distribution.SupplierItemDao;
 import com.wwdz.ch.db.domain.distribution.*;
+import com.wwdz.ch.db.dto.request.FollowFansRecordRequestDto;
 import com.wwdz.ch.db.dto.request.distribution.CollectionBookRequestDto;
 import com.wwdz.ch.db.dto.request.distribution.CollectionItemsRelationRequestDto;
 import com.wwdz.ch.db.dto.request.distribution.ItemCollectedRecordRequestDto;
 import com.wwdz.ch.db.dto.request.distribution.SupplierItemRequestDto;
 import com.wwdz.ch.wx.entity.vo.distribution.CollectionBookVo;
+import com.wwdz.ch.wx.service.FollowFansRecordService;
 import com.wwdz.ch.wx.service.distribution.CollectionBookService;
 import com.wwdz.ch.wx.service.distribution.CollectionItemsRelationService;
 import com.xxdxxs.utils.EntityMapper;
@@ -51,6 +53,9 @@ public class CollectionItemsRelationServiceImpl implements CollectionItemsRelati
     @Autowired
     ItemCollectedRecordDao itemCollectedRecordDao;
 
+    @Autowired
+    FollowFansRecordService followFansRecordService;
+
     @Override
     public Result create(CollectionItemsRelationRequestDto dto) {
         try {
@@ -91,17 +96,16 @@ public class CollectionItemsRelationServiceImpl implements CollectionItemsRelati
                 if (collectionShareRecord.getItemUserId().longValue() != dto.getUserId().longValue()) {
                     collectionBookVo.setIsMine(false);
                     searchUserId = collectionShareRecord.getItemUserId();
+                    //客态进入别人的藏馆，自动关注
+                    FollowFansRecordRequestDto followFansRecordRequestDto = new FollowFansRecordRequestDto();
+                    followFansRecordRequestDto.setFollowerId(collectionShareRecord.getItemUserId());
+                    followFansRecordRequestDto.setFansId(dto.getUserId());
+                    followFansRecordRequestDto.setIntroducerId(collectionShareRecord.getSharerId());
+                    followFansRecordService.follow(followFansRecordRequestDto);
+                    logger.info("用户id:{} 关注了 用户id为 {}， 介绍人为", dto.getUserId(), collectionShareRecord.getItemUserId(), collectionShareRecord.getSharerId());
+
                 }
             }
-
-            //查询所有的标签
-           /* CollectionBookRequestDto collectionBookRequestDto = new CollectionBookRequestDto();
-            collectionBookRequestDto.setUserId(searchUserId);
-            collectionBookRequestDto。s
-            Result bookResult = collectionBookService.findList(collectionBookRequestDto);
-            if (bookResult.getSuccess()) {
-                collectionBookVo.setBookList((List<Map<String, Object>>) bookResult.getData());
-            }*/
             //查询所有的上传藏品
             SupplierItemRequestDto supplierItemRequestDto = new SupplierItemRequestDto();
             supplierItemRequestDto.setType(DistributionEnum.DistributionTypeEnum.COLLECT.getCode());

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

@@ -23,6 +23,7 @@ import com.wwdz.ch.db.dto.request.distribution.*;
 import com.wwdz.ch.core.entity.SupplierItemVo;
 import com.wwdz.ch.wx.entity.vo.distribution.AuctionDetailVo;
 import com.wwdz.ch.wx.entity.vo.distribution.AuctionRecordRowVo;
+import com.wwdz.ch.wx.service.FollowFansRecordService;
 import com.wwdz.ch.wx.service.distribution.CollectionItemsRelationService;
 import com.wwdz.ch.wx.service.distribution.DistributionOrderService;
 import com.wwdz.ch.wx.service.distribution.SupplierItemService;
@@ -109,6 +110,9 @@ public class SupplierItemServiceImpl implements SupplierItemService {
     @Autowired
     FollowFansRecordDao followFansRecordDao;
 
+    @Autowired
+    FollowFansRecordService followFansRecordService;
+
 
 
     @Override
@@ -659,22 +663,15 @@ public class SupplierItemServiceImpl implements SupplierItemService {
                     }
                     return Result.failed("该藏品已删除");
                 }
-                //如果是客态，需要记录浏览记录
+                //如果是客态，则自动关注该用户
                 if (StringUtils.hasLength(dto.getShareRecordId())) {
                     if (collectionShareRecord.getItemUserId().longValue() != dto.getUserId().longValue()) {
-                        boolean isExisted = userRecentBrowseDao.isExistedBySharedUserId(userId, collectionShareRecord.getItemUserId());
-                        if (!isExisted) {
-                            UserRecentBrowse userRecentBrowse = new UserRecentBrowse();
-                            userRecentBrowse.setUserId(userId);
-                            userRecentBrowse.setSharerId(collectionShareRecord.getSharerId());
-                            userRecentBrowse.setCreateTime(new Date());
-                            userRecentBrowse.setUpdateTime(new Date());
-                            userRecentBrowse.setShareRecordId(dto.getShareRecordId());
-                            userRecentBrowse.setType(DistributionEnum.UserBrowseTypeEnum.USER_ITEM.getCode());
-                            userRecentBrowse.setSharedUserId(collectionShareRecord.getItemUserId());
-                            userRecentBrowseDao.insert(userRecentBrowse);
-                            logger.info("用户id:{} 浏览了 用户id为 {} 的藏品", dto.getUserId(), collectionShareRecord.getItemUserId());
-                        }
+                        FollowFansRecordRequestDto followFansRecordRequestDto = new FollowFansRecordRequestDto();
+                        followFansRecordRequestDto.setFollowerId(collectionShareRecord.getItemUserId());
+                        followFansRecordRequestDto.setFansId(dto.getUserId());
+                        followFansRecordRequestDto.setIntroducerId(collectionShareRecord.getSharerId());
+                        followFansRecordService.follow(followFansRecordRequestDto);
+                        logger.info("用户id:{} 关注了 用户id为 {}， 介绍人为", dto.getUserId(), collectionShareRecord.getItemUserId(), collectionShareRecord.getSharerId());
                     }
                 }
             } else {