From fc8b51f40e71aa09bb49f407c1e9f68ac94ceb58 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 29 七月 2024 18:51:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/MemberArticleCollectionServiceImpl.java | 50 +++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 43 insertions(+), 7 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 b1d02d9..5f7d84a 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
@@ -15,10 +15,18 @@
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.HashSet;
import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
import javax.annotation.Resource;
import org.springframework.stereotype.Service;
@@ -41,10 +49,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 +89,29 @@
@Override
public PageDTO<MemberArticleCollectionVO> getMemberArticleCollection(ArticleDTO articleDTO) {
+ Set<Long> goodsSkuIdList = null;
+ if (StringUtils.isNotEmpty(articleDTO.getGoodsSkuName())) {
+ LambdaQueryWrapper<Article> wrapper= Wrappers.lambdaQuery();
+ wrapper.like(Article::getTitle,articleDTO.getGoodsSkuName());
+ 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.getGoodsSkuName())){
+ if (goodsSkuIdList.size()>0){
+ wrapper.in(MemberArticleCollection::getTargetId,goodsSkuIdList);
+ }else{
+ Set<Long> goodsSkuIdList1 = new HashSet<>();
+ goodsSkuIdList1.add(0L);
+ wrapper.in(MemberArticleCollection::getTargetId,goodsSkuIdList1);
+ }
+ }
+ wrapper.eq(MemberArticleCollection::getDelFlag,0);
+ wrapper.orderByDesc(MemberArticleCollection::getCreateTime);
Page<MemberArticleCollection> page1 = this.page(page, wrapper);
PageDTO<MemberArticleCollectionVO> articleCommentsVOPageDTO = PageDTO.of(page1, MemberArticleCollectionVO.class);
List<MemberArticleCollectionVO> list2 = articleCommentsVOPageDTO.getList();
@@ -92,12 +120,20 @@
memberArticleCollectionVO.setContent(byId.getContent());
memberArticleCollectionVO.setImages(byId.getImages());
memberArticleCollectionVO.setTitle(byId.getTitle());
-
- R<Member> membeOne = memberClient.getMembeOne(memberArticleCollectionVO.getMemberId(),
+ memberArticleCollectionVO.setCreateTime(byId.getCreateTime());
+ memberArticleCollectionVO.setId(byId.getId());
+ R<Member> membeOne = memberClient.getMembeOne(byId.getMemberId(),
SecurityConstants.INNER);
Member data = membeOne.getData();
- memberArticleCollectionVO.setMemberNickname(data.getNickname());
- memberArticleCollectionVO.setIsCollect(1);
+ if (data!=null){
+ memberArticleCollectionVO.setMemberNickname(data.getNickname());
+ memberArticleCollectionVO.setMemberAvatar(data.getAvatar());
+ }else{
+ memberArticleCollectionVO.setMemberNickname("平台发布");
+ memberArticleCollectionVO.setMemberAvatar("https://jyzx-obs.obs.cn-sccd1.ctyun.cn/d41508d822cb4b7896aaa1bb56e6167f.png");
+ }
+
+ memberArticleCollectionVO.setIsCollect(2);
}
return articleCommentsVOPageDTO;
--
Gitblit v1.7.1