rentaiming
2024-06-17 a498e38d75a23d8220273406fb056f78adc31295
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomGoodsServiceImpl.java
@@ -23,15 +23,7 @@
import com.ruoyi.common.core.enums.ClientTypeEnum;
import com.ruoyi.common.core.enums.OrderFromEnum;
import com.ruoyi.system.api.constants.NotificationTypeConstant;
import com.ruoyi.system.api.domain.AuctionSalesroom;
import com.ruoyi.system.api.domain.CustomConfig;
import com.ruoyi.system.api.domain.GoodsBrand;
import com.ruoyi.system.api.domain.GoodsCategory;
import com.ruoyi.system.api.domain.GoodsFlavorType;
import com.ruoyi.system.api.domain.GoodsSeries;
import com.ruoyi.system.api.domain.GoodsSku;
import com.ruoyi.system.api.domain.Member;
import com.ruoyi.system.api.domain.MemberAddress;
import com.ruoyi.system.api.domain.*;
import com.ruoyi.system.api.domain.dto.AuctionSalesroomDTO;
import com.ruoyi.system.api.domain.dto.AuctionSalesroomGoodsInfoDTO;
import com.ruoyi.system.api.domain.dto.GoodsStockUpdDTO;
@@ -553,6 +545,15 @@
            AuctionSalesroomGoodsInfoVO.setPresentBid(list1.getLastBidAmount());
            if (list1.getStatus().getCode()==2){
                AuctionSalesroomGoodsInfoVO.setIsStatus(2);
                OrderDTO orderDTO =new OrderDTO();
                orderDTO.setMemberId(auctionSalesroomGoodsInfoDTO.getMemberId());
                orderDTO.setGoodsSkuId(byId1.getId());
                Order data4 = orderClient.getOrderOne(orderDTO, SecurityConstants.INNER).getData();
                if (data4!=null){
                    AuctionSalesroomGoodsInfoVO.setOrderId(data4.getId());
                    AuctionSalesroomGoodsInfoVO.setOrderNo(data4.getOrderNo());
                }
            }else{
                AuctionSalesroomGoodsInfoVO.setIsStatus(1);
            }
@@ -579,10 +580,8 @@
            auctionBidRecordVO.setSort(i+1);
            auctionBidRecordVO.setLastBidAmount(auctionBidRecordList.get(i).getLastBidAmount());
            auctionBidRecordVO.setLastBidTime(auctionBidRecordList.get(i).getLastBidTime());
            Member data = emberClient.getMembeOne(auctionBidRecordList.get(i).getMemberId(),
                    SecurityConstants.INNER).getData();
            auctionBidRecordVO.setMemberName(data.getNickname());
            auctionBidRecordVO.setMemberId(data.getId());
            auctionBidRecordVO.setMemberName(auctionBidRecordList.get(i).getNickname());
            auctionBidRecordVO.setMemberId(auctionBidRecordList.get(i).getId());
            auctionBidRecordVOList.add(auctionBidRecordVO);
        }
        LambdaQueryWrapper<AuctionBidRecord> wrapper1=Wrappers.lambdaQuery();
@@ -592,25 +591,27 @@
        wrapper1.eq(AuctionBidRecord::getMemberId,auctionSalesroomGoodsInfoDTO.getMemberId());
        wrapper.last("limit 1");
        AuctionBidRecord auctionBidRecord = auctionBidRecordMapper.selectOne(wrapper);
        LambdaQueryWrapper<AuctionBidRecord> wrapper3=Wrappers.lambdaQuery();
        wrapper3.eq(AuctionBidRecord::getAuctionSalesroomId,auctionSalesroomGoodsInfoDTO.getAuctionSalesroomId());
        wrapper3.eq(AuctionBidRecord::getDelFlag,0);
        wrapper3.eq(AuctionBidRecord::getTargetId,auctionSalesroomGoodsInfoDTO.getGoodsSkuId());
        wrapper3.le(AuctionBidRecord::getId,auctionBidRecord.getId());
        wrapper3.orderByDesc(AuctionBidRecord::getLastBidAmount);
        Long count = auctionBidRecordMapper.selectCount(wrapper);
        if (count>0){
            AuctionBidRecordVO auctionBidRecordVO=new AuctionBidRecordVO();
            auctionBidRecordVO.setSort(Integer.valueOf(count.intValue()));
            auctionBidRecordVO.setLastBidAmount(auctionBidRecord.getLastBidAmount());
            auctionBidRecordVO.setLastBidTime(auctionBidRecord.getLastBidTime());
            Member data = emberClient.getMembeOne(auctionBidRecord.getMemberId(),
                    SecurityConstants.INNER).getData();
            auctionBidRecordVO.setMemberName(data.getNickname());
            auctionBidRecordVO.setMemberId(data.getId());
            auctionBidRecordVOList.add(auctionBidRecordVO);
        if (auctionBidRecord!=null){
            LambdaQueryWrapper<AuctionBidRecord> wrapper3=Wrappers.lambdaQuery();
            wrapper3.eq(AuctionBidRecord::getAuctionSalesroomId,auctionSalesroomGoodsInfoDTO.getAuctionSalesroomId());
            wrapper3.eq(AuctionBidRecord::getDelFlag,0);
            wrapper3.eq(AuctionBidRecord::getTargetId,auctionSalesroomGoodsInfoDTO.getGoodsSkuId());
            wrapper3.le(AuctionBidRecord::getId,auctionBidRecord.getId());
            wrapper3.orderByDesc(AuctionBidRecord::getLastBidAmount);
            Long count = auctionBidRecordMapper.selectCount(wrapper);
            if (count>0){
                AuctionBidRecordVO auctionBidRecordVO=new AuctionBidRecordVO();
                auctionBidRecordVO.setSort(Integer.valueOf(count.intValue()));
                auctionBidRecordVO.setLastBidAmount(auctionBidRecord.getLastBidAmount());
                auctionBidRecordVO.setLastBidTime(auctionBidRecord.getLastBidTime());
                Member data = emberClient.getMembeOne(auctionBidRecord.getMemberId(),
                        SecurityConstants.INNER).getData();
                auctionBidRecordVO.setMemberName(data.getNickname());
                auctionBidRecordVO.setMemberId(data.getId());
                auctionBidRecordVOList.add(auctionBidRecordVO);
            }
        }
        return auctionBidRecordVOList;
    }