修改bug

rentaiming

2024-07-29 304199fe5a44863a533bc49d1c8010f8de2ae0fd

修改bug

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

@@ -446,7 +446,7 @@
            List<GoodsSku> goodsSku = goodsSkuClient.getGoodsByName(auctionGoodsListDTO.getGoodsSkuName(),
                            SecurityConstants.INNER)
                    .getData();
            if (goodsSku.size()>0){
            if (goodsSku!=null){
                goodsSkuIdList = goodsSku.stream().map(GoodsSku::getId)
                        .collect(Collectors.toSet());
            }
@@ -454,10 +454,15 @@
        }

        AuctionGoodsListPageDTO auctionGoodsListPageDTO=new AuctionGoodsListPageDTO();
        if (goodsSkuIdList!=null){
            auctionGoodsListPageDTO.setGoodsSkuIdList(goodsSkuIdList);
        if (StringUtils.isNotEmpty(auctionGoodsListDTO.getGoodsSkuName())) {
            if (goodsSkuIdList != null) {
                auctionGoodsListPageDTO.setGoodsSkuIdList(goodsSkuIdList);
            } else {
                goodsSkuIdList = new HashSet<>();
                goodsSkuIdList.add(0L);
                auctionGoodsListPageDTO.setGoodsSkuIdList(goodsSkuIdList);
            }
        }


        Page<AuctionGoodsListVO> page = new Page<>();
        page.setSize(auctionGoodsListDTO.getPageSize());

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSkuServiceImpl.java

@@ -393,11 +393,10 @@
            wrapper3.le(GoodsSku::getYears, parseTime7)
                    .ge(GoodsSku::getYears, parseTime15);
        }
        if (homeGoodsSkuDTO.getSort()==1){
            wrapper3.last(" ORDER BY IF(isnull(sort_num),1,0), sort_num DESC");
        }else{
            wrapper3.last(",IF(isnull(sort_num),1,0), sort_num DESC");
        }
        wrapper3.orderByDesc(GoodsSku::getCreateTime);
        wrapper3.last(",IF(isnull(sort_num),1,0), sort_num DESC");


        Page<GoodsSku> page1 = this.page(page, wrapper3);
        PageDTO<HomeGoodsSkuListVO> articleCommentsVOPageDTO = PageDTO.of(page1, HomeGoodsSkuListVO.class);
        return  articleCommentsVOPageDTO;

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java

@@ -789,7 +789,7 @@
        }
        wrapper.eq(Order::getIsOrder,1);
        wrapper.eq(Order::getDelFlag,0);
        wrapper.orderByDesc(Order::getCancelTime);
        wrapper.orderByDesc(Order::getCreateTime);
        Page<Order> page1 = this.page(page, wrapper);

        PageDTO<MemberOrderListVO> memberOrderListVOPageDTO = PageDTO.of(page1, MemberOrderListVO.class);