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-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsBrowseRecordServiceImpl.java | 34 ++++++++++++++++++----------------
1 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsBrowseRecordServiceImpl.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsBrowseRecordServiceImpl.java
index 340e4af..622ae86 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsBrowseRecordServiceImpl.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsBrowseRecordServiceImpl.java
@@ -3,26 +3,24 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.constant.SecurityConstants;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.goods.domain.GoodsBrowseRecord;
-import com.ruoyi.goods.domain.MemberGoodsCollection;
import com.ruoyi.goods.mapper.GoodsBrowseRecordMapper;
import com.ruoyi.goods.mapper.GoodsSkuMapper;
import com.ruoyi.goods.service.IGoodsBrowseRecordService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.system.api.domain.GoodsSku;
import com.ruoyi.system.api.domain.dto.AuctionCollectionDTO;
import com.ruoyi.system.api.domain.vo.HomeGoodsSkuListVO;
import com.ruoyi.system.api.feignClient.GoodsSkuClient;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.ArrayList;
+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;
/**
* <p>
@@ -51,28 +49,32 @@
.collect(Collectors.toSet());
}
- Page<HomeGoodsSkuListVO> page = new Page<>();
+ Page<GoodsBrowseRecord> page = new Page<>();
page.setSize(auctionCollectionDTO.getPageSize());
page.setCurrent(auctionCollectionDTO.getPageCurr());
LambdaQueryWrapper<GoodsBrowseRecord> wrapper= Wrappers.lambdaQuery();
wrapper.eq(GoodsBrowseRecord::getMemberId,auctionCollectionDTO.getMemberId());
+ if (StringUtils.isNotEmpty(auctionCollectionDTO.getGoodsSkuName())) {
if (StringUtils.isNotEmpty(goodsSkuIdList1)){
wrapper.in(GoodsBrowseRecord::getGoodsSkuId,goodsSkuIdList1);
+ }else {
+ goodsSkuIdList1=new HashSet<>();
+ goodsSkuIdList1.add(0L);
+ wrapper.in(GoodsBrowseRecord::getGoodsSkuId,goodsSkuIdList1);
+ }
}
- List<GoodsBrowseRecord> list = this.list(wrapper);
-
- List<HomeGoodsSkuListVO> auctionGoodsVOS=new ArrayList<>();
- for (GoodsBrowseRecord auctionCollection:list){
- HomeGoodsSkuListVO auctionGoodsVO=new HomeGoodsSkuListVO();
- GoodsSku goodsSku = goodsSkuMapper.selectById(auctionCollection.getGoodsSkuId());
+ wrapper.orderByDesc(GoodsBrowseRecord::getCreateTime);
+ Page<GoodsBrowseRecord> page1 = this.page(page, wrapper);
+ PageDTO<HomeGoodsSkuListVO> wdMemberAuctionSalesroomVOPageDTO = PageDTO.of(page1, HomeGoodsSkuListVO.class);
+ List<HomeGoodsSkuListVO> list = wdMemberAuctionSalesroomVOPageDTO.getList();
+ for (HomeGoodsSkuListVO auctionGoodsVO:list){
+ GoodsSku goodsSku = goodsSkuMapper.selectById(auctionGoodsVO.getGoodsSkuId());
auctionGoodsVO.setId(goodsSku.getId());
auctionGoodsVO.setPrice(goodsSku.getPrice());
auctionGoodsVO.setCoverPic(goodsSku.getCoverPic());
auctionGoodsVO.setSkuName(goodsSku.getSkuName());
auctionGoodsVO.setSoldQuantity(goodsSku.getSoldQuantity());
- auctionGoodsVOS.add(auctionGoodsVO);
}
- page.setRecords(auctionGoodsVOS);
- return PageDTO.of(page);
+ return wdMemberAuctionSalesroomVOPageDTO;
}
}
--
Gitblit v1.7.1