用户端商品

rentaiming

2024-06-11 2f2eb2bb2c6a5a16b7081dbbe3b683acf18d04bc

 ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/ArticleServiceImpl.java

@@ -8,14 +8,14 @@
import com.ruoyi.article.domain.ArticleComments;
import com.ruoyi.article.domain.MemberArticleCollection;
import com.ruoyi.article.domain.MemberLike;
import com.ruoyi.article.dto.ArticleDTO;
import com.ruoyi.article.controller.forepart.dto.ArticleDTO;
import com.ruoyi.article.mapper.ArticleMapper;
import com.ruoyi.article.service.IArticleCommentsService;
import com.ruoyi.article.service.IArticleService;
import com.ruoyi.article.service.IMemberArticleCollectionService;
import com.ruoyi.article.service.IMemberLikeService;
import com.ruoyi.article.vo.ArticleCommentsVO;
import com.ruoyi.article.vo.ArticleVO;
import com.ruoyi.article.controller.forepart.vo.ArticleCommentsVO;
import com.ruoyi.article.controller.forepart.vo.ArticleVO;
import com.ruoyi.common.core.constant.SecurityConstants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.enums.ArticleTypeEnum;
@@ -64,7 +64,9 @@
        if (articleDTO.getArticleType()!=0){
            wrapper.eq(Article::getArticleType,articleDTO.getArticleType());
        }
        wrapper.like(Article::getTitle,articleDTO.getTitle());
        if (articleDTO.getTitle()!=null){
            wrapper.like(Article::getTitle,articleDTO.getTitle());
        }
        wrapper.eq(Article::getStatus,2);
        wrapper.eq( Article::getDelFlag,0);
        wrapper.orderByDesc(Article::getCreateTime);
@@ -78,6 +80,7 @@
                        SecurityConstants.INNER);
                Member data = membeOne.getData();
                articleVO.setMemberNickname(data.getNickname());
                articleVO.setMemberAvatar(data.getAvatar());
            }
            LambdaQueryWrapper<MemberLike> wrapper1 = Wrappers.lambdaQuery();
            wrapper1.eq(MemberLike::getMemberId, articleDTO.getMemberId());
@@ -110,6 +113,7 @@
        Page<Article> page = new Page<>(articleDTO.getPageCurr(), articleDTO.getPageSize());
        LambdaQueryWrapper< Article> wrapper= Wrappers.lambdaQuery();
        wrapper.eq(Article::getMemberId,articleDTO.getMemberId());
        wrapper.eq(Article::getArticleType,2);
        wrapper.eq( Article::getDelFlag,0);
        wrapper.orderByDesc(Article::getCreateTime);
        Page<Article> page1 = this.page(page, wrapper);
@@ -123,22 +127,12 @@
            article=this.getById(articleDTO.getId());
        }
        article.setMemberId(articleDTO.getMemberId());

        article.setArticleType(ArticleTypeEnum.USER_POSTING);
        article.setStatus(AuditStatusEnum.TO_BE_REVIEWED);
        article.setContent(articleDTO.getContent());
        article.setTitle(articleDTO.getTitle());
        List<String> urlList=new ArrayList<>();
        if (articleDTO.getRticleImageUrl().length>0){
            for (MultipartFile file:articleDTO.getRticleImageUrl()){
                try {
                    String url= HuaWeiOBSUtil.obsUpload(file);
                    urlList.add(url);
                } catch (IOException e) {
                    throw new RuntimeException(e);
                }
            }
            article.setImages(urlList.toString());
        }
        article.setImages(articleDTO.getRticleImageUrl());
        this.saveOrUpdate(article);

    }
@@ -152,8 +146,15 @@
    public ArticleVO getMemberArticleInfo(ArticleDTO articleDTO) {
        Article article=this.getById(articleDTO.getId());
        ArticleVO articleVO=new ArticleVO();

        BeanUtils.copyProperties(article, articleVO);

        R<Member> membeOne = memberClient.getMembeOne(articleVO.getMemberId(),
                SecurityConstants.INNER);
        Member data = membeOne.getData();
        articleVO.setMemberNickname(data.getNickname());
        articleVO.setMemberAvatar(data.getAvatar());

        LambdaQueryWrapper<MemberLike> wrapper1= Wrappers.lambdaQuery();
        wrapper1.eq(MemberLike::getMemberId,articleDTO.getMemberId());
        wrapper1.eq(MemberLike::getArticleId,article.getId());