From 353ec2376201dbfaac3477262deb40bf35ad3154 Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期五, 19 七月 2024 14:06:23 +0800
Subject: [PATCH] 修改bug

---
 ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionGoodsServiceImpl.java |   17 +++++++++++++----
 1 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionGoodsServiceImpl.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionGoodsServiceImpl.java
index a7c3b2b..9bc6db5 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionGoodsServiceImpl.java
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionGoodsServiceImpl.java
@@ -421,6 +421,15 @@
             goodsSkuIdList = goodsSku.stream().map(GoodsSku::getId)
                     .collect(Collectors.toSet());
         }
+
+        if (StringUtils.isNotEmpty(auctionGoodsListDTO.getSalesroomName())) {
+            List<GoodsSku> goodsSku = goodsSkuClient.getGoodsByName(auctionGoodsListDTO.getSalesroomName(),
+                            SecurityConstants.INNER)
+                    .getData();
+            goodsSkuIdList = goodsSku.stream().map(GoodsSku::getId)
+                    .collect(Collectors.toSet());
+        }
+
         AuctionGoodsListPageDTO auctionGoodsListPageDTO=new AuctionGoodsListPageDTO();
         auctionGoodsListPageDTO.setGoodsSkuIdList(goodsSkuIdList);
 
@@ -564,11 +573,11 @@
         LambdaQueryWrapper<AuctionBidRecord> wrapper5= Wrappers.lambdaQuery();
         wrapper5.eq(AuctionBidRecord::getAuctionType,1);
         wrapper5.eq(AuctionBidRecord::getTargetId,byId.getId());
-        wrapper5.eq(AuctionBidRecord::getMemberId,auctionGoodsListDTO.getMemberId());
         wrapper5.eq(AuctionBidRecord::getDelFlag,0);
-        AuctionBidRecord list5 = auctionBidRecordService.getOne(wrapper5);
-        if (list5!=null){
-            auctionGoodsinfoVO.setZgBid(list5.getLastBidAmount());
+        wrapper5.orderByDesc(AuctionBidRecord::getLastBidAmount);
+        List<AuctionBidRecord> list2 = auctionBidRecordService.list(wrapper5);
+        if (list2.size()>0){
+            auctionGoodsinfoVO.setZgBid(list2.get(0).getLastBidAmount());
         }
 
 

--
Gitblit v1.7.1