From 6fe4d1dad51f2d1cb2609d1fedeeac91cdfa5fec Mon Sep 17 00:00:00 2001
From: liujiang <569804566@qq.com>
Date: Tue, 27 May 2025 10:59:58 +0800
Subject: [PATCH] =?UTF-8?q?master=EF=BC=9A=E7=B3=BB=E7=BB=9F=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB=E8=B0=83=E6=95=B4=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/SysProductCategoryController.java  |  2 +-
 .../web/controller/xkt/WebsiteController.java |  4 ---
 .../java/com/ruoyi/quartz/task/XktTask.java   |  4 +--
 .../system/SysProductCategoryMapper.xml       |  2 +-
 .../ruoyi/xkt/domain}/SysProductCategory.java |  2 +-
 .../xkt}/mapper/SysProductCategoryMapper.java |  4 +--
 .../service/ISysProductCategoryService.java   |  2 +-
 .../service/impl/StoreProductServiceImpl.java |  2 +-
 .../impl/SysProductCategoryServiceImpl.java   | 25 ++++++++++++++++---
 9 files changed, 30 insertions(+), 17 deletions(-)
 rename {ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity => xkt/src/main/java/com/ruoyi/xkt/domain}/SysProductCategory.java (96%)
 rename {ruoyi-system/src/main/java/com/ruoyi/system => xkt/src/main/java/com/ruoyi/xkt}/mapper/SysProductCategoryMapper.java (81%)
 rename {ruoyi-system/src/main/java/com/ruoyi/system => xkt/src/main/java/com/ruoyi/xkt}/service/ISysProductCategoryService.java (98%)
 rename {ruoyi-system/src/main/java/com/ruoyi/system => xkt/src/main/java/com/ruoyi/xkt}/service/impl/SysProductCategoryServiceImpl.java (89%)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProductCategoryController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProductCategoryController.java
index 10433892b..e0d04d545 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProductCategoryController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProductCategoryController.java
@@ -11,7 +11,7 @@ import com.ruoyi.common.core.domain.vo.productCategory.ProdCateVO;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.system.domain.dto.productCategory.ProdCateDTO;
 import com.ruoyi.system.domain.dto.productCategory.ProdCateListDTO;
-import com.ruoyi.system.service.ISysProductCategoryService;
+import com.ruoyi.xkt.service.ISysProductCategoryService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/WebsiteController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/WebsiteController.java
index a41296d71..2d9b3d600 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/WebsiteController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/WebsiteController.java
@@ -3,11 +3,7 @@ package com.ruoyi.web.controller.xkt;
 import cn.hutool.core.bean.BeanUtil;
 import com.ruoyi.common.core.controller.XktBaseController;
 import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.domain.vo.productCategory.ProdCateListResVO;
-import com.ruoyi.common.core.domain.vo.productCategory.ProdCateListVO;
 import com.ruoyi.common.core.page.Page;
-import com.ruoyi.system.domain.dto.productCategory.ProdCateListDTO;
-import com.ruoyi.system.service.ISysProductCategoryService;
 import com.ruoyi.web.controller.xkt.vo.advertRound.app.category.APPCateVO;
 import com.ruoyi.web.controller.xkt.vo.advertRound.app.index.APPIndexHotSaleRightFixVO;
 import com.ruoyi.web.controller.xkt.vo.advertRound.app.index.APPIndexMidBrandVO;
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/XktTask.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/XktTask.java
index 1972c7b2c..13aa670ec 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/XktTask.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/XktTask.java
@@ -12,13 +12,13 @@ import com.ruoyi.common.constant.CacheConstants;
 import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.constant.HttpStatus;
 import com.ruoyi.common.core.domain.SimpleEntity;
-import com.ruoyi.common.core.domain.entity.SysProductCategory;
+import com.ruoyi.xkt.domain.SysProductCategory;
 import com.ruoyi.common.core.redis.RedisCache;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.framework.es.EsClientWrapper;
 import com.ruoyi.framework.notice.fs.FsNotice;
-import com.ruoyi.system.mapper.SysProductCategoryMapper;
+import com.ruoyi.xkt.mapper.SysProductCategoryMapper;
 import com.ruoyi.xkt.domain.*;
 import com.ruoyi.xkt.dto.account.WithdrawPrepareResult;
 import com.ruoyi.xkt.dto.dailySale.DailySaleCusDTO;
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysProductCategoryMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysProductCategoryMapper.xml
index 4f2bf74ad..ba53ebc68 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysProductCategoryMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysProductCategoryMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.system.mapper.SysProductCategoryMapper">
+<mapper namespace="com.ruoyi.xkt.mapper.SysProductCategoryMapper">
 
     <select id="getParentCate" parameterType="Long" resultType="com.ruoyi.system.domain.dto.productCategory.ProdCateDTO">
         SELECT
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysProductCategory.java b/xkt/src/main/java/com/ruoyi/xkt/domain/SysProductCategory.java
similarity index 96%
rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysProductCategory.java
rename to xkt/src/main/java/com/ruoyi/xkt/domain/SysProductCategory.java
index a098cb25c..89fbbdf30 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysProductCategory.java
+++ b/xkt/src/main/java/com/ruoyi/xkt/domain/SysProductCategory.java
@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.domain.entity;
+package com.ruoyi.xkt.domain;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.ruoyi.common.annotation.Excel;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysProductCategoryMapper.java b/xkt/src/main/java/com/ruoyi/xkt/mapper/SysProductCategoryMapper.java
similarity index 81%
rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysProductCategoryMapper.java
rename to xkt/src/main/java/com/ruoyi/xkt/mapper/SysProductCategoryMapper.java
index a18ef3d7d..ff30a51f5 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysProductCategoryMapper.java
+++ b/xkt/src/main/java/com/ruoyi/xkt/mapper/SysProductCategoryMapper.java
@@ -1,8 +1,8 @@
-package com.ruoyi.system.mapper;
+package com.ruoyi.xkt.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ruoyi.common.core.domain.entity.SysProductCategory;
 import com.ruoyi.system.domain.dto.productCategory.ProdCateDTO;
+import com.ruoyi.xkt.domain.SysProductCategory;
 
 /**
  * 商品分类 数据层
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysProductCategoryService.java b/xkt/src/main/java/com/ruoyi/xkt/service/ISysProductCategoryService.java
similarity index 98%
rename from ruoyi-system/src/main/java/com/ruoyi/system/service/ISysProductCategoryService.java
rename to xkt/src/main/java/com/ruoyi/xkt/service/ISysProductCategoryService.java
index b75d7e93c..c8102120a 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysProductCategoryService.java
+++ b/xkt/src/main/java/com/ruoyi/xkt/service/ISysProductCategoryService.java
@@ -1,4 +1,4 @@
-package com.ruoyi.system.service;
+package com.ruoyi.xkt.service;
 
 import com.ruoyi.system.domain.dto.productCategory.AppHomeProdCateListResDTO;
 import com.ruoyi.system.domain.dto.productCategory.ProdCateDTO;
diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductServiceImpl.java
index 234567046..b5b4255ad 100644
--- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductServiceImpl.java
+++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductServiceImpl.java
@@ -23,7 +23,7 @@ import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.framework.es.EsClientWrapper;
 import com.ruoyi.system.domain.dto.productCategory.ProdCateDTO;
-import com.ruoyi.system.mapper.SysProductCategoryMapper;
+import com.ruoyi.xkt.mapper.SysProductCategoryMapper;
 import com.ruoyi.xkt.domain.*;
 import com.ruoyi.xkt.dto.es.ESProductDTO;
 import com.ruoyi.xkt.dto.picture.ProductPicSyncDTO;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysProductCategoryServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/SysProductCategoryServiceImpl.java
similarity index 89%
rename from ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysProductCategoryServiceImpl.java
rename to xkt/src/main/java/com/ruoyi/xkt/service/impl/SysProductCategoryServiceImpl.java
index 57b81ee4c..36144c5e6 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysProductCategoryServiceImpl.java
+++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/SysProductCategoryServiceImpl.java
@@ -1,10 +1,9 @@
-package com.ruoyi.system.service.impl;
+package com.ruoyi.xkt.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.constant.HttpStatus;
-import com.ruoyi.common.core.domain.entity.SysProductCategory;
 import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.SecurityUtils;
@@ -12,8 +11,11 @@ import com.ruoyi.system.domain.dto.productCategory.AppHomeProdCateListResDTO;
 import com.ruoyi.system.domain.dto.productCategory.ProdCateDTO;
 import com.ruoyi.system.domain.dto.productCategory.ProdCateListDTO;
 import com.ruoyi.system.domain.dto.productCategory.ProdCateListResDTO;
-import com.ruoyi.system.mapper.SysProductCategoryMapper;
-import com.ruoyi.system.service.ISysProductCategoryService;
+import com.ruoyi.xkt.domain.StoreProduct;
+import com.ruoyi.xkt.domain.SysProductCategory;
+import com.ruoyi.xkt.mapper.StoreProductMapper;
+import com.ruoyi.xkt.mapper.SysProductCategoryMapper;
+import com.ruoyi.xkt.service.ISysProductCategoryService;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.ObjectUtils;
@@ -37,6 +39,7 @@ import static com.ruoyi.common.utils.SecurityUtils.getUsername;
 public class SysProductCategoryServiceImpl implements ISysProductCategoryService {
 
     final SysProductCategoryMapper prodCateMapper;
+    final StoreProductMapper storeProdMapper;
 
     /**
      * 新增商品分类
@@ -85,6 +88,20 @@ public class SysProductCategoryServiceImpl implements ISysProductCategoryService
         // TODO 是否为超级管理员
         this.isSuperAdmin();
 
+        // 是否有子分类
+        List<SysProductCategory> subCateList = this.prodCateMapper.selectList(new LambdaQueryWrapper<SysProductCategory>()
+                .eq(SysProductCategory::getParentId, prodCateId)
+                .eq(SysProductCategory::getDelFlag, Constants.UNDELETED));
+        List<Long> cateIdList = new ArrayList<Long>(){{
+            add(prodCateId);
+        }};
+        CollectionUtils.addAll(cateIdList, subCateList.stream().map(SysProductCategory::getId).collect(Collectors.toList()));
+        // 这些分类是否已绑定商品
+        List<StoreProduct> storeProductList = this.storeProdMapper.selectList(new LambdaQueryWrapper<StoreProduct>()
+                .in(StoreProduct::getProdCateId, cateIdList).eq(StoreProduct::getDelFlag, Constants.UNDELETED));
+        if (CollectionUtils.isNotEmpty(storeProductList)) {
+            throw new ServiceException("该分类下已绑定商品，不可删除!", HttpStatus.ERROR);
+        }
         SysProductCategory prodCate = Optional.ofNullable(this.prodCateMapper.selectOne(new LambdaQueryWrapper<SysProductCategory>()
                         .eq(SysProductCategory::getId, prodCateId).eq(SysProductCategory::getDelFlag, Constants.UNDELETED)))
                 .orElseThrow(() -> new ServiceException("商品分类不存在!", HttpStatus.ERROR));