Merge remote-tracking branch 'origin/master'

mitao

2024-07-29 fc8b51f40e71aa09bb49f407c1e9f68ac94ceb58

 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,8 +402,14 @@
            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);
@@ -452,8 +459,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);