From 2f2eb2bb2c6a5a16b7081dbbe3b683acf18d04bc Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期二, 11 六月 2024 18:18:05 +0800
Subject: [PATCH] 用户端商品
---
ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/MemberArticleCollectionServiceImpl.java | 37 +++++++++++++++++++++++++++++--------
1 files changed, 29 insertions(+), 8 deletions(-)
diff --git a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/MemberArticleCollectionServiceImpl.java b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/MemberArticleCollectionServiceImpl.java
index 377b3ed..102a5e4 100644
--- a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/MemberArticleCollectionServiceImpl.java
+++ b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/MemberArticleCollectionServiceImpl.java
@@ -6,20 +6,25 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.article.domain.Article;
import com.ruoyi.article.domain.MemberArticleCollection;
-import com.ruoyi.article.dto.ArticleDTO;
-import com.ruoyi.article.dto.MemberArticleCollectionDTO;
+import com.ruoyi.article.controller.forepart.dto.ArticleDTO;
+import com.ruoyi.article.controller.forepart.dto.MemberArticleCollectionDTO;
import com.ruoyi.article.mapper.ArticleMapper;
import com.ruoyi.article.mapper.MemberArticleCollectionMapper;
-import com.ruoyi.article.service.IArticleService;
import com.ruoyi.article.service.IMemberArticleCollectionService;
-import com.ruoyi.article.vo.MemberArticleCollectionVO;
+import com.ruoyi.article.controller.forepart.vo.MemberArticleCollectionVO;
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;
@@ -42,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("类型不能为空");
}
@@ -82,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();
@@ -98,7 +118,8 @@
SecurityConstants.INNER);
Member data = membeOne.getData();
memberArticleCollectionVO.setMemberNickname(data.getNickname());
- memberArticleCollectionVO.setIsCollect(1);
+ memberArticleCollectionVO.setMemberAvatar(data.getAvatar());
+ memberArticleCollectionVO.setIsCollect(2);
}
return articleCommentsVOPageDTO;
--
Gitblit v1.7.1