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-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionBrowseRecordServiceImpl.java | 72 ++++++++++++++++++++++--------------
1 files changed, 44 insertions(+), 28 deletions(-)
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionBrowseRecordServiceImpl.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionBrowseRecordServiceImpl.java
index de68b57..e9f0336 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionBrowseRecordServiceImpl.java
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionBrowseRecordServiceImpl.java
@@ -73,8 +73,7 @@
Set<Long> goodsSkuIdList = new HashSet<>();
List<AuctionBrowseRecord> list = this.list(wrapper3);
for (AuctionBrowseRecord auctionBrowseRecord:list){
- AuctionGoods auctionGoods = auctionGoodsMapper.selectById(auctionBrowseRecord.getTargetId());
- goodsSkuIdList.add(auctionGoods.getGoodsSkuId());
+ goodsSkuIdList.add(auctionBrowseRecord.getTargetId());
}
Set<Long> goodsSkuIdList1 = null;
if (StringUtils.isNotEmpty(auctionGoodsListDTO.getGoodsSkuName())) {
@@ -84,11 +83,31 @@
goodsSkuIdList1 = goodsSku.stream().map(GoodsSku::getId)
.collect(Collectors.toSet());
}
- Set<Long> goodsSkuIdList2 =null;
+
+ Set<Long> goodsSkuIdList3 =new HashSet<>();
if (StringUtils.isNotEmpty(goodsSkuIdList1)){
- goodsSkuIdList.retainAll(goodsSkuIdList1);
- goodsSkuIdList2=goodsSkuIdList;
- }else {
+ for (Long i:goodsSkuIdList1){
+ LambdaQueryWrapper<AuctionGoods> wrapper= Wrappers.lambdaQuery();
+ wrapper.eq(AuctionGoods::getGoodsSkuId,i);
+ wrapper.eq(AuctionGoods::getDelFlag,0);
+ List<AuctionGoods> auctionGoods = auctionGoodsMapper.selectList(wrapper);
+ for (AuctionGoods a:auctionGoods){
+ goodsSkuIdList3.add(a.getId());
+ }
+
+ }
+
+ }
+ Set<Long> goodsSkuIdList2 =new HashSet<>();
+ if (StringUtils.isNotEmpty(auctionGoodsListDTO.getGoodsSkuName())) {
+ if (goodsSkuIdList3.size() > 0) {
+ goodsSkuIdList2 = goodsSkuIdList.stream()
+ .filter(goodsSkuIdList3::contains)
+ .collect(Collectors.toSet());
+ } else {
+ goodsSkuIdList2.add(0L);;
+ }
+ }else{
goodsSkuIdList2=goodsSkuIdList;
}
@@ -97,14 +116,13 @@
page.setSize(auctionGoodsListDTO.getPageSize());
page.setCurrent(auctionGoodsListDTO.getPageCurr());
AuctionGoodsListPageDTO auctionGoodsListPageDTO=new AuctionGoodsListPageDTO();
- if (StringUtils.isNotEmpty(goodsSkuIdList2)){
+ if (goodsSkuIdList2.size()>0){
auctionGoodsListPageDTO.setGoodsSkuIdList(goodsSkuIdList2);
}else{
- goodsSkuIdList2=new HashSet<>();
goodsSkuIdList2.add(0L);
auctionGoodsListPageDTO.setGoodsSkuIdList(goodsSkuIdList2);
}
- List<AuctionGoods> auctionGoodsPgeList = auctionGoodsMapper.getAuctionGoodsPgeList(page, auctionGoodsListPageDTO);
+ List<AuctionGoods> auctionGoodsPgeList = auctionGoodsMapper.getAuctionGoodsPgeList1(page, auctionGoodsListPageDTO);
List<AuctionGoodsListVO> auctionGoodsVOS=new ArrayList<>();
for (AuctionGoods auctionGoods:auctionGoodsPgeList){
AuctionGoodsListVO auctionGoodsVO=new AuctionGoodsListVO();
@@ -136,7 +154,6 @@
LambdaQueryWrapper<AuctionBrowseRecord> wrapper3= Wrappers.lambdaQuery();
wrapper3.eq(AuctionBrowseRecord::getDelFlag,0);
- wrapper3.eq(AuctionBrowseRecord::getTargetId,MemberAuctionSalesroomDTO.getAuctionSalesroomId());
wrapper3.eq(AuctionBrowseRecord::getMemberId,MemberAuctionSalesroomDTO.getMemberId());
wrapper3.eq(AuctionBrowseRecord::getBrowseType,2);
wrapper3.ge(AuctionBrowseRecord::getCreateTime, newTime7)
@@ -146,11 +163,11 @@
Set<Long> goodsSkuIdList = null;
goodsSkuIdList = list.stream().map(AuctionBrowseRecord::getTargetId)
.collect(Collectors.toSet());
- Page<WdMemberAuctionSalesroomVO> page = new Page<>();
+ Page<AuctionSalesroom> page = new Page<>();
page.setSize(MemberAuctionSalesroomDTO.getPageSize());
page.setCurrent(MemberAuctionSalesroomDTO.getPageCurr());
MemberAuctionSalesroomWdDTO memberAuctionSalesroomWdDTO=new MemberAuctionSalesroomWdDTO();
- if (goodsSkuIdList!=null){
+ if (goodsSkuIdList.size()>0){
memberAuctionSalesroomWdDTO.setGoodsSkuIdList(goodsSkuIdList);
}else{
goodsSkuIdList=new HashSet<>();
@@ -159,32 +176,31 @@
}
memberAuctionSalesroomWdDTO.setSalesroomName(MemberAuctionSalesroomDTO.getSalesroomName());
- List<AuctionSalesroom> auctionSalesroomList=auctionSalesroomMapper.pageMemberAuctionSalesroomWdList(page,memberAuctionSalesroomWdDTO);
- List<WdMemberAuctionSalesroomVO> List=new ArrayList<>();
- for (AuctionSalesroom auctionSalesroom:auctionSalesroomList){
- WdMemberAuctionSalesroomVO memberAuctionSalesroomVO=new WdMemberAuctionSalesroomVO();
- memberAuctionSalesroomVO.setSalesroomName(auctionSalesroom.getSalesroomName());
- memberAuctionSalesroomVO.setDescription(auctionSalesroom.getDescription());
- memberAuctionSalesroomVO.setStatus(auctionSalesroom.getStatus().getCode());
- memberAuctionSalesroomVO.setSalesroomId(auctionSalesroom.getId());
- memberAuctionSalesroomVO.setCoverPic(auctionSalesroom.getCoverPic());
+ Page<AuctionSalesroom> auctionSalesroomList=auctionSalesroomMapper.pageMemberAuctionSalesroomWdList(page,memberAuctionSalesroomWdDTO);
+ PageDTO<WdMemberAuctionSalesroomVO> wdMemberAuctionSalesroomVOPageDTO = PageDTO.of(auctionSalesroomList, WdMemberAuctionSalesroomVO.class);
+ List<WdMemberAuctionSalesroomVO> list1 = wdMemberAuctionSalesroomVOPageDTO.getList();
+ for (WdMemberAuctionSalesroomVO auctionSalesroom:list1){
+ auctionSalesroom.setSalesroomName(auctionSalesroom.getSalesroomName());
+ auctionSalesroom.setDescription(auctionSalesroom.getDescription());
+ auctionSalesroom.setStatus(auctionSalesroom.getStatus());
+ auctionSalesroom.setSalesroomId(auctionSalesroom.getId());
+ auctionSalesroom.setId(auctionSalesroom.getId());
+ auctionSalesroom.setCoverPic(auctionSalesroom.getCoverPic());
MemberAuctionSalesroomDTO memberAuctionSalesroomDTO1=new MemberAuctionSalesroomDTO();
memberAuctionSalesroomDTO1.setAuctionSalesroomId(auctionSalesroom.getId());
memberAuctionSalesroomDTO1.setMemberId(MemberAuctionSalesroomDTO.getMemberId());
List<OrderAuctionBond> data1 = orderClient.getOrderAuctionBondList1(memberAuctionSalesroomDTO1, SecurityConstants.INNER).getData();
if (data1.size()>0){
- memberAuctionSalesroomVO.setIsBond(2);
+ auctionSalesroom.setIsBond(2);
}else{
- memberAuctionSalesroomVO.setIsBond(1);
+ auctionSalesroom.setIsBond(1);
}
MemberAuctionSalesroomDTO memberAuctionSalesroomDTO2=new MemberAuctionSalesroomDTO();
memberAuctionSalesroomDTO2.setAuctionSalesroomId(auctionSalesroom.getId());
List<OrderAuctionBond> data2 = orderClient.getOrderAuctionBondList1(memberAuctionSalesroomDTO2, SecurityConstants.INNER).getData();
- memberAuctionSalesroomVO.setBondNum(data2.size());
- memberAuctionSalesroomVO.setBond(auctionSalesroom.getBond());
- List.add(memberAuctionSalesroomVO);
+ auctionSalesroom.setBondNum(data2.size());
+ auctionSalesroom.setBond(auctionSalesroom.getBond());
}
- page.setRecords(List);
- return PageDTO.of(page);
+ return wdMemberAuctionSalesroomVOPageDTO;
}
}
--
Gitblit v1.7.1