Merge remote-tracking branch 'origin/master'

rentaiming

2024-05-27 05fe558f722590aa706c2296c8a9a619d12b42be

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

@@ -36,6 +36,12 @@
    @Resource
    private GoodsSkuClient goodsSkuClient;

    /**
     * 获取拍卖商品列表的分页数据
     *
     * @param query 拍卖商品查询对象
     * @return PageDTO<AuctionGoodsVO>
     */
    @Override
    public PageDTO<AuctionGoodsVO> getAuctionGoodsPage(AuctionGoodsQuery query) {
        Set<Long> goodsSkuIdList = null;
@@ -45,7 +51,8 @@
            goodsSkuIdList = goodsSku.stream().map(GoodsSku::getId)
                    .collect(Collectors.toSet());
        }
        this.lambdaQuery().select(AuctionGoods::getId, AuctionGoods::getGoodsSkuId,
        Page<AuctionGoods> page = this.lambdaQuery()
                .select(AuctionGoods::getId, AuctionGoods::getGoodsSkuId,
                        AuctionGoods::getListingStatus, AuctionGoods::getStartStatus,
                        AuctionGoods::getStartTime, AuctionGoods::getEndTime,
                        AuctionGoods::getAuctionStock, AuctionGoods::getMinimumMarkupAmount).in(
@@ -57,6 +64,6 @@
                .eq(StringUtils.isNotNull(query.getStartStatus()), AuctionGoods::getStartStatus,
                        query.getStartStatus())
                .page(new Page<>(query.getPageCurr(), query.getPageSize()));
        return null;
        return PageDTO.of(page, AuctionGoodsVO.class);
    }
}