rentaiming
2024-06-07 730c70af018d50a6ca5a13be2d8fa25c6c42c357
ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/MemberArticleCollectionServiceImpl.java
@@ -15,10 +15,16 @@
import com.ruoyi.common.core.constant.SecurityConstants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.system.api.domain.GoodsGroupPurchase;
import com.ruoyi.system.api.domain.GoodsSku;
import com.ruoyi.system.api.domain.Member;
import com.ruoyi.system.api.domain.dto.AuctionGoodsListPageDTO;
import com.ruoyi.system.api.feignClient.MemberClient;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
import javax.annotation.Resource;
import org.springframework.stereotype.Service;
@@ -41,10 +47,10 @@
    @Override
    public void saveMemberArticleCollection(MemberArticleCollectionDTO memberArticleCollectionDTO) {
        if (memberArticleCollectionDTO.getMemberId()!=null) {
        if (memberArticleCollectionDTO.getMemberId()==null) {
            throw new ServiceException("用户ID不能为空");
        }
        if (memberArticleCollectionDTO.getState()!=null) {
        if (memberArticleCollectionDTO.getState()==null) {
            throw new ServiceException("类型不能为空");
        }
@@ -81,9 +87,24 @@
    @Override
    public PageDTO<MemberArticleCollectionVO> getMemberArticleCollection(ArticleDTO articleDTO) {
        Set<Long> goodsSkuIdList = null;
        if (StringUtils.isNotEmpty(articleDTO.getTitle())) {
            LambdaQueryWrapper<Article> wrapper= Wrappers.lambdaQuery();
            wrapper.like(Article::getTitle,articleDTO.getTitle());
            wrapper.eq(Article::getDelFlag,0);
            List<Article> page1 = articleMapper.selectList(wrapper);
            goodsSkuIdList = page1.stream().map(Article::getId)
                    .collect(Collectors.toSet());
        }
        Page<MemberArticleCollection> page = new Page<>(articleDTO.getPageCurr(), articleDTO.getPageSize());
        LambdaQueryWrapper< MemberArticleCollection> wrapper= Wrappers.lambdaQuery();
        LambdaQueryWrapper<MemberArticleCollection> wrapper= Wrappers.lambdaQuery();
        wrapper.eq(MemberArticleCollection::getMemberId,articleDTO.getMemberId());
        if (StringUtils.isNotEmpty(articleDTO.getTitle())){
            if (goodsSkuIdList.size()>0){
                wrapper.in(MemberArticleCollection::getTargetId,goodsSkuIdList);
            }
        }
        wrapper.eq(MemberArticleCollection::getDelFlag,0);
        Page<MemberArticleCollection> page1 = this.page(page, wrapper);
        PageDTO<MemberArticleCollectionVO> articleCommentsVOPageDTO = PageDTO.of(page1, MemberArticleCollectionVO.class);
        List<MemberArticleCollectionVO> list2 = articleCommentsVOPageDTO.getList();
@@ -97,6 +118,7 @@
                    SecurityConstants.INNER);
            Member data = membeOne.getData();
            memberArticleCollectionVO.setMemberNickname(data.getNickname());
            memberArticleCollectionVO.setMemberAvatar(data.getAvatar());
            memberArticleCollectionVO.setIsCollect(1);
        }