From b436605863b27329a75ba3331ddb59c4536402fa Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 06 十二月 2024 15:00:05 +0800
Subject: [PATCH] bug修复
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/AuctionSalesroomGoods.java | 3 +++
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomGoodsServiceImpl.java | 2 ++
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/vo/MgtAuctionSalesroomGoodsVO.java | 3 +++
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/ForepartAuctionSalesroomGoodsVO.java | 8 ++++----
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomServiceImpl.java | 3 +++
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/dto/MgtAuctionSalesroomGoodsDTO.java | 3 +++
6 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/AuctionSalesroomGoods.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/AuctionSalesroomGoods.java
index a9e371d..49546c9 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/AuctionSalesroomGoods.java
+++ b/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;
}
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/ForepartAuctionSalesroomGoodsVO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/ForepartAuctionSalesroomGoodsVO.java
index 355b3ac..273c6a8 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/ForepartAuctionSalesroomGoodsVO.java
+++ b/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;
}
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/dto/MgtAuctionSalesroomGoodsDTO.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/dto/MgtAuctionSalesroomGoodsDTO.java
index fee3c58..9f0f532 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/dto/MgtAuctionSalesroomGoodsDTO.java
+++ b/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;
+
}
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/vo/MgtAuctionSalesroomGoodsVO.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/vo/MgtAuctionSalesroomGoodsVO.java
index 1d0a340..94ad31a 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/vo/MgtAuctionSalesroomGoodsVO.java
+++ b/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;
+
}
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomGoodsServiceImpl.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomGoodsServiceImpl.java
index c1ba194..e13d1e1 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomGoodsServiceImpl.java
+++ b/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);
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomServiceImpl.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomServiceImpl.java
index f1b24c6..a5030d6 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomServiceImpl.java
+++ b/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(
--
Gitblit v1.7.1