From c24c5c44ea1d0e0c32feadfb6dea3b6efa0694fc Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期三, 31 七月 2024 13:37:23 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomServiceImpl.java | 44 +++++++++++++++++++++++++++++---------------
1 files changed, 29 insertions(+), 15 deletions(-)
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomServiceImpl.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomServiceImpl.java
index 1fd0b93..6bdc56b 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomServiceImpl.java
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomServiceImpl.java
@@ -24,11 +24,9 @@
import com.ruoyi.auction.controller.management.vo.MgtAuctionSalesroomGoodsVO;
import com.ruoyi.auction.controller.management.vo.MgtAuctionSalesroomScreenVO;
import com.ruoyi.auction.controller.management.vo.MgtAuctionSalesroomVO;
-import com.ruoyi.auction.domain.AuctionBidRecord;
-import com.ruoyi.auction.domain.AuctionBrowseRecord;
-import com.ruoyi.auction.domain.AuctionSalesroomGoods;
-import com.ruoyi.auction.domain.AuctionVideo;
+import com.ruoyi.auction.domain.*;
import com.ruoyi.auction.mapper.AuctionBidRecordMapper;
+import com.ruoyi.auction.mapper.AuctionBondJlMapper;
import com.ruoyi.auction.mapper.AuctionSalesroomGoodsMapper;
import com.ruoyi.auction.mapper.AuctionSalesroomMapper;
import com.ruoyi.auction.service.IAuctionBidRecordService;
@@ -166,6 +164,9 @@
@Resource
private AuctionBidRecordMapper auctionBidRecordMapper;
+
+ @Resource
+ private AuctionBondJlMapper auctionBondJlMapper;
@Resource
private RemoteFileService remoteFileService;
@@ -401,17 +402,25 @@
memberAuctionSalesroomVO.setBond(auctionSalesroom.getBond());
memberAuctionSalesroomVO.setAuthentication(auctionSalesroom.getAuthentication());
memberAuctionSalesroomDTO.setAuctionSalesroomId(auctionSalesroom.getId());
- List<OrderAuctionBond> data = orderClient.getOrderAuctionBondList1(memberAuctionSalesroomDTO, SecurityConstants.INNER).getData();
- if (data!=null&&data.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){
memberAuctionSalesroomVO.setIsApply(2);
}else{
memberAuctionSalesroomVO.setIsApply(1);
}
- MemberAuctionSalesroomDTO memberAuctionSalesroomDTO1=new MemberAuctionSalesroomDTO();
- memberAuctionSalesroomDTO1.setAuctionSalesroomId(auctionSalesroom.getId());
- List<OrderAuctionBond> data1 = orderClient.getOrderAuctionBondList1(memberAuctionSalesroomDTO1, SecurityConstants.INNER).getData();
- if(data1!=null){
- memberAuctionSalesroomVO.setApplyNum(data1.size());
+ 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);
+ if(auctionBondJls!=null){
+ memberAuctionSalesroomVO.setApplyNum(auctionBondJls.size());
}else{
memberAuctionSalesroomVO.setApplyNum(0);
@@ -452,8 +461,12 @@
memberAuctionSalesroomInfoVO.setStatus(byId.getStatus());
memberAuctionSalesroomInfoVO.setCoverPic(byId.getCoverPic());
- List<OrderAuctionBond> data = orderClient.getOrderAuctionBondList1(memberAuctionSalesroomDTO, SecurityConstants.INNER).getData();
- if (data.size()>0){
+ LambdaQueryWrapper<AuctionBondJl> wrapper=Wrappers.lambdaQuery();
+ wrapper.eq(AuctionBondJl::getAuctionSalesroomId,byId.getId());
+ wrapper.eq(AuctionBondJl::getMemberId,memberAuctionSalesroomDTO.getMemberId());
+ wrapper.eq(AuctionBondJl::getIsState,0);
+ AuctionBondJl auctionBondJl = auctionBondJlMapper.selectOne(wrapper);
+ if (auctionBondJl!=null){
memberAuctionSalesroomInfoVO.setIsApply(2);
}else{
memberAuctionSalesroomInfoVO.setIsApply(1);
@@ -541,6 +554,7 @@
auctionBrowseRecord.setBrowseType(AuctionOrderTypeEnum.AUCTION_ITEMS);
auctionBrowseRecord.setMemberId(memberAuctionSalesroomDTO.getMemberId());
auctionBrowseRecord.setTargetId(memberAuctionSalesroomDTO.getAuctionSalesroomId());
+ auctionBrowseRecord.setSkuName(byId.getSalesroomName());
iAuctionBrowseRecordService.save(auctionBrowseRecord);
}
@@ -1447,7 +1461,7 @@
Wrappers.lambdaQuery(AuctionBidRecord.class)
.eq(AuctionBidRecord::getAuctionSalesroomId,
auctionSalesroomGoods.getAuctionSalesroomId())
- .eq(AuctionBidRecord::getTargetId, auctionSalesroomGoods.getGoodsSkuId())
+ .eq(AuctionBidRecord::getTargetId, auctionSalesroomGoods.getId())
.eq(AuctionBidRecord::getAuctionType, AuctionOrderTypeEnum.AUCTION_ITEMS)
.orderByDesc(AuctionBidRecord::getLastBidAmount));
if (CollUtils.isNotEmpty(auctionBidRecordList)) {
@@ -1460,7 +1474,7 @@
auctionBidRecords.add(auctionBidRecord);
}
} else {
- for (int i = 0; i < auctionSalesroomGoods.getSalesroomStock(); i++) {
+ for (int i = 0; i < auctionBidRecordList.size(); i++) {
AuctionBidRecord auctionBidRecord = auctionBidRecordList.get(i);
auctionBidRecord.setStatus(BidStatusEnum.SUCCESSFUL);
auctionBidRecordMapper.updateById(auctionBidRecord);
--
Gitblit v1.7.1