rentaiming
2024-05-17 15bd9f9a91ea66ff8a9677454d67bf6dc708a967
拍卖大屏展示
4个文件已修改
20 ■■■■ 已修改文件
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/ServiceNameConstants.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/VO/AuctionSalesroomGoodsVO.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/AuctionBidRecordController.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/AuctionSalesroomGoodsController.java 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/ServiceNameConstants.java
@@ -39,13 +39,13 @@
    /**
     * 会员模块的serviceid
     */
    public static final String RUOYI_MEMBER = "ruoyi-member";
    public static final String MEMBER_SERVICE = "ruoyi-member";
    /**
     * 商品模块的serviceid
     */
    public static final String RUOYI_MODULES_GOODS = "ruoyi-modules-goods";
    public static final String RUOYI_GOODS = "ruoyi-goods";
    /**
     * 资讯模块的serviceid
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/VO/AuctionSalesroomGoodsVO.java
@@ -50,5 +50,8 @@
    @ApiModelProperty(value = "商品描述")
    private String description;
    @ApiModelProperty(value = "下一个商品名称")
    private String nextGoodsSkuName;
}
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/AuctionBidRecordController.java
@@ -52,6 +52,7 @@
            wrapper.eq(AuctionBidRecord::getDelFlag,0);
            wrapper.orderByDesc(AuctionBidRecord::getLastBidAmount);
            AuctionBidRecordList=iAuctionBidRecordService.list(wrapper);
            //判断
            if (AuctionBidRecordList.size()>=auctionSalesroomGoods.getItemQuantity()){
                for (int i=0;i<=auctionSalesroomGoods.getItemQuantity();i++){
                    AuctionBidRecord auctionBidRecord= AuctionBidRecordList.get(i);
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/AuctionSalesroomGoodsController.java
@@ -65,14 +65,14 @@
            wrapper1.eq(AuctionSalesroomGoods::getDelFlag,0);
            wrapper1.orderByDesc(AuctionSalesroomGoods::getSortNum);
            wrapper.last("limit 1");
            auctionSalesroomGoods=auctionSalesroomGoods=iAuctionSalesroomGoodsService.getOne(wrapper1);
            auctionSalesroomGoods=iAuctionSalesroomGoodsService.getOne(wrapper1);
            if (auctionSalesroomGoods==null){
                LambdaQueryWrapper<AuctionSalesroomGoods> wrapper2=Wrappers.lambdaQuery();
                wrapper2.eq(AuctionSalesroomGoods::getStatus,1);
                wrapper2.eq(AuctionSalesroomGoods::getDelFlag,0);
                wrapper2.orderByAsc(AuctionSalesroomGoods::getSortNum);
                wrapper2.last("limit 1");
                auctionSalesroomGoods=auctionSalesroomGoods=iAuctionSalesroomGoodsService.getOne(wrapper2);
                auctionSalesroomGoods=iAuctionSalesroomGoodsService.getOne(wrapper2);
            }
        }
@@ -88,6 +88,14 @@
        auctionSalesroomGoodsVO.setCoverPic(goodsSku.getCoverPic());
        auctionSalesroomGoodsVO.setDescription(goodsSku.getDescription());
        auctionSalesroomGoodsVO.setUnit(goodsSku.getUnit());
        if (auctionSalesroomGoods.getStatus().getCode()==0){
            auctionSalesroomGoodsVO.setNextGoodsSkuName(auctionSalesroomGoods.getGoodsSkuName());
        }if (auctionSalesroomGoods.getStatus().getCode()==2){
            AuctionSalesroomGoods auctionSalesroomGoodsOne= iAuctionSalesroomGoodsService.getById(auctionSalesroomGoods.getGoodsSkuId()+1);
            if (auctionSalesroomGoodsOne!=null){
                auctionSalesroomGoodsVO.setNextGoodsSkuName(auctionSalesroomGoods.getGoodsSkuName());
            }
        }
        return auctionSalesroomGoodsVO;
    }