From 356b6e4b0a11a6e44717dc9b92beaacc9c0c4b7a Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 06 八月 2024 10:13:18 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionBrowseRecordServiceImpl.java | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 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 3e4ca4f..27a23ca 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
@@ -84,7 +84,7 @@
wrapper3.like(AuctionBrowseRecord::getSkuName,auctionGoodsListDTO.getGoodsSkuName());
}
- Set<Long> goodsSkuIdList = null;
+ /* Set<Long> goodsSkuIdList = null;
if (auctionGoodsListDTO.getStartStatus()!=null&&auctionGoodsListDTO.getStartStatus()!=4){
LambdaQueryWrapper<AuctionGoods> wrapper=Wrappers.lambdaQuery();
wrapper.eq(AuctionGoods::getStartStatus,auctionGoodsListDTO.getStartStatus());
@@ -103,7 +103,7 @@
goodsSkuIdList.add(0L);
wrapper3.in(AuctionBrowseRecord::getTargetId,goodsSkuIdList);
}
- }
+ }*/
wrapper3.orderByDesc(AuctionBrowseRecord::getCreateTime);
Page<AuctionBrowseRecord> page1 = this.page(page, wrapper3);
@@ -135,7 +135,7 @@
@Override
public PageDTO<WdMemberAuctionSalesroomVO> getWdAuctionSalesroomBrowseRecordList(MemberAuctionSalesroomDTO MemberAuctionSalesroomDTO) {
- Set<Long> goodsSkuIdList = null;
+ /* Set<Long> goodsSkuIdList = null;
if (MemberAuctionSalesroomDTO.getStatus()!=4){
LambdaQueryWrapper<AuctionSalesroom> wrapper=Wrappers.lambdaQuery();
wrapper.eq(AuctionSalesroom::getStatus,MemberAuctionSalesroomDTO.getStatus());
@@ -143,7 +143,7 @@
List<AuctionSalesroom> auctionSalesrooms = auctionSalesroomMapper.selectList(wrapper);
goodsSkuIdList = auctionSalesrooms.stream().map(AuctionSalesroom::getId)
.collect(Collectors.toSet());
- }
+ }*/
@@ -159,7 +159,7 @@
wrapper3.ge(AuctionBrowseRecord::getCreateTime, newTime7)
.le(AuctionBrowseRecord::getCreateTime, now);
- if (MemberAuctionSalesroomDTO.getStatus()!=4) {
+ /* if (MemberAuctionSalesroomDTO.getStatus()!=4) {
if (goodsSkuIdList != null) {
wrapper3.in(AuctionBrowseRecord::getTargetId,goodsSkuIdList);
} else {
@@ -167,7 +167,7 @@
goodsSkuIdList.add(0L);
wrapper3.in(AuctionBrowseRecord::getTargetId,goodsSkuIdList);
}
- }
+ }*/
wrapper3.orderByDesc(AuctionBrowseRecord::getCreateTime);
@@ -190,12 +190,17 @@
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){
+ 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{
auctionSalesroom1.setIsBond(1);
}
+
MemberAuctionSalesroomDTO memberAuctionSalesroomDTO2=new MemberAuctionSalesroomDTO();
memberAuctionSalesroomDTO2.setAuctionSalesroomId(auctionSalesroom.getId());
--
Gitblit v1.7.1