藏品详情

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

@@ -981,50 +981,52 @@ public class SupplierItemServiceImpl implements SupplierItemService {
             } else {
                 supplierItemVo.setPostType(DistributionEnum.PostTypeEnum.COMMON.getCode());
             }
-
-            if (supplierItem.getCreatorId().longValue() != targetUserId) {
-                supplierItemVo.setIsMine(false);
-                targetUserId = supplierItem.getCreatorId();
-                boolean isCollected = itemCollectedRecordDao.isExisted(itemId, dto.getUserId());
-                if (isCollected) {
-                    supplierItemVo.setIsCollected(true);
-                } else {
-                    supplierItemVo.setIsCollected(false);
-                }
-                if (supplierItem.getIsDeleted()) {
-                    //判断是否有相关收藏记录，有则删除
+            //排除盲盒商品是没有creatorId的
+            if (supplierItem.getType() == DistributionEnum.DistributionTypeEnum.COLLECT.getCode()) {
+                if (supplierItem.getCreatorId().longValue() != targetUserId) {
+                    supplierItemVo.setIsMine(false);
+                    targetUserId = supplierItem.getCreatorId();
+                    boolean isCollected = itemCollectedRecordDao.isExisted(itemId, dto.getUserId());
                     if (isCollected) {
-                        itemCollectedRecordDao.cancel(itemId, dto.getUserId());
+                        supplierItemVo.setIsCollected(true);
+                    } else {
+                        supplierItemVo.setIsCollected(false);
+                    }
+                    if (supplierItem.getIsDeleted()) {
+                        //判断是否有相关收藏记录，有则删除
+                        if (isCollected) {
+                            itemCollectedRecordDao.cancel(itemId, dto.getUserId());
+                        }
+                        return Result.failed("该藏品已删除");
+                    }
+                    //返回用户二维码
+                    User user = cacheUtil.appletUserInfoCache.get(supplierItem.getCreatorId()).get();
+                    if (user != null) {
+                        supplierItemVo.setWechatQrCode(user.getWechatQrCode());
+                    }
+                    //判断是否是藏家
+                    boolean collectorWhiteListFlag = collectorWhiteListDao.isExisted(supplierItem.getCreatorId());
+                    if (collectorWhiteListFlag) {
+                        supplierItemVo.setIsCollector(true);
+                    } else {
+                        supplierItemVo.setIsCollector(false);
                     }
-                    return Result.failed("该藏品已删除");
-                }
-                //返回用户二维码
-                User user = cacheUtil.appletUserInfoCache.get(supplierItem.getCreatorId()).get();
-                if (user != null) {
-                    supplierItemVo.setWechatQrCode(user.getWechatQrCode());
-                }
-                //判断是否是藏家
-                boolean collectorWhiteListFlag = collectorWhiteListDao.isExisted(supplierItem.getCreatorId());
-                if (collectorWhiteListFlag) {
-                    supplierItemVo.setIsCollector(true);
                 } else {
-                    supplierItemVo.setIsCollector(false);
-                }
-            } else {
-                supplierItemVo.setIsMine(true);
-                //查询收藏该商品的最新的五个用户
-                ItemCollectedRecordRequestDto itemCollectedRecordRequestDto = new ItemCollectedRecordRequestDto();
-                itemCollectedRecordRequestDto.setItemId(itemId);
-                itemCollectedRecordRequestDto.setPage(1);
-                itemCollectedRecordRequestDto.setLimit(5);
-                List<ItemCollectedRecord> itemCollectedRecords = itemCollectedRecordDao.find(itemCollectedRecordRequestDto);
-                List<Long> collectorIds = itemCollectedRecords.stream().map(ItemCollectedRecord::getCollectorsId).collect(Collectors.toList());
-                List<String> avatarList = new ArrayList<>();
-                for (Long collectorId : collectorIds) {
-                    String avatar = cacheUtil.getAppletUserById(collectorId).getAvatar();
-                    avatarList.add(StringUtils.isEmpty(avatar) ? CommConsts.DEFAULT_AVATAR_URL : avatar);
+                    supplierItemVo.setIsMine(true);
+                    //查询收藏该商品的最新的五个用户
+                    ItemCollectedRecordRequestDto itemCollectedRecordRequestDto = new ItemCollectedRecordRequestDto();
+                    itemCollectedRecordRequestDto.setItemId(itemId);
+                    itemCollectedRecordRequestDto.setPage(1);
+                    itemCollectedRecordRequestDto.setLimit(5);
+                    List<ItemCollectedRecord> itemCollectedRecords = itemCollectedRecordDao.find(itemCollectedRecordRequestDto);
+                    List<Long> collectorIds = itemCollectedRecords.stream().map(ItemCollectedRecord::getCollectorsId).collect(Collectors.toList());
+                    List<String> avatarList = new ArrayList<>();
+                    for (Long collectorId : collectorIds) {
+                        String avatar = cacheUtil.getAppletUserById(collectorId).getAvatar();
+                        avatarList.add(StringUtils.isEmpty(avatar) ? CommConsts.DEFAULT_AVATAR_URL : avatar);
+                    }
+                    supplierItemVo.setCollectorsAvatar(avatarList);
                 }
-                supplierItemVo.setCollectorsAvatar(avatarList);
             }
             EntityMapper.copyAttribute(supplierItem, supplierItemVo);
             supplierItemVo.setItemId(supplierItem.getId());