bug修复

mitao

2024-12-06 b436605863b27329a75ba3331ddb59c4536402fa

bug修复

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/AuctionSalesroomGoods.java

@@ -94,6 +94,9 @@

    @ApiModelProperty(value = "结束时间")
    private LocalDateTime endTime;
    
    @ApiModelProperty(value = "商品介绍")
    private String description;


}

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/ForepartAuctionSalesroomGoodsVO.java

@@ -2,12 +2,10 @@

import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.ruoyi.common.core.enums.AuctionGoodsStatusEnum;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;
import java.time.LocalDateTime;
import lombok.Data;

@Data
public class ForepartAuctionSalesroomGoodsVO {
@@ -104,5 +102,7 @@
    @JsonInclude(JsonInclude.Include.ALWAYS)
    private BigDecimal zgBid;


    @ApiModelProperty(value = "商品介绍")
    @JsonInclude(JsonInclude.Include.ALWAYS)
    private String goodsDescription;
}

 ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/dto/MgtAuctionSalesroomGoodsDTO.java

@@ -44,4 +44,7 @@
    @ApiModelProperty(value = "排序")
    private Integer sortNum;
    
    @ApiModelProperty(value = "商品介绍")
    private String description;
    
}

 ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/vo/MgtAuctionSalesroomGoodsVO.java

@@ -68,4 +68,7 @@
    @ApiModelProperty(value = "排序")
    private Integer sortNum;

    @ApiModelProperty(value = "商品介绍")
    private String description;

}

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

@@ -164,6 +164,8 @@
        forepartAuctionSalesroomGoodsVO.setSpecUnit(goodsSku.getSpecUnit());
        forepartAuctionSalesroomGoodsVO.setMinimumMarkupAmount(
                auctionSalesroomGoods.getMinimumMarkupAmount());
        forepartAuctionSalesroomGoodsVO.setGoodsDescription(
                auctionSalesroomGoods.getDescription());
        if (auctionSalesroomGoods.getStatus().getCode()==0 || auctionSalesroomGoods.getStatus().getCode()==2){
            LambdaQueryWrapper<AuctionSalesroomGoods> wrapper1=Wrappers.lambdaQuery();
            wrapper1.eq(AuctionSalesroomGoods::getDelFlag,0);

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

@@ -988,6 +988,9 @@
                if (StringUtils.isNull(data.getListingDuration())) {
                    throw new ServiceException("拍卖商品拍卖时间不能为空");
                }
                if (StringUtils.isBlank(data.getDescription())) {
                    throw new ServiceException("拍卖商品介绍不能为空");
                }
            }
        });
        List<AuctionSalesroomGoods> auctionSalesroomGoods = BeanUtils.copyList(