diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dos/Category.java b/framework/src/main/java/cn/lili/modules/goods/entity/dos/Category.java index 2e15f315..7146aa80 100644 --- a/framework/src/main/java/cn/lili/modules/goods/entity/dos/Category.java +++ b/framework/src/main/java/cn/lili/modules/goods/entity/dos/Category.java @@ -8,6 +8,7 @@ import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import javax.validation.constraints.Min; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; import java.math.BigDecimal; @@ -37,6 +38,7 @@ public class Category extends BaseEntity { private String parentId; @NotNull(message = "层级不能为空") + @Min(value = 0,message = "层级需要大于0") @ApiModelProperty(value = "层级, 从0开始") private Integer level; diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/MemberCouponServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/MemberCouponServiceImpl.java index 6a620c1c..d900ee51 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/MemberCouponServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/MemberCouponServiceImpl.java @@ -91,8 +91,8 @@ public class MemberCouponServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); queryWrapper.eq("member_id", UserContext.getCurrentUser().getId()); queryWrapper.ge("member_coupon_status", MemberCouponStatusEnum.NEW.name()); - queryWrapper.ge("start_time", System.currentTimeMillis()); - queryWrapper.le("end_time", System.currentTimeMillis()); + queryWrapper.le("start_time", new Date()); + queryWrapper.ge("end_time", new Date()); return this.list(queryWrapper); } diff --git a/manager-api/src/main/java/cn/lili/controller/goods/CategoryManagerController.java b/manager-api/src/main/java/cn/lili/controller/goods/CategoryManagerController.java index 1d3e72c5..86458e63 100644 --- a/manager-api/src/main/java/cn/lili/controller/goods/CategoryManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/goods/CategoryManagerController.java @@ -89,7 +89,7 @@ public class CategoryManagerController { } @DeleteMapping(value = "/{id}") - @ApiImplicitParam(name = "goodsId", value = "分类ID", required = true, paramType = "path", dataType = "String") + @ApiImplicitParam(name = "id", value = "分类ID", required = true, paramType = "path", dataType = "String") @ApiOperation(value = "通过id删除分类") public ResultMessage delAllByIds(@NotNull @PathVariable String id) { Category category = new Category();