修改bug

mitao

2024-09-21 f44e4d609e7efaed9eac545137970b1e334f8106

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

@@ -12,7 +12,6 @@
import com.ruoyi.auction.controller.management.vo.MgtAuctionBidRecordVO;
import com.ruoyi.auction.controller.management.vo.MgtAuctionGoodsVO;
import com.ruoyi.auction.domain.AuctionBidRecord;
import com.ruoyi.auction.domain.AuctionBondJl;
import com.ruoyi.auction.domain.AuctionBrowseRecord;
import com.ruoyi.auction.domain.MemberAuctionCollection;
import com.ruoyi.auction.mapper.AuctionBondJlMapper;
@@ -38,6 +37,7 @@
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.system.api.constants.ConfigEnum;
import com.ruoyi.system.api.constants.NotificationTypeConstant;
import com.ruoyi.system.api.domain.AuctionBondJl;
import com.ruoyi.system.api.domain.AuctionGoods;
import com.ruoyi.system.api.domain.CustomConfig;
import com.ruoyi.system.api.domain.GoodsBrand;
@@ -396,6 +396,7 @@
                        orderDTO.setSkuName(goodsSku.getSkuName());
                    }
                    orderDTO.setOrderTimeSx(auctionGoods.getEndTime());
                    orderDTO.setGoodsId(auctionGoods.getGoodsSkuId());
                    orderClient.saveOrderOne(orderDTO, SecurityConstants.INNER);
                }
            } else {
@@ -469,6 +470,9 @@
            List<GoodsSku> goodsSku = goodsSkuClient.getGoodsByName(auctionGoodsListDTO.getGoodsSkuName(),
                            SecurityConstants.INNER)
                    .getData();
            if (CollUtils.isEmpty(goodsSku)) {
                return PageDTO.empty(0L, 1L);
            }
            if (goodsSku!=null){
                goodsSkuIdList = goodsSku.stream().map(GoodsSku::getId)
                        .collect(Collectors.toSet());
@@ -554,12 +558,19 @@
        auctionGoodsinfoVO.setMinimumMarkupAmount(byId.getMinimumMarkupAmount());
        auctionGoodsinfoVO.setSpec(goodsSkuOne.getSpec());
        auctionGoodsinfoVO.setSpecUnit(goodsSkuOne.getSpecUnit());
        auctionGoodsinfoVO.setShareTitle(goodsSkuOne.getShareTitle());
        auctionGoodsinfoVO.setDetail(goodsSkuOne.getDetail());
        auctionGoodsinfoVO.setBond(byId.getBond());
        auctionGoodsinfoVO.setYears(goodsSkuOne.getYears());
        auctionGoodsinfoVO.setSharePic(byId.getSharePic());
        auctionGoodsinfoVO.setShareTitle(byId.getShareTitle());
        if (StringUtils.isNotBlank(byId.getShareTitle())) {
            auctionGoodsinfoVO.setShareTitle(byId.getShareTitle());
        } else {
            auctionGoodsinfoVO.setShareTitle(goodsSkuOne.getSkuName());
        }
        if (StringUtils.isNotBlank(byId.getSharePic())) {
            auctionGoodsinfoVO.setSharePic(byId.getSharePic());
        } else {
            auctionGoodsinfoVO.setSharePic(goodsSkuOne.getCoverPic());
        }
        LambdaQueryWrapper<AuctionBidRecord> wrapper1= Wrappers.lambdaQuery();
        wrapper1.eq(AuctionBidRecord::getAuctionType,1);
        wrapper1.eq(AuctionBidRecord::getTargetId,byId.getId());
@@ -661,59 +672,72 @@

    @Override
    public PageDTO<AuctionGoodsListVO> getWdAuctionSalesList(AuctionGoodsListDTO auctionGoodsListDTO) {

        MemberAuctionSalesroomDTO memberAuctionSalesroomDTO =new MemberAuctionSalesroomDTO();
        memberAuctionSalesroomDTO.setMemberId(auctionGoodsListDTO.getMemberId());
        List<OrderAuctionBond> data = orderClient.getAuctionGoodsOrderAuctionBondList(auctionGoodsListDTO, SecurityConstants.INNER).getData();
        Set<Long> goodsSkuIdList = null;
        List<Long> goodsSkuIdList = null;
        if (data.size()>0){
            goodsSkuIdList = data.stream().map(OrderAuctionBond::getAuctionGoodsId)
                    .collect(Collectors.toSet());
                    .collect(Collectors.toList());
        }else {
            Set<Long> goodsSkuIdList1 =new HashSet<>();
            List<Long> goodsSkuIdList1 =new ArrayList<>();
            goodsSkuIdList1.add(0L);
            goodsSkuIdList=goodsSkuIdList1;
        }

        AuctionGoodsListPageDTO auctionGoodsListPageDTO=new AuctionGoodsListPageDTO();
        if (goodsSkuIdList!=null){
            auctionGoodsListPageDTO.setGoodsSkuIdList(goodsSkuIdList);

        List<Long> goodsSkuIdList1 =null;
        if (StringUtils.isNotEmpty(auctionGoodsListDTO.getGoodsSkuName())) {
            List<GoodsSku> goodsSku = goodsSkuClient.getGoodsByName(auctionGoodsListDTO.getGoodsSkuName(),
                            SecurityConstants.INNER)
                    .getData();
            goodsSkuIdList1= goodsSku.stream().map(GoodsSku::getId)
                    .collect(Collectors.toList());
        }

        if (auctionGoodsListDTO.getStartStatus()!=4){
            if (auctionGoodsListDTO.getStartStatus()==0){
                auctionGoodsListPageDTO.setStartStatus(5);
            }else{
                auctionGoodsListPageDTO.setStartStatus(auctionGoodsListDTO.getStartStatus());
            }


        Page<AuctionGoods> page = new Page<>(auctionGoodsListDTO.getPageCurr(),
                auctionGoodsListDTO.getPageSize());
        LambdaQueryWrapper<AuctionGoods> wrapper1=Wrappers.lambdaQuery();
        if (goodsSkuIdList.size()>0){
            wrapper1.in(AuctionGoods::getId,goodsSkuIdList);
        }
        if (StringUtils.isNotEmpty(auctionGoodsListDTO.getGoodsSkuName())) {
        if (goodsSkuIdList1.size()>0){
            wrapper1.in(AuctionGoods::getGoodsSkuId,goodsSkuIdList1);
        }else{
            goodsSkuIdList1=new ArrayList<>();
            goodsSkuIdList1.add(0L);
            wrapper1.in(AuctionGoods::getGoodsSkuId,goodsSkuIdList1);
        }
        }
        if (auctionGoodsListDTO.getStartStatus() != 4) {
            wrapper1.eq(AuctionGoods::getStartStatus,auctionGoodsListDTO.getStartStatus());
        }
        wrapper1.last(auctionGoodsListDTO.getStartStatus() == 4, "ORDER BY\n"
                + "    FIELD(start_status, 1, 0, 2),\n"
                + "    start_time DESC");
        wrapper1.last(auctionGoodsListDTO.getStartStatus() != 4, "ORDER BY start_time DESC");
        Page<AuctionGoods> auctionSalesroomList=this.page(page,wrapper1);
        PageDTO<AuctionGoodsListVO> wdMemberAuctionSalesroomVOPageDTO = PageDTO.of(auctionSalesroomList, AuctionGoodsListVO.class);
        List<AuctionGoodsListVO> list = wdMemberAuctionSalesroomVOPageDTO.getList();
        for (AuctionGoodsListVO auctionGoodsVO:list){

        Page<AuctionGoodsListVO> page = new Page<>();
        page.setSize(auctionGoodsListDTO.getPageSize());
        page.setCurrent(auctionGoodsListDTO.getPageCurr());
        List<AuctionGoods> auctionGoodsPgeList = auctionGoodsMapper.getAuctionGoodsPgeList1(page, auctionGoodsListPageDTO);
        List<AuctionGoodsListVO> auctionGoodsVOS=new ArrayList<>();
        for (AuctionGoods auctionGoods:auctionGoodsPgeList){
            AuctionGoodsListVO auctionGoodsVO=new AuctionGoodsListVO();
            auctionGoodsVO.setAuctionStock(auctionGoods.getAuctionStock());
            auctionGoodsVO.setGoodsSkuId(auctionGoods.getId());
            auctionGoodsVO.setEndTime(auctionGoods.getEndTime());
            auctionGoodsVO.setStartTime(auctionGoods.getStartTime());
            auctionGoodsVO.setStartingPrice(auctionGoods.getStartingPrice());
            auctionGoodsVO.setStartStatus(auctionGoods.getStartStatus());
            GoodsSku goodsSkuOne = goodsSkuClient.getGoodsSkuOne(auctionGoods.getGoodsSkuId(), SecurityConstants.INNER).getData();
            GoodsSku goodsSkuOne = goodsSkuClient.getGoodsSkuOne(auctionGoodsVO.getGoodsSkuId(), SecurityConstants.INNER).getData();
            auctionGoodsVO.setUnit(goodsSkuOne.getUnit());
            auctionGoodsVO.setSpec(goodsSkuOne.getSpec());
            auctionGoodsVO.setSpecUnit(goodsSkuOne.getSpecUnit());
            auctionGoodsVO.setGoodsSkuName(goodsSkuOne.getSkuName());
            auctionGoodsVO.setCoverPic(goodsSkuOne.getCoverPic());

            LambdaQueryWrapper<AuctionBidRecord> wrapper1= Wrappers.lambdaQuery();
            wrapper1.eq(AuctionBidRecord::getMemberId,auctionGoodsListDTO.getMemberId());
            wrapper1.eq(AuctionBidRecord::getAuctionType,1);
            wrapper1.eq(AuctionBidRecord::getTargetId,auctionGoods.getId());
            wrapper1.eq(AuctionBidRecord::getDelFlag,0);
            AuctionBidRecord list1 = auctionBidRecordService.getOne(wrapper1);
            LambdaQueryWrapper<AuctionBidRecord> wrapper2= Wrappers.lambdaQuery();
            wrapper2.eq(AuctionBidRecord::getMemberId,auctionGoodsListDTO.getMemberId());
            wrapper2.eq(AuctionBidRecord::getAuctionType,1);
            wrapper2.eq(AuctionBidRecord::getTargetId,auctionGoodsVO.getId());
            wrapper2.eq(AuctionBidRecord::getDelFlag,0);
            AuctionBidRecord list1 = auctionBidRecordService.getOne(wrapper2);
            if (list1!=null){
                if (list1.getStatus().getCode()==2){
                    auctionGoodsVO.setIsStatus(2);
@@ -723,12 +747,10 @@
            }else{
                auctionGoodsVO.setIsStatus(1);
            }

            auctionGoodsVOS.add(auctionGoodsVO);
            auctionGoodsVO.setGoodsSkuId(auctionGoodsVO.getId());

        }
        page.setRecords(auctionGoodsVOS);
        return PageDTO.of(page);
        return wdMemberAuctionSalesroomVOPageDTO;
    }

    @Override
@@ -809,6 +831,7 @@
                            orderDTO.setSkuName(goodsSku.getSkuName());
                        }
                        orderDTO.setOrderTimeSx(auctionGoods.getEndTime());
                        orderDTO.setGoodsId(auctionGoods.getGoodsSkuId());
                        orderClient.saveOrderOne(orderDTO, SecurityConstants.INNER);
                    }
                } else {
@@ -940,4 +963,11 @@
        System.out.println(msg);
    }

    @Override
    public List<GoodsSku> getGoodsSkuByAuctionGoodsIdSet(Set<Long> auctionGoodsIdSet) {
        List<AuctionGoods> auctionGoodsList = this.listByIds(auctionGoodsIdSet);
        List<Long> goodsSkuIdList = auctionGoodsList.stream().map(AuctionGoods::getGoodsSkuId)
                .collect(Collectors.toList());
        return goodsSkuClient.getGoodsListByIds(goodsSkuIdList, SecurityConstants.INNER).getData();
    }
}