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 d971db28..b77b1230 100644 --- a/framework/src/main/java/cn/lili/common/enums/ResultCode.java +++ b/framework/src/main/java/cn/lili/common/enums/ResultCode.java @@ -408,7 +408,7 @@ public enum ResultCode { */ OSS_NOT_EXIST(80101, "OSS未配置"), OSS_EXCEPTION_ERROR(80102, "文件上传失败,请稍后重试"), - OSS_DELETE_ERROR(80102, "图片删除失败"), + OSS_DELETE_ERROR(80103, "图片删除失败"), /** * 验证码 diff --git a/framework/src/main/java/cn/lili/modules/store/entity/dos/StoreGoodsLabel.java b/framework/src/main/java/cn/lili/modules/store/entity/dos/StoreGoodsLabel.java index 4b6cdbc2..b49a60a7 100644 --- a/framework/src/main/java/cn/lili/modules/store/entity/dos/StoreGoodsLabel.java +++ b/framework/src/main/java/cn/lili/modules/store/entity/dos/StoreGoodsLabel.java @@ -8,6 +8,8 @@ import lombok.Data; import javax.persistence.Entity; import javax.persistence.Table; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; import java.math.BigDecimal; /** @@ -28,12 +30,16 @@ public class StoreGoodsLabel extends BaseEntity { @ApiModelProperty("店铺ID") private String storeId; + @NotEmpty(message = "店铺商品分类名称不能为空") @ApiModelProperty("店铺商品分类名称") private String labelName; + + @NotNull(message = "店铺商品分类排序不能为空") @ApiModelProperty("店铺商品分类排序") private BigDecimal sortOrder; + @NotNull(message = "父节点不能为空,需设定根节点或者某节点的子节点") @ApiModelProperty(value = "父id, 根节点为0") private String parentId; diff --git a/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreGoodsLabelServiceImpl.java b/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreGoodsLabelServiceImpl.java index 8e379368..178d7d36 100644 --- a/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreGoodsLabelServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreGoodsLabelServiceImpl.java @@ -126,6 +126,6 @@ public class StoreGoodsLabelServiceImpl extends ServiceImpl add(StoreGoodsLabel storeGoodsLabel) { + public ResultMessage add(@Validated StoreGoodsLabel storeGoodsLabel) { return ResultUtil.data(storeGoodsLabelService.addStoreGoodsLabel(storeGoodsLabel)); } @ApiOperation(value = "修改店铺商品分类") @PutMapping - public ResultMessage edit(StoreGoodsLabel storeGoodsLabel) { + public ResultMessage edit(@Validated StoreGoodsLabel storeGoodsLabel) { return ResultUtil.data(storeGoodsLabelService.editStoreGoodsLabel(storeGoodsLabel)); }