Merge remote-tracking branch 'origin/master'

mitao

2024-06-21 c6602babed46a20a8db218bd20d566a67c51d4ed

 ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomGoodsServiceImpl.java

@@ -561,10 +561,10 @@
        AuctionSalesroomGoodsInfoVO.setExplain(returnAddressUserName.getConfigValue());
        AuctionSalesroomGoodsInfoVO.setMinimumMarkupAmount(byId1.getMinimumMarkupAmount());
        LambdaQueryWrapper<AuctionBidRecord> wrapper1=Wrappers.lambdaQuery();
        wrapper1.eq(AuctionBidRecord::getMemberId,auctionSalesroomGoodsInfoDTO.getMemberId());
        wrapper1.eq(AuctionBidRecord::getAuctionSalesroomId,byId.getId());
        wrapper1.eq(AuctionBidRecord::getAuctionType,2);
        wrapper1.eq(AuctionBidRecord::getTargetId,byId1.getId());
        wrapper1.eq(AuctionBidRecord::getMemberId,auctionSalesroomGoodsInfoDTO.getMemberId());
        wrapper1.eq(AuctionBidRecord::getDelFlag,0);
        AuctionBidRecord list1 = auctionBidRecordMapper.selectOne(wrapper1);
        if (list1!=null){
@@ -589,6 +589,16 @@
            AuctionSalesroomGoodsInfoVO.setIsStatus(1);
        }

        LambdaQueryWrapper<AuctionBidRecord> wrapper2=Wrappers.lambdaQuery();
        wrapper2.eq(AuctionBidRecord::getAuctionSalesroomId,byId.getId());
        wrapper2.eq(AuctionBidRecord::getAuctionType,2);
        wrapper2.eq(AuctionBidRecord::getTargetId,byId1.getId());
        wrapper2.eq(AuctionBidRecord::getDelFlag,0);
        AuctionBidRecord list2 = auctionBidRecordMapper.selectOne(wrapper1);
        if (list2!=null){
            AuctionSalesroomGoodsInfoVO.setZgBid(list2.getLastBidAmount());
        }

        return AuctionSalesroomGoodsInfoVO;
    }