修改bug

mitao

2024-08-06 356b6e4b0a11a6e44717dc9b92beaacc9c0c4b7a

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

@@ -38,7 +38,18 @@
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.*;
import com.ruoyi.system.api.domain.AuctionGoods;
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.Order;
import com.ruoyi.system.api.domain.OrderAuctionBond;
import com.ruoyi.system.api.domain.WebsocketMessageDTO;
import com.ruoyi.system.api.domain.dto.AuctionGoodsListDTO;
import com.ruoyi.system.api.domain.dto.AuctionGoodsListPageDTO;
import com.ruoyi.system.api.domain.dto.GoodsStockUpdDTO;
@@ -46,7 +57,10 @@
import com.ruoyi.system.api.domain.dto.MemberAuctionSalesroomDTO;
import com.ruoyi.system.api.domain.dto.OrderDTO;
import com.ruoyi.system.api.domain.dto.RefundDTO;
import com.ruoyi.system.api.domain.vo.*;
import com.ruoyi.system.api.domain.vo.AuctionGoodsListVO;
import com.ruoyi.system.api.domain.vo.AuctionGoodsinfoVO;
import com.ruoyi.system.api.domain.vo.GoodsInfoTitleValueVO;
import com.ruoyi.system.api.domain.vo.getHomeGoodsSkuXxiVO;
import com.ruoyi.system.api.feignClient.AuctionClient;
import com.ruoyi.system.api.feignClient.GoodsSkuClient;
import com.ruoyi.system.api.feignClient.MemberClient;
@@ -455,6 +469,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());
@@ -691,13 +708,10 @@
        if (auctionGoodsListDTO.getStartStatus() != 4) {
            wrapper1.eq(AuctionGoods::getStartStatus,auctionGoodsListDTO.getStartStatus());
        }
        wrapper1.last("ORDER BY\n" +
                "        CASE\n" +
                "        WHEN start_status = 0 THEN 2\n" +
                "        WHEN start_status = 1 THEN 1\n" +
                "        WHEN start_status = 2 THEN 3\n" +
                "        END,start_status asc ");

        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();