list = new ArrayList<>();
+ for (Integer integer : arr) {
+ if (!list.contains(integer)) {
+ list.add(integer);
+ }
+ }
+
+ return list;
+ }
}
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/article/request/ArticleRequest.java b/crmeb/src/main/java/com/zbkj/crmeb/article/request/ArticleRequest.java
index 6c070ec0..128b40d9 100644
--- a/crmeb/src/main/java/com/zbkj/crmeb/article/request/ArticleRequest.java
+++ b/crmeb/src/main/java/com/zbkj/crmeb/article/request/ArticleRequest.java
@@ -1,17 +1,14 @@
package com.zbkj.crmeb.article.request;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
+import org.hibernate.validator.constraints.Length;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
-import java.time.LocalDateTime;
/**
*
@@ -35,10 +32,12 @@ public class ArticleRequest implements Serializable {
@ApiModelProperty(value = "文章标题", required = true)
@NotBlank(message = "请填写文章标题")
+ @Length(max = 200, message = "文章标题最多200个字符")
private String title;
@ApiModelProperty(value = "文章作者", required = true)
- @NotBlank(message = "请填写文章标题")
+ @NotBlank(message = "请填写文章作者")
+ @Length(max = 50, message = "文章作者最多50个字符")
private String author;
@ApiModelProperty(value = "文章图片", required = true)
@@ -46,15 +45,18 @@ public class ArticleRequest implements Serializable {
private String imageInput;
@ApiModelProperty(value = "文章简介", required = true)
+ @Length(max = 200, message = "文章简介最多200个字符")
@NotBlank(message = "请填写文章简介")
private String synopsis;
@ApiModelProperty(value = "文章分享标题", required = true)
@NotBlank(message = "请填写文章分享标题")
+ @Length(max = 200, message = "文章分享标题最多200个字符")
private String shareTitle;
@ApiModelProperty(value = "文章分享简介", required = true)
@NotBlank(message = "请填写文章分享简介")
+ @Length(max = 200, message = "文章分享简介最多200个字符")
private String shareSynopsis;
@ApiModelProperty(value = "排序", example = "0", required = true)
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/category/controller/CategoryController.java b/crmeb/src/main/java/com/zbkj/crmeb/category/controller/CategoryController.java
index 65d95266..08b0000f 100644
--- a/crmeb/src/main/java/com/zbkj/crmeb/category/controller/CategoryController.java
+++ b/crmeb/src/main/java/com/zbkj/crmeb/category/controller/CategoryController.java
@@ -64,6 +64,12 @@ import java.util.List;
@RequestMapping(value = "/save", method = RequestMethod.POST)
public CommonResult save(@Validated CategoryRequest categoryRequest){
Category category = new Category();
+
+ //检测标题是否存在
+ if(categoryService.checkName(categoryRequest.getName(), category.getType()) > 0){
+ throw new CrmebException("此分类已存在");
+ }
+
BeanUtils.copyProperties(categoryRequest, category);
category.setPath(categoryService.getPathByPId(category.getPid()));
category.setExtra(systemAttachmentService.clearPrefix(category.getExtra()));
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/category/service/CategoryService.java b/crmeb/src/main/java/com/zbkj/crmeb/category/service/CategoryService.java
index 773cdfce..e1118895 100644
--- a/crmeb/src/main/java/com/zbkj/crmeb/category/service/CategoryService.java
+++ b/crmeb/src/main/java/com/zbkj/crmeb/category/service/CategoryService.java
@@ -36,4 +36,6 @@ public interface CategoryService extends IService {
boolean update(CategoryRequest request, Integer id);
List getChildVoListByPid(Integer pid);
+
+ int checkName(String name, Integer type);
}
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/category/service/impl/CategoryServiceImpl.java b/crmeb/src/main/java/com/zbkj/crmeb/category/service/impl/CategoryServiceImpl.java
index b7ef56a7..c74ffd12 100644
--- a/crmeb/src/main/java/com/zbkj/crmeb/category/service/impl/CategoryServiceImpl.java
+++ b/crmeb/src/main/java/com/zbkj/crmeb/category/service/impl/CategoryServiceImpl.java
@@ -341,5 +341,21 @@ public class CategoryServiceImpl extends ServiceImpl impl
objectQueryWrapper.like("path", "/"+pid+"/");
return dao.selectList(objectQueryWrapper);
}
+
+ /**
+ * 检测分类码是否存在
+ * @param name String 分类名
+ * @param type int 类型
+ * @author Mr.Zhang
+ * @since 2020-04-16
+ * @return int
+ */
+ @Override
+ public int checkName(String name, Integer type) {
+ LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>();
+ lambdaQueryWrapper.eq(Category::getName, name)
+ .eq(Category::getType, type);
+ return dao.selectCount(lambdaQueryWrapper);
+ }
}
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/front/controller/StoreOrderController.java b/crmeb/src/main/java/com/zbkj/crmeb/front/controller/StoreOrderController.java
index f49fdcad..40b141b4 100644
--- a/crmeb/src/main/java/com/zbkj/crmeb/front/controller/StoreOrderController.java
+++ b/crmeb/src/main/java/com/zbkj/crmeb/front/controller/StoreOrderController.java
@@ -1,6 +1,5 @@
package com.zbkj.crmeb.front.controller;
-import com.common.CommonPage;
import com.common.CommonResult;
import com.common.PageParamRequest;
import com.utils.CrmebUtil;
@@ -9,7 +8,6 @@ import com.zbkj.crmeb.front.response.ConfirmOrderResponse;
import com.zbkj.crmeb.front.service.OrderService;
import com.zbkj.crmeb.front.vo.OrderAgainVo;
import com.zbkj.crmeb.store.request.StoreProductReplyAddRequest;
-import com.zbkj.crmeb.store.response.StoreOrderListResponse;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -21,8 +19,6 @@ import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import java.util.List;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
/**
* @Classname StoreOrderController
@@ -205,7 +201,6 @@ public class StoreOrderController {
@ApiOperation(value = "退款订单验证")
@RequestMapping(value = "/refund/verify", method = RequestMethod.POST)
public CommonResult