From 392b42c4891cf2e6beda57ab32c51598f290f4b7 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 14 三月 2025 20:56:27 +0800
Subject: [PATCH] bug修改
---
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionBrowseRecordServiceImpl.java | 177 +++++++++++++++++++++++++++++++++--------------------------
1 files changed, 99 insertions(+), 78 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 fcc0daf..3fb92f0 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
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.auction.domain.AuctionBrowseRecord;
+import com.ruoyi.auction.mapper.AuctionBondJlMapper;
import com.ruoyi.auction.mapper.AuctionBrowseRecordMapper;
import com.ruoyi.auction.mapper.AuctionGoodsMapper;
import com.ruoyi.auction.mapper.AuctionSalesroomMapper;
@@ -12,25 +13,19 @@
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.system.api.domain.AuctionBondJl;
import com.ruoyi.system.api.domain.AuctionGoods;
import com.ruoyi.system.api.domain.AuctionSalesroom;
import com.ruoyi.system.api.domain.GoodsSku;
-import com.ruoyi.system.api.domain.OrderAuctionBond;
import com.ruoyi.system.api.domain.dto.AuctionGoodsListDTO;
-import com.ruoyi.system.api.domain.dto.AuctionGoodsListPageDTO;
import com.ruoyi.system.api.domain.dto.MemberAuctionSalesroomDTO;
-import com.ruoyi.system.api.domain.dto.MemberAuctionSalesroomWdDTO;
import com.ruoyi.system.api.domain.vo.AuctionGoodsListVO;
import com.ruoyi.system.api.domain.vo.WdMemberAuctionSalesroomVO;
import com.ruoyi.system.api.feignClient.GoodsSkuClient;
import com.ruoyi.system.api.feignClient.OrderClient;
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;
import javax.annotation.Resource;
import org.springframework.stereotype.Service;
@@ -59,9 +54,17 @@
@Resource
private AuctionGoodsMapper auctionGoodsMapper;
+ @Resource
+ private AuctionBondJlMapper auctionBondJlMapper;
+
@Override
public PageDTO<AuctionGoodsListVO> getWdAuctionBrowseRecordList(AuctionGoodsListDTO auctionGoodsListDTO) {
+
+ Page<AuctionBrowseRecord> page = new Page<>();
+ page.setSize(auctionGoodsListDTO.getPageSize());
+ page.setCurrent(auctionGoodsListDTO.getPageCurr());
+
LocalDateTime now = LocalDateTime.now();
LocalDateTime newTime7 = now.minusDays(7);
LambdaQueryWrapper<AuctionBrowseRecord> wrapper3= Wrappers.lambdaQuery();
@@ -70,45 +73,38 @@
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);
- for (AuctionBrowseRecord auctionBrowseRecord:list){
- goodsSkuIdList.add(auctionBrowseRecord.getTargetId());
- }
- Set<Long> goodsSkuIdList1 = null;
if (StringUtils.isNotEmpty(auctionGoodsListDTO.getGoodsSkuName())) {
- List<GoodsSku> goodsSku = goodsSkuClient.getGoodsByName(auctionGoodsListDTO.getGoodsSkuName(),
- SecurityConstants.INNER)
- .getData();
- goodsSkuIdList1 = goodsSku.stream().map(GoodsSku::getId)
+ wrapper3.like(AuctionBrowseRecord::getSkuName,auctionGoodsListDTO.getGoodsSkuName());
+ }
+
+ /* Set<Long> goodsSkuIdList = null;
+ if (auctionGoodsListDTO.getStartStatus()!=null&&auctionGoodsListDTO.getStartStatus()!=4){
+ LambdaQueryWrapper<AuctionGoods> wrapper=Wrappers.lambdaQuery();
+ wrapper.eq(AuctionGoods::getStartStatus,auctionGoodsListDTO.getStartStatus());
+ wrapper.eq(AuctionGoods::getDelFlag,0);
+ List<AuctionGoods> auctionSalesrooms = auctionGoodsMapper.selectList(wrapper);
+ goodsSkuIdList = auctionSalesrooms.stream().map(AuctionGoods::getId)
.collect(Collectors.toSet());
}
- Set<Long> goodsSkuIdList2 =null;
- 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();
- 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);
+ if (auctionGoodsListDTO.getStartStatus()!=4) {
+ if (goodsSkuIdList != null) {
+ wrapper3.in(AuctionBrowseRecord::getTargetId,goodsSkuIdList);
+ } else {
+ goodsSkuIdList = new HashSet<>();
+ goodsSkuIdList.add(0L);
+ wrapper3.in(AuctionBrowseRecord::getTargetId,goodsSkuIdList);
+ }
+ }*/
+
+ wrapper3.orderByDesc(AuctionBrowseRecord::getCreateTime);
+ Page<AuctionBrowseRecord> page1 = this.page(page, wrapper3);
+ PageDTO<AuctionGoodsListVO> articleCommentsVOPageDTO = PageDTO.of(page1, AuctionGoodsListVO.class);
+ List<AuctionGoodsListVO> auctionGoodsPgeList = articleCommentsVOPageDTO.getList();
List<AuctionGoodsListVO> auctionGoodsVOS=new ArrayList<>();
- for (AuctionGoods auctionGoods:auctionGoodsPgeList){
- AuctionGoodsListVO auctionGoodsVO=new AuctionGoodsListVO();
+ for (AuctionGoodsListVO auctionGoodsVO:auctionGoodsPgeList){
+ AuctionGoods auctionGoods =auctionGoodsMapper.selectById(auctionGoodsVO.getTargetId());
auctionGoodsVO.setAuctionStock(auctionGoods.getAuctionStock());
auctionGoodsVO.setGoodsSkuId(auctionGoods.getId());
auctionGoodsVO.setEndTime(auctionGoods.getEndTime());
@@ -126,15 +122,29 @@
auctionGoodsVO.setDetail(goodsSkuOne.getDetail());
auctionGoodsVOS.add(auctionGoodsVO);
}
- page.setRecords(auctionGoodsVOS);
- return PageDTO.of(page);
+ return articleCommentsVOPageDTO;
}
@Override
public PageDTO<WdMemberAuctionSalesroomVO> getWdAuctionSalesroomBrowseRecordList(MemberAuctionSalesroomDTO MemberAuctionSalesroomDTO) {
+
+ /* Set<Long> goodsSkuIdList = null;
+ if (MemberAuctionSalesroomDTO.getStatus()!=4){
+ LambdaQueryWrapper<AuctionSalesroom> wrapper=Wrappers.lambdaQuery();
+ wrapper.eq(AuctionSalesroom::getStatus,MemberAuctionSalesroomDTO.getStatus());
+ wrapper.eq(AuctionSalesroom::getDelFlag,0);
+ List<AuctionSalesroom> auctionSalesrooms = auctionSalesroomMapper.selectList(wrapper);
+ goodsSkuIdList = auctionSalesrooms.stream().map(AuctionSalesroom::getId)
+ .collect(Collectors.toSet());
+ }*/
+
+
+
LocalDateTime now = LocalDateTime.now();
LocalDateTime newTime7 = now.minusDays(7);
-
+ Page<AuctionBrowseRecord> page = new Page<>();
+ page.setSize(MemberAuctionSalesroomDTO.getPageSize());
+ page.setCurrent(MemberAuctionSalesroomDTO.getPageCurr());
LambdaQueryWrapper<AuctionBrowseRecord> wrapper3= Wrappers.lambdaQuery();
wrapper3.eq(AuctionBrowseRecord::getDelFlag,0);
wrapper3.eq(AuctionBrowseRecord::getMemberId,MemberAuctionSalesroomDTO.getMemberId());
@@ -142,49 +152,60 @@
wrapper3.ge(AuctionBrowseRecord::getCreateTime, newTime7)
.le(AuctionBrowseRecord::getCreateTime, now);
- List<AuctionBrowseRecord> list = this.list(wrapper3);
- Set<Long> goodsSkuIdList = null;
- goodsSkuIdList = list.stream().map(AuctionBrowseRecord::getTargetId)
- .collect(Collectors.toSet());
- Page<WdMemberAuctionSalesroomVO> page = new Page<>();
- page.setSize(MemberAuctionSalesroomDTO.getPageSize());
- page.setCurrent(MemberAuctionSalesroomDTO.getPageCurr());
- MemberAuctionSalesroomWdDTO memberAuctionSalesroomWdDTO=new MemberAuctionSalesroomWdDTO();
- if (goodsSkuIdList.size()>0){
- memberAuctionSalesroomWdDTO.setGoodsSkuIdList(goodsSkuIdList);
- }else{
- goodsSkuIdList=new HashSet<>();
- goodsSkuIdList.add(0L);
- memberAuctionSalesroomWdDTO.setGoodsSkuIdList(goodsSkuIdList);
- }
- memberAuctionSalesroomWdDTO.setSalesroomName(MemberAuctionSalesroomDTO.getSalesroomName());
+ /* if (MemberAuctionSalesroomDTO.getStatus()!=4) {
+ if (goodsSkuIdList != null) {
+ wrapper3.in(AuctionBrowseRecord::getTargetId,goodsSkuIdList);
+ } else {
+ goodsSkuIdList = new HashSet<>();
+ goodsSkuIdList.add(0L);
+ wrapper3.in(AuctionBrowseRecord::getTargetId,goodsSkuIdList);
+ }
+ }*/
- 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());
+
+ wrapper3.orderByDesc(AuctionBrowseRecord::getCreateTime);
+ if (MemberAuctionSalesroomDTO.getSalesroomName()!=null){
+ wrapper3.like(AuctionBrowseRecord::getSkuName,MemberAuctionSalesroomDTO.getSalesroomName());
+ }
+
+ Page<AuctionBrowseRecord> page1 = this.page(page, wrapper3);
+ PageDTO<WdMemberAuctionSalesroomVO> articleCommentsVOPageDTO = PageDTO.of(page1, WdMemberAuctionSalesroomVO.class);
+ List<WdMemberAuctionSalesroomVO> list1 = articleCommentsVOPageDTO.getList();
+
+ for (WdMemberAuctionSalesroomVO auctionSalesroom1:list1){
+ AuctionSalesroom auctionSalesroom = auctionSalesroomMapper.selectById(auctionSalesroom1.getTargetId());
+ auctionSalesroom1.setSalesroomName(auctionSalesroom.getSalesroomName());
+ auctionSalesroom1.setDescription(auctionSalesroom.getDescription());
+ auctionSalesroom1.setStatus(auctionSalesroom.getStatus().getCode());
+ auctionSalesroom1.setSalesroomId(auctionSalesroom.getId());
+ auctionSalesroom1.setId(auctionSalesroom.getId());
+ auctionSalesroom1.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);
+ LambdaQueryWrapper<AuctionBondJl> wrapper=Wrappers.lambdaQuery();
+ wrapper.eq(AuctionBondJl::getAuctionSalesroomId,auctionSalesroom.getId());
+ wrapper.eq(AuctionBondJl::getMemberId,MemberAuctionSalesroomDTO.getMemberId());
+ wrapper.eq(AuctionBondJl::getIsState,0);
+ AuctionBondJl auctionBondJl = auctionBondJlMapper.selectOne(wrapper);
+ if (auctionBondJl!=null){
+ auctionSalesroom1.setIsBond(2);
}else{
- memberAuctionSalesroomVO.setIsBond(1);
+ auctionSalesroom1.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);
+
+ LambdaQueryWrapper<AuctionBondJl> wrapper1=Wrappers.lambdaQuery();
+ wrapper1.eq(AuctionBondJl::getAuctionSalesroomId,auctionSalesroom.getId());
+ wrapper1.eq(AuctionBondJl::getBondType,2);
+ wrapper1.eq(AuctionBondJl::getIsState,0);
+ java.util.List<AuctionBondJl> auctionBondJls = auctionBondJlMapper.selectList(wrapper1);
+
+ auctionSalesroom1.setBondNum(auctionBondJls.size());
+ auctionSalesroom1.setBond(auctionSalesroom.getBond());
}
- page.setRecords(List);
- return PageDTO.of(page);
+ return articleCommentsVOPageDTO;
}
}
--
Gitblit v1.7.1