From 31267d9b3a33c8b3fbb1b9f810ab08e01c49b846 Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期二, 16 七月 2024 19:12:28 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionBrowseRecordServiceImpl.java | 47 ++++++++++++++++++++++++++++++++++++-----------
1 files changed, 36 insertions(+), 11 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 e731039..fcc0daf 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
@@ -27,6 +27,7 @@
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
+import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
@@ -65,16 +66,15 @@
LocalDateTime newTime7 = now.minusDays(7);
LambdaQueryWrapper<AuctionBrowseRecord> wrapper3= Wrappers.lambdaQuery();
wrapper3.eq(AuctionBrowseRecord::getDelFlag,0);
- wrapper3.eq(AuctionBrowseRecord::getTargetId,auctionGoodsListDTO.getGoodsSkuId());
+ wrapper3.eq(AuctionBrowseRecord::getBrowseType,1);
wrapper3.eq(AuctionBrowseRecord::getMemberId,auctionGoodsListDTO.getMemberId());
wrapper3.ge(AuctionBrowseRecord::getCreateTime, newTime7)
.le(AuctionBrowseRecord::getCreateTime, now);
-
+ Set<Long> goodsSkuIdList = new HashSet<>();
List<AuctionBrowseRecord> list = this.list(wrapper3);
- Set<Long> goodsSkuIdList = null;
- goodsSkuIdList = list.stream().map(AuctionBrowseRecord::getTargetId)
- .collect(Collectors.toSet());
-
+ for (AuctionBrowseRecord auctionBrowseRecord:list){
+ goodsSkuIdList.add(auctionBrowseRecord.getTargetId());
+ }
Set<Long> goodsSkuIdList1 = null;
if (StringUtils.isNotEmpty(auctionGoodsListDTO.getGoodsSkuName())) {
List<GoodsSku> goodsSku = goodsSkuClient.getGoodsByName(auctionGoodsListDTO.getGoodsSkuName(),
@@ -84,17 +84,27 @@
.collect(Collectors.toSet());
}
Set<Long> goodsSkuIdList2 =null;
- if (goodsSkuIdList1.size()==0){
+ if (StringUtils.isNotEmpty(goodsSkuIdList1)){
goodsSkuIdList.retainAll(goodsSkuIdList1);
goodsSkuIdList2=goodsSkuIdList;
}else {
goodsSkuIdList2=goodsSkuIdList;
}
+
+
Page<AuctionGoodsListVO> page = new Page<>();
page.setSize(auctionGoodsListDTO.getPageSize());
page.setCurrent(auctionGoodsListDTO.getPageCurr());
AuctionGoodsListPageDTO auctionGoodsListPageDTO=new AuctionGoodsListPageDTO();
- auctionGoodsListPageDTO.setGoodsSkuIdList(goodsSkuIdList2);
+ if (StringUtils.isNotEmpty(auctionGoodsListDTO.getGoodsSkuName())) {
+ if (StringUtils.isNotEmpty(goodsSkuIdList2)){
+ auctionGoodsListPageDTO.setGoodsSkuIdList(goodsSkuIdList2);
+ }else{
+ goodsSkuIdList2=new HashSet<>();
+ goodsSkuIdList2.add(0L);
+ auctionGoodsListPageDTO.setGoodsSkuIdList(goodsSkuIdList2);
+ }
+ }
List<AuctionGoods> auctionGoodsPgeList = auctionGoodsMapper.getAuctionGoodsPgeList(page, auctionGoodsListPageDTO);
List<AuctionGoodsListVO> auctionGoodsVOS=new ArrayList<>();
for (AuctionGoods auctionGoods:auctionGoodsPgeList){
@@ -127,8 +137,8 @@
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)
.le(AuctionBrowseRecord::getCreateTime, now);
@@ -140,7 +150,13 @@
page.setSize(MemberAuctionSalesroomDTO.getPageSize());
page.setCurrent(MemberAuctionSalesroomDTO.getPageCurr());
MemberAuctionSalesroomWdDTO memberAuctionSalesroomWdDTO=new MemberAuctionSalesroomWdDTO();
- memberAuctionSalesroomWdDTO.setGoodsSkuIdList(goodsSkuIdList);
+ if (goodsSkuIdList.size()>0){
+ memberAuctionSalesroomWdDTO.setGoodsSkuIdList(goodsSkuIdList);
+ }else{
+ goodsSkuIdList=new HashSet<>();
+ goodsSkuIdList.add(0L);
+ memberAuctionSalesroomWdDTO.setGoodsSkuIdList(goodsSkuIdList);
+ }
memberAuctionSalesroomWdDTO.setSalesroomName(MemberAuctionSalesroomDTO.getSalesroomName());
List<AuctionSalesroom> auctionSalesroomList=auctionSalesroomMapper.pageMemberAuctionSalesroomWdList(page,memberAuctionSalesroomWdDTO);
@@ -156,7 +172,16 @@
memberAuctionSalesroomDTO1.setAuctionSalesroomId(auctionSalesroom.getId());
memberAuctionSalesroomDTO1.setMemberId(MemberAuctionSalesroomDTO.getMemberId());
List<OrderAuctionBond> data1 = orderClient.getOrderAuctionBondList1(memberAuctionSalesroomDTO1, SecurityConstants.INNER).getData();
- memberAuctionSalesroomVO.setBondTime(data1.get(0).getCreateTime());
+ if (data1.size()>0){
+ memberAuctionSalesroomVO.setIsBond(2);
+ }else{
+ memberAuctionSalesroomVO.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);
}
page.setRecords(List);
--
Gitblit v1.7.1