From b0b9420a8e66f153f42ceb21c1d7386c0772e6e0 Mon Sep 17 00:00:00 2001
From: Chopper <liushuai711@gmail.com>
Date: Wed, 4 Aug 2021 17:59:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=97=E9=93=BA=E5=88=86=E7=B1=BB=E7=BB=B4?=
 =?UTF-8?q?=E6=8A=A4=E4=BF=A1=E6=81=AF=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E5=A4=84=E7=90=86=E3=80=82?=
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 +-
 .../cn/lili/modules/store/entity/dos/StoreGoodsLabel.java | 6 ++++++
 .../store/serviceimpl/StoreGoodsLabelServiceImpl.java     | 2 +-
 .../lili/controller/goods/GoodsLabelStoreController.java  | 8 ++++----
 4 files changed, 12 insertions(+), 6 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 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<StoreGoodsLabelMappe
      * 清除缓存
      */
     private void removeCache(String storeId) {
-        cache.remove(CachePrefix.CATEGORY.getPrefix() + storeId + "tree");
+        cache.remove(CachePrefix.STORE_CATEGORY.getPrefix() + storeId + "tree");
     }
 }
diff --git a/seller-api/src/main/java/cn/lili/controller/goods/GoodsLabelStoreController.java b/seller-api/src/main/java/cn/lili/controller/goods/GoodsLabelStoreController.java
index 6d893887..9791b25f 100644
--- a/seller-api/src/main/java/cn/lili/controller/goods/GoodsLabelStoreController.java
+++ b/seller-api/src/main/java/cn/lili/controller/goods/GoodsLabelStoreController.java
@@ -1,8 +1,7 @@
 package cn.lili.controller.goods;
 
-import cn.lili.common.enums.ResultCode;
-import cn.lili.common.security.context.UserContext;
 import cn.lili.common.enums.ResultUtil;
+import cn.lili.common.security.context.UserContext;
 import cn.lili.common.vo.ResultMessage;
 import cn.lili.modules.store.entity.dos.StoreGoodsLabel;
 import cn.lili.modules.store.entity.vos.StoreGoodsLabelVO;
@@ -11,6 +10,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -48,13 +48,13 @@ public class GoodsLabelStoreController {
 
     @ApiOperation(value = "添加店铺商品分类")
     @PostMapping
-    public ResultMessage<StoreGoodsLabel> add(StoreGoodsLabel storeGoodsLabel) {
+    public ResultMessage<StoreGoodsLabel> add(@Validated StoreGoodsLabel storeGoodsLabel) {
         return ResultUtil.data(storeGoodsLabelService.addStoreGoodsLabel(storeGoodsLabel));
     }
 
     @ApiOperation(value = "修改店铺商品分类")
     @PutMapping
-    public ResultMessage<StoreGoodsLabel> edit(StoreGoodsLabel storeGoodsLabel) {
+    public ResultMessage<StoreGoodsLabel> edit(@Validated StoreGoodsLabel storeGoodsLabel) {
         return ResultUtil.data(storeGoodsLabelService.editStoreGoodsLabel(storeGoodsLabel));
     }