From 0f32c1b89b22aec212eaa2d0edbe4af02c1a417b Mon Sep 17 00:00:00 2001
From: hupeng <guchengwuyue@163.com>
Date: Wed, 27 May 2020 18:44:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E6=96=B0=E5=A2=9E=E5=8F=AA?=
 =?UTF-8?q?=E8=83=BD=E9=80=89=E6=8B=A92=E7=BA=A7=E7=9A=84=E9=AA=8C?=
 =?UTF-8?q?=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../shop/service/YxStoreCategoryService.java  |  2 ++
 .../impl/YxStoreCategoryServiceImpl.java      | 22 ++++++++++++-------
 .../impl/YxStoreProductServiceImpl.java       |  6 +++++
 3 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxStoreCategoryService.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxStoreCategoryService.java
index 3c5f9cfa..ad836dd4 100644
--- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxStoreCategoryService.java
+++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxStoreCategoryService.java
@@ -49,4 +49,6 @@ public interface YxStoreCategoryService  extends BaseService<YxStoreCategory>{
 
 
     boolean checkCategory(int pid);
+
+    boolean checkProductCategory(int id);
 }
diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreCategoryServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreCategoryServiceImpl.java
index 76a13b74..832d5137 100644
--- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreCategoryServiceImpl.java
+++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreCategoryServiceImpl.java
@@ -143,6 +143,7 @@ public class YxStoreCategoryServiceImpl extends BaseServiceImpl<StoreCategoryMap
      * @param pid 父级id
      * @return boolean
      */
+    @Override
     public boolean checkCategory(int pid){
         if(pid == 0) return true;
         YxStoreCategory yxStoreCategory =  this.getOne(Wrappers.<YxStoreCategory>lambdaQuery()
@@ -152,13 +153,18 @@ public class YxStoreCategoryServiceImpl extends BaseServiceImpl<StoreCategoryMap
         return true;
     }
 
-//    public boolean checkCategory(int id,int pid){
-//        YxStoreCategory yxStoreCategory =  this.getOne(Wrappers.<YxStoreCategory>lambdaQuery()
-//                .eq(YxStoreCategory::getPid,pid));
-//
-//        // DateUtil.format()
-//
-//        return true;
-//    }
+    /**
+     * 检测商品分类必选选择二级
+     * @param id 分类id
+     * @return boolean
+     */
+    public boolean checkProductCategory(int id){
+        YxStoreCategory yxStoreCategory =  this.getOne(Wrappers.<YxStoreCategory>lambdaQuery()
+                .eq(YxStoreCategory::getId,id));
+
+        if(yxStoreCategory.getPid() == 0) return false;
+
+        return true;
+    }
 
 }
diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductServiceImpl.java
index e5c1dce6..58d7d0fa 100644
--- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductServiceImpl.java
+++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductServiceImpl.java
@@ -148,6 +148,9 @@ public class YxStoreProductServiceImpl extends BaseServiceImpl<StoreProductMappe
         if (storeProduct.getStoreCategory().getId() == null) {
             throw new BadRequestException("分类名称不能为空");
         }
+        boolean check = yxStoreCategoryService
+                .checkProductCategory(storeProduct.getStoreCategory().getId());
+        if(!check) throw new BadRequestException("商品分类必选选择二级");
         storeProduct.setCateId(storeProduct.getStoreCategory().getId().toString());
         this.save(storeProduct);
         return storeProduct;
@@ -300,6 +303,9 @@ public class YxStoreProductServiceImpl extends BaseServiceImpl<StoreProductMappe
     @Override
     public void updateProduct(YxStoreProduct resources) {
         if(resources.getStoreCategory() == null || resources.getStoreCategory().getId() == null) throw new BadRequestException("请选择分类");
+        boolean check = yxStoreCategoryService
+                .checkProductCategory(resources.getStoreCategory().getId());
+        if(!check) throw new BadRequestException("商品分类必选选择二级");
         resources.setCateId(resources.getStoreCategory().getId().toString());
         this.saveOrUpdate(resources);
     }