From 3c4511d24e061e3e03a761dbb6f935ab25e3aced Mon Sep 17 00:00:00 2001
From: OPGame <1242479791@qq.com>
Date: Thu, 4 Jul 2019 14:23:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E4=BB=A3=E7=A0=81=E9=87=8F/?=
 =?UTF-8?q?=E8=B4=A8=E9=87=8F=E5=88=86=E6=9E=90=EF=BC=8C=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=8F=AF=E8=83=BD=E5=90=AB=E6=9C=89=E5=9D=8F=E5=91=B3=E9=81=93?=
 =?UTF-8?q?=E7=9A=84=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/yami/shop/admin/controller/BrandController.java  | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/BrandController.java b/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/BrandController.java
index 38729a2..68127e4 100644
--- a/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/BrandController.java
+++ b/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/BrandController.java
@@ -14,6 +14,7 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yami.shop.bean.model.Brand;
+import com.yami.shop.common.exception.YamiShopBindException;
 import com.yami.shop.common.util.PageParam;
 import com.yami.shop.service.BrandService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -65,10 +66,10 @@ public class BrandController {
      */
     @PostMapping
     @PreAuthorize("@pms.hasPermission('admin:brand:save')")
-    public ResponseEntity<?> save(@Valid Brand brand) {
+    public ResponseEntity<Void> save(@Valid Brand brand) {
         Brand dbBrand = brandService.getByBrandName(brand.getBrandName());
         if (dbBrand != null) {
-            return ResponseEntity.badRequest().body("该品牌名称已存在");
+            throw new YamiShopBindException("该品牌名称已存在");
         }
         brandService.save(brand);
         return ResponseEntity.ok().build();
@@ -79,10 +80,10 @@ public class BrandController {
      */
     @PutMapping
     @PreAuthorize("@pms.hasPermission('admin:brand:update')")
-    public ResponseEntity<?> update(@Valid Brand brand) {
+    public ResponseEntity<Void> update(@Valid Brand brand) {
         Brand dbBrand = brandService.getByBrandName(brand.getBrandName());
         if (dbBrand != null && !Objects.equals(dbBrand.getBrandId(), brand.getBrandId())) {
-            return ResponseEntity.badRequest().body("该品牌名称已存在");
+            throw new YamiShopBindException("该品牌名称已存在");
         }
         brandService.updateById(brand);
         return ResponseEntity.ok().build();