From 70b59a5bc7f210869b8718c2d55c70a4aa2a8b9b Mon Sep 17 00:00:00 2001 From: chen-xin-zhi <3588068430@qq.com> Date: Mon, 4 Nov 2024 11:02:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=BA=86=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E7=99=BB=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 1 + .../heritage/config/Knife4jConfig.java | 9 ++++- .../controller/address/AddressController.java | 3 -- .../model/dto/snapshot/CouponSnapshot.java | 36 ------------------- .../model/dto/snapshot/GoodSnapshot.java | 25 ------------- 5 files changed, 9 insertions(+), 65 deletions(-) diff --git a/pom.xml b/pom.xml index 4ba3da2..44213f8 100644 --- a/pom.xml +++ b/pom.xml @@ -92,6 +92,7 @@ knife4j-openapi3-jakarta-spring-boot-starter 4.4.0 + junit diff --git a/src/main/java/com/cultural/heritage/config/Knife4jConfig.java b/src/main/java/com/cultural/heritage/config/Knife4jConfig.java index 4f8bc76..ab38767 100644 --- a/src/main/java/com/cultural/heritage/config/Knife4jConfig.java +++ b/src/main/java/com/cultural/heritage/config/Knife4jConfig.java @@ -24,4 +24,11 @@ public class Knife4jConfig { .license(new License().name("Apache 2.0") .url("http://doc.xiaominfo.com"))); } -} \ No newline at end of file +} + + + + + + + diff --git a/src/main/java/com/cultural/heritage/controller/address/AddressController.java b/src/main/java/com/cultural/heritage/controller/address/AddressController.java index f841233..dadcc5b 100644 --- a/src/main/java/com/cultural/heritage/controller/address/AddressController.java +++ b/src/main/java/com/cultural/heritage/controller/address/AddressController.java @@ -1,6 +1,5 @@ package com.cultural.heritage.controller.address; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.cultural.heritage.common.BaseResponse; import com.cultural.heritage.common.ErrorCode; import com.cultural.heritage.common.ResultUtils; @@ -15,13 +14,11 @@ import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; -import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import java.util.ArrayList; import java.util.List; @RestController diff --git a/src/main/java/com/cultural/heritage/model/dto/snapshot/CouponSnapshot.java b/src/main/java/com/cultural/heritage/model/dto/snapshot/CouponSnapshot.java index 5d098e0..8cc71a4 100644 --- a/src/main/java/com/cultural/heritage/model/dto/snapshot/CouponSnapshot.java +++ b/src/main/java/com/cultural/heritage/model/dto/snapshot/CouponSnapshot.java @@ -1,11 +1,9 @@ package com.cultural.heritage.model.dto.snapshot; -import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import java.io.Serial; import java.io.Serializable; -import java.util.Date; @Data public class CouponSnapshot implements Serializable { @@ -22,40 +20,6 @@ public class CouponSnapshot implements Serializable { private Double conditionAmount; - /** - * 优惠券简介 - */ - private String intro; - - /** - * 优惠券图片 - */ - private String image; - - /** - * 有效开始日期 - */ - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Date startTime; - - - /** - * 有效截止日期 - */ - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Date endTime; - - /** - * 作用范围 - */ - private String useScope; - - /** - * 使用说明 - */ - private String description; - - @Serial private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/cultural/heritage/model/dto/snapshot/GoodSnapshot.java b/src/main/java/com/cultural/heritage/model/dto/snapshot/GoodSnapshot.java index 82d18bd..f132ce1 100644 --- a/src/main/java/com/cultural/heritage/model/dto/snapshot/GoodSnapshot.java +++ b/src/main/java/com/cultural/heritage/model/dto/snapshot/GoodSnapshot.java @@ -29,31 +29,6 @@ public class GoodSnapshot implements Serializable { */ private String goodImg; - /** - * 商品简介 - */ - private String intro; - - /** - * 商品详情简介 - */ - private String introDetail; - - /** - * 商品详情图片 - */ - private String detailImg; - - /** - * 商品标签 - */ - private String label; - - - /** - * 是否是商品类型 - */ - private Integer isGoodType; /** * 节日限定序号