完善分类模块代码编写

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/controller/UmsMemberOriginController.java

@@ -53,7 +53,7 @@ public class UmsMemberOriginController {
                 list = EasyExcelUtil.readExcel(file, new UmsMemberOriginExcel(),2,2);
             } catch (IOException e) {
                 //e.printStackTrace();
-                throw new GlobalException(1,"上传文件错误");
+                throw new GlobalException(1,"上传文件错误!");
             }
             if(list != null && list.size() > 0){
                 for(Object obj : list){

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/controller/UploadCompanyInfoAndProductController.java

@@ -488,7 +488,7 @@ public class UploadCompanyInfoAndProductController {
                 list = EasyExcelUtil.readExcel(file, new UmsMemberOriginExcel(),2,2);
             } catch (IOException e) {
                 //e.printStackTrace();
-                throw new GlobalException(1,"上传文件错误");
+                throw new GlobalException(1,"上传文件错误!");
             }
             if(list != null && list.size() > 0){
                 for(Object obj : list){
@@ -550,7 +550,7 @@ public class UploadCompanyInfoAndProductController {
                 list = EasyExcelUtil.readExcel(file, new PmsProductExcel(),3,2);
             } catch (IOException e) {
                 //e.printStackTrace();
-                throw new GlobalException(1,"上传文件错误");
+                throw new GlobalException(1,"上传文件错误!");
             }
             if(list != null && list.size() > 0){
                 for(Object obj : list){

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/dao/PmsBrandDao.java

@@ -0,0 +1,12 @@
+package com.hwrj.cloud.admin.dao;
+
+import org.mapstruct.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface PmsBrandDao {
+    long insertCheck(String name);
+
+    long deleteCheck(List<Long> ids);
+}

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/dao/PmsProductCategoryDao.java

@@ -13,4 +13,6 @@ public interface PmsProductCategoryDao {
      * 获取商品分类及其子分类
      */
     List<PmsProductCategoryWithChildrenItem> listWithChildren();
+
+    long deleteCheck(Long id);
 }

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/dao/UmsMemberOriginDao.java

@@ -24,4 +24,6 @@ public interface UmsMemberOriginDao {
     List<UmsMemberOriginParam> list(UmsMemberOriginParam origin);
 
     UmsMemberOriginParam findById(long id);
+
+    long deleteOneDataCheck(long id);
 }

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/service/impl/OmsPreItemServiceImpl.java

@@ -5,6 +5,7 @@ import com.hwrj.cloud.admin.dao.OmsPreItemDao;
 import com.hwrj.cloud.admin.model.OmsPreItem;
 import com.hwrj.cloud.admin.service.OmsPreItemService;
 import com.hwrj.cloud.admin.util.CurrUserUtil;
+import com.hwrj.cloud.common.exception.GlobalException;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/service/impl/PmsBrandServiceImpl.java

@@ -1,6 +1,7 @@
 package com.hwrj.cloud.admin.service.impl;
 
 import com.github.pagehelper.PageHelper;
+import com.hwrj.cloud.admin.dao.PmsBrandDao;
 import com.hwrj.cloud.admin.dto.PmsBrandParam;
 import com.hwrj.cloud.admin.mapper.PmsBrandMapper;
 import com.hwrj.cloud.admin.mapper.PmsProductMapper;
@@ -9,11 +10,13 @@ import com.hwrj.cloud.admin.model.PmsBrandExample;
 import com.hwrj.cloud.admin.model.PmsProduct;
 import com.hwrj.cloud.admin.model.PmsProductExample;
 import com.hwrj.cloud.admin.service.PmsBrandService;
+import com.hwrj.cloud.common.exception.GlobalException;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -27,6 +30,9 @@ public class PmsBrandServiceImpl implements PmsBrandService {
     @Autowired
     private PmsProductMapper productMapper;
 
+    @Autowired
+    private PmsBrandDao pmsBrandDao;
+
     @Override
     public List<PmsBrand> listAllBrand() {
         return brandMapper.selectByExample(new PmsBrandExample());
@@ -40,6 +46,10 @@ public class PmsBrandServiceImpl implements PmsBrandService {
         if (StringUtils.isEmpty(pmsBrand.getFirstLetter())) {
             pmsBrand.setFirstLetter(pmsBrand.getName().substring(0, 1));
         }
+        long i = pmsBrandDao.insertCheck(pmsBrand.getName());
+        if(i>0){
+            throw new GlobalException("该品牌已存在,无法新增!");
+        }
         return brandMapper.insertSelective(pmsBrand);
     }
 
@@ -63,14 +73,26 @@ public class PmsBrandServiceImpl implements PmsBrandService {
 
     @Override
     public int deleteBrand(Long id) {
+        long i = pmsBrandDao.deleteCheck(Arrays.asList(id));
+        if(i>0){
+            throw new GlobalException("商品数据绑定改品牌，无法删除!");
+        }
         return brandMapper.deleteByPrimaryKey(id);
     }
 
     @Override
     public int deleteBrand(List<Long> ids) {
-        PmsBrandExample pmsBrandExample = new PmsBrandExample();
-        pmsBrandExample.createCriteria().andIdIn(ids);
-        return brandMapper.deleteByExample(pmsBrandExample);
+        if(ids.size()>0){
+            long i = pmsBrandDao.deleteCheck(ids);
+            if(i>0){
+                throw new GlobalException("商品数据绑定改品牌，无法删除!");
+            }
+            PmsBrandExample pmsBrandExample = new PmsBrandExample();
+            pmsBrandExample.createCriteria().andIdIn(ids);
+            return brandMapper.deleteByExample(pmsBrandExample);
+        }else {
+            throw new GlobalException("请选择你要删除的商品!");
+        }
     }
 
     @Override

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/service/impl/PmsProductCategoryServiceImpl.java

@@ -10,6 +10,7 @@ import com.hwrj.cloud.admin.mapper.PmsProductCategoryMapper;
 import com.hwrj.cloud.admin.mapper.PmsProductMapper;
 import com.hwrj.cloud.admin.model.*;
 import com.hwrj.cloud.admin.service.PmsProductCategoryService;
+import com.hwrj.cloud.common.exception.GlobalException;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -97,12 +98,19 @@ public class PmsProductCategoryServiceImpl implements PmsProductCategoryService
         PageHelper.startPage(pageNum, pageSize);
         PmsProductCategoryExample example = new PmsProductCategoryExample();
         example.setOrderByClause("sort desc");
+        example.setOrderByClause("id desc");
         example.createCriteria().andParentIdEqualTo(parentId);
         return productCategoryMapper.selectByExample(example);
     }
+    @Autowired
+    private PmsProductCategoryDao pmsProductCategoryDao;
 
     @Override
     public int delete(Long id) {
+        long i =  pmsProductCategoryDao.deleteCheck(id);
+        if(i>0){
+            throw new GlobalException("你选择数据已被其他数据引用无法删除！");
+        }
         return productCategoryMapper.deleteByPrimaryKey(id);
     }
 

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/service/impl/PmsProductServiceImpl.java

@@ -340,7 +340,7 @@ public class PmsProductServiceImpl implements PmsProductService {
         if(deleteStatus.intValue() == 1){
             long i =  pmsProductDao.check(ids);
             if(i>0){
-                throw new GlobalException("你删除的商品产生预购订单！无法删除");
+                throw new GlobalException("你删除的商品产生预购订单,无法删除!");
             }
         }
         PmsProduct record = new PmsProduct();

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/service/impl/UmsCompanyInfoServiceImpl.java

@@ -214,7 +214,7 @@ public class UmsCompanyInfoServiceImpl implements UmsCompanyService {
     @Override
     public void updateCompanyFile(UmsCompanyFile umsCompanyFile) {
         if (StringUtils.isEmpty(umsCompanyFile.getId())){
-            throw new GlobalException("缺失修改主体");
+            throw new GlobalException("缺失修改主体!");
         }
         umsCompanyFile.setUpdateTime(new Date());
         umsCompanyFileMapper.updateByPrimaryKeySelective(umsCompanyFile);
@@ -223,7 +223,7 @@ public class UmsCompanyInfoServiceImpl implements UmsCompanyService {
     @Override
     public void deleteCompanyFile(Long shopId, Long userId) {
         if (shopId == null){
-            throw  new GlobalException("缺失删除主体");
+            throw  new GlobalException("缺失删除主体!");
         }
         UmsCompanyFile umsCompanyFile = new UmsCompanyFile();
         umsCompanyFile.setId(shopId);
@@ -236,7 +236,7 @@ public class UmsCompanyInfoServiceImpl implements UmsCompanyService {
     @Override
     public void updateCompanyShop(UmsCompanyShop umsCompanyShop) {
         if (StringUtils.isEmpty(umsCompanyShop.getId())){
-            throw new GlobalException("缺失修改主体");
+            throw new GlobalException("缺失修改主体!");
         }
         umsCompanyShop.setUpdateTime(new Date());
         umsCompanyShopMapper.updateByPrimaryKeySelective(umsCompanyShop);

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/service/impl/UmsMemberOriginServiceImpl.java

@@ -197,6 +197,10 @@ public class UmsMemberOriginServiceImpl implements UmsMemberOriginService {
 
     @Override
     public int delete(long id) {
+        long i = umsMemberOriginDao.deleteOneDataCheck(id);
+        if(i>0){
+            throw new GlobalException("该生产地以绑定商品！无法删除");
+        }
         UmsMemberOrigin origin = new UmsMemberOrigin();
         origin.setId(id);
         origin.setState(2);

forest-admin/admin-server/src/main/resources/bootstrap.yml

@@ -9,13 +9,10 @@ spring:
   cloud:
     nacos:
       discovery:
-        server-addr: 172.16.90.3:8898
+        server-addr: 172.16.90.8:8898
       config:
-        server-addr: 172.16.90.3:8898
+        server-addr: 172.16.90.8:8898
         prefix: forest-admin
         file-extension: yaml
-
         #添加共享配置
-
-        shared-dataids: forest-common.yml
-
+        shared-dataids: forest-common.yml

forest-admin/admin-server/src/main/resources/dao/OmsPreItemDao.xml

@@ -64,4 +64,5 @@
             </if>
     </select>
 
+
 </mapper>

forest-admin/admin-server/src/main/resources/dao/PmsBrandDao.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hwrj.cloud.admin.dao.PmsBrandDao">
+
+
+
+    <select id="insertCheck" resultType="java.lang.Long">
+        SELECT
+            COUNT(0)
+        FROM
+            pms_brand a
+        WHERE
+            1 = 1
+        AND a.`name` =  #{name}
+    </select>
+
+    <delete id="deleteCheck">
+        SELECT
+        COUNT(0)
+        FROM
+        pms_product a
+        WHERE
+        a.delete_status = 0
+        AND a.brand_id in
+        <foreach collection="ids" item="id" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

forest-admin/admin-server/src/main/resources/dao/PmsProductCategoryDao.xml

@@ -6,6 +6,7 @@
         <collection property="children" resultMap="com.hwrj.cloud.admin.mapper.PmsProductCategoryMapper.BaseResultMap"
                     columnPrefix="child_"></collection>
     </resultMap>
+
     <select id="listWithChildren" resultMap="listWithChildrenMap">
         select
             c1.id,
@@ -15,4 +16,41 @@
         from pms_product_category c1 left join pms_product_category c2 on c1.id = c2.parent_id
         where c1.parent_id = 0
     </select>
+
+    <select id="deleteCheck" resultType="java.lang.Long">
+        SELECT
+            SUM(tmp.renum)
+        FROM
+            (
+                (
+                    SELECT
+                        COUNT(0) AS renum
+                    FROM
+                        pms_product a
+                    WHERE
+                        a.delete_status = 0
+                    AND a.product_big_category_id = #{id}
+                )
+                UNION ALL
+                    (
+                        SELECT
+                            COUNT(0) AS renum
+                        FROM
+                            pms_product a
+                        WHERE
+                            a.delete_status = 0
+                        AND a.product_category_id = #{id}
+                    )
+                UNION ALL
+                    (
+                        SELECT
+                            COUNT(0) AS renum
+                        FROM
+                            pms_product_category a
+                        WHERE
+                            1 = 1
+                        AND a.parent_id = #{id}
+                    )
+            ) tmp
+    </select>
 </mapper>

forest-admin/admin-server/src/main/resources/dao/UmsMemberOriginDao.xml

@@ -50,6 +50,8 @@
         img_url, video_url, vr_url, camera_url, summary, remark
     </sql>
 
+
+
     <!-- 检验是否存在  lym -->
     <select id="isExist" parameterType="com.hwrj.cloud.admin.model.UmsMemberOrigin" resultType="int">
         SELECT COUNT(*) FROM ums_member_origin WHERE state = 0
@@ -84,4 +86,14 @@
         WHERE state = 0
         AND id = #{id,jdbcType=BIGINT}
     </select>
+
+    <select id="deleteOneDataCheck" resultType="java.lang.Long">
+        SELECT
+            COUNT(0)
+        FROM
+            pms_product a
+        WHERE
+            a.delete_status = 0
+        AND a.place_of_production_id = #{id}
+    </select>
 </mapper>

sql/更新sql.sql

@@ -71,3 +71,16 @@ ALTER TABLE `oms_pre_item` ADD INDEX idx_push_id ( `push_id` );
 # 生产地id索引
 ALTER TABLE `oms_pre_item` ADD INDEX idx_origin_id ( `origin_id` );
 
+
+# 产品品牌id索引
+ALTER TABLE `pms_product` ADD INDEX idx_brand_id ( `brand_id` );
+
+# 产品产品大类标识索引
+ALTER TABLE `pms_product` ADD INDEX idx_product_big_category_id ( `product_big_category_id` );
+
+# 产品产品类别标识索引
+ALTER TABLE `pms_product` ADD INDEX idx_product_category_id ( `product_category_id` );
+
+# 产品生产地id索引
+ALTER TABLE `pms_product` ADD INDEX idx_place_of_production_id( `place_of_production_id` );
+