caojiahao/dev_caojiahao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

促销活动创建，时间错误问题处理

Browse Source
This commit is contained in:
Chopper 2021-08-11 19:13:45 +08:00
parent dd7af218a4
commit 74cc360900
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
framework/src/main/java/cn/lili/common/enums/ResultCode.java
View File

@ -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,"请选择要参与活动的商品"),

7
framework/src/main/java/cn/lili/modules/promotion/entity/dto/BasePromotion.java
View File

@ -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;
}