From f3f3d3f9364c911cdd4c762782b6f4d4d6fb6a6c Mon Sep 17 00:00:00 2001 From: Chopper Date: Wed, 22 Sep 2021 09:17:59 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=88=86=E7=B1=BBAPI=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/lili/modules/goods/entity/dos/Category.java | 2 ++ .../cn/lili/controller/goods/CategoryManagerController.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) 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/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(); From a2d896c9b2365459ae5f5a328f867746d4242e72 Mon Sep 17 00:00:00 2001 From: Chopper Date: Wed, 22 Sep 2021 09:46:43 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E5=B1=95=E7=A4=BA=E4=BC=98=E6=83=A0=E5=88=B8=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 --- .../promotion/serviceimpl/MemberCouponServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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); }