From 74cc360900219c6bd3e38910c757c96f560cd929 Mon Sep 17 00:00:00 2001 From: Chopper Date: Wed, 11 Aug 2021 19:13:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=83=E9=94=80=E6=B4=BB=E5=8A=A8=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=EF=BC=8C=E6=97=B6=E9=97=B4=E9=94=99=E8=AF=AF=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/lili/common/enums/ResultCode.java | 2 +- .../lili/modules/promotion/entity/dto/BasePromotion.java | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/framework/src/main/java/cn/lili/common/enums/ResultCode.java b/framework/src/main/java/cn/lili/common/enums/ResultCode.java index b77b1230..61875238 100644 --- a/framework/src/main/java/cn/lili/common/enums/ResultCode.java +++ b/framework/src/main/java/cn/lili/common/enums/ResultCode.java @@ -236,7 +236,7 @@ public enum ResultCode { */ PROMOTION_GOODS_NOT_EXIT(40001, "当前促销商品不存在！"), PROMOTION_SAME_ACTIVE_EXIST(40002,"当前时间内已存在同类活动"), - PROMOTION_START_TIME_ERROR(40003,"活动起始时间不能大于活动结束时间"), + PROMOTION_START_TIME_ERROR(40003,"活动起始时间不能小于当前时间"), PROMOTION_TIME_ERROR(40004,"活动起始时间必须大于当前时间"), PROMOTION_SAME_ERROR(40005,"当前时间段已存在相同活动！"), PROMOTION_GOODS_ERROR(40006,"请选择要参与活动的商品"), diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/dto/BasePromotion.java b/framework/src/main/java/cn/lili/modules/promotion/entity/dto/BasePromotion.java index 255b340b..01ac39f8 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/entity/dto/BasePromotion.java +++ b/framework/src/main/java/cn/lili/modules/promotion/entity/dto/BasePromotion.java @@ -1,15 +1,13 @@ package cn.lili.modules.promotion.entity.dto; -import cn.lili.mybatis.BaseEntity; import cn.lili.modules.promotion.entity.enums.PromotionStatusEnum; +import cn.lili.mybatis.BaseEntity; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.persistence.MappedSuperclass; -import javax.validation.constraints.Min; import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; import java.util.Date; /** @@ -34,12 +32,10 @@ public class BasePromotion extends BaseEntity { @ApiModelProperty(value = "活动名称", required = true) private String promotionName; - @Min(message = "活动开始时间不能为空", value = 0) @ApiModelProperty(value = "活动开始时间", required = true) @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") private Date startTime; - @Min(message = "活动结束时间不能为空", value = 0) @ApiModelProperty(value = "活动结束时间", required = true) @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") private Date endTime; @@ -48,6 +44,5 @@ public class BasePromotion extends BaseEntity { * @see PromotionStatusEnum */ @ApiModelProperty(value = "活动状态") - @NotNull(message = "活动状态不能为空") private String promotionStatus; }