From 0858bae1cdbfe973ca53985e151cae48b81c8b0b Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期三, 10 七月 2024 18:16:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionBrowseRecordServiceImpl.java | 5 ++---
1 files changed, 2 insertions(+), 3 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..eaa5a35 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
@@ -74,7 +74,7 @@
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())) {
@@ -136,7 +136,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)
@@ -150,7 +149,7 @@
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<>();
--
Gitblit v1.7.1