Merge remote-tracking branch 'origin/develop' into develop

kustomization/overlays/dev/kustomization.yaml

@@ -18,4 +18,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/pms
-  newTag: 099769d839fb5799fc0f6f82846ae1fb50d7bd08
+  newTag: 58dee479ce3f13d2891a5747c3df9f1b44ec1fa6

src/main/java/com/mmc/pms/common/ResultEnum.java

@@ -409,6 +409,7 @@ public enum ResultEnum implements BaseErrorInfoInterface {
 
     DEFAULT_DIRECTORY("3001", "默认目录不可删除或修改名称！"),
     THE_NAME_OF_A_CLASS_MUST_BE_UNIQUE("3002", "一级分类名称重复"),
+    THE_CURRENT_CATEGORY_IS_ASSOCIATED_WITH_GOODS("3004", "当前分类已经关联商品请先删除商品"),
     THE_NAME_OF_THE_SECONDARY_CLASS_MUST_BE_UNIQUE("3003", "同一级分类下面二级分类不能重复");
     /**
      * 错误码

src/main/java/com/mmc/pms/dao/category/CategoryDao.java

@@ -53,4 +53,8 @@ public interface CategoryDao {
     List<CategoryPrimaryDO> selectPrimaryList();
 
     List<CategorySubDO> selectCategorySubList(List<Integer> ids);
+
+    Integer selectSubMallGoods(Integer id);
+
+    Integer selectPrimary(Integer id);
 }

src/main/java/com/mmc/pms/service/category/impl/CategoryServiceImpl.java

@@ -49,8 +49,11 @@ public class CategoryServiceImpl implements CategoryService {
 
     @Override
     public ResultBody deletePrimaryCategory(Integer id) {
+        Integer integer = categoryDao.selectPrimary(id);
+        if (integer != 0) {
+            return ResultBody.error(ResultEnum.THE_CURRENT_CATEGORY_IS_ASSOCIATED_WITH_GOODS);
+        }
         categoryDao.deletePrimaryCategory(id);
-
         return ResultBody.success();
     }
 
@@ -91,6 +94,10 @@ public class CategoryServiceImpl implements CategoryService {
 
     @Override
     public ResultBody deleteSubCategory(Integer id) {
+        Integer integer = categoryDao.selectSubMallGoods(id);
+        if (integer != 0) {
+            return ResultBody.error(ResultEnum.THE_CURRENT_CATEGORY_IS_ASSOCIATED_WITH_GOODS);
+        }
         categoryDao.deleteSubCategory(id);
         return ResultBody.success();
     }

src/main/resources/mapper/category/CategoryDao.xml

@@ -213,4 +213,16 @@
         </where>
     </select>
 
+    <select id="selectSubMallGoods" resultType="java.lang.Integer">
+        select count(*)
+        from mall_goods
+        where category_sub_id = #{id}
+    </select>
+
+    <select id="selectPrimary" resultType="java.lang.Integer">
+        select count(*)
+        from mall_goods
+        where category_primary_id = #{id}
+    </select>
+
 </mapper>