From 652ba9630aa809af8d4bb33ce39fb2f5a29d8939 Mon Sep 17 00:00:00 2001
From: sjl <15627915168@163.com>
Date: Mon, 1 Feb 2021 09:07:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E3=80=90=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BA=E2=80=9C=E4=B8=8B=E7=BA=BF=E2=80=9D?=
 =?UTF-8?q?=E5=90=8E=EF=BC=8C=20=E8=A1=A8=E6=A0=BC=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E8=BF=98=E6=98=AF=E6=98=BE=E7=A4=BA=E2=80=9C?=
 =?UTF-8?q?=E6=AD=A3=E5=B8=B8=E2=80=9D=E3=80=91=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yami/shop/admin/controller/CategoryController.java   | 9 +++++++++
 .../src/main/resources/mapper/CategoryMapper.xml         | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/CategoryController.java b/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/CategoryController.java
index 6081ca6..ebe1e28 100644
--- a/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/CategoryController.java
+++ b/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/CategoryController.java
@@ -109,6 +109,15 @@ public class CategoryController {
 		if(categoryName != null){
 			throw new YamiShopBindException("类目名称已存在！");
 		}
+		Category categoryDB = categoryService.getById(category.getCategoryId());
+		// 如果从下线改成正常，则需要判断上级的状态
+		if (Objects.equals(categoryDB.getStatus(),0) && Objects.equals(category.getStatus(),1) && !Objects.equals(category.getParentId(),0L)){
+			Category parentCategory = categoryService.getOne(new LambdaQueryWrapper<Category>().eq(Category::getCategoryId, category.getParentId()));
+			if(Objects.isNull(parentCategory) || Objects.equals(parentCategory.getStatus(),0)){
+				// 修改失败，上级分类不存在或者不为正常状态
+				throw new YamiShopBindException("修改失败，上级分类不存在或者不为正常状态");
+			}
+		}
 		categoryService.updateCategroy(category);
 		return ResponseEntity.ok().build();
 	}
diff --git a/yami-shop-service/src/main/resources/mapper/CategoryMapper.xml b/yami-shop-service/src/main/resources/mapper/CategoryMapper.xml
index adbbdd1..9966678 100644
--- a/yami-shop-service/src/main/resources/mapper/CategoryMapper.xml
+++ b/yami-shop-service/src/main/resources/mapper/CategoryMapper.xml
@@ -50,7 +50,7 @@
   </select>
 
   <select id="tableCategory" resultType="com.yami.shop.bean.model.Category">
-  	select category_id ,parent_id ,category_name,pic,seq from tz_category where shop_id = #{shopId} order by seq
+  	select category_id ,parent_id ,category_name,pic,seq,status from tz_category where shop_id = #{shopId} order by seq
   </select>
 
   <select id="listCategoryAndProdByShopId" resultMap="categoryProdMap">