From e96f95e1209a9097c8579895612d8cd90c07c5b0 Mon Sep 17 00:00:00 2001 From: hupeng Date: Tue, 7 Apr 2020 16:58:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E7=B1=BB=E8=BD=AF=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sql/yshop2.1升级sql.txt | 5 ++++- .../shop/service/impl/YxStoreCategoryServiceImpl.java | 4 ++-- .../java/co/yixiang/modules/shop/domain/YxStoreCategory.java | 5 +++++ .../modules/shop/repository/YxStoreCategoryRepository.java | 5 +++++ .../modules/shop/repository/YxStoreProductRepository.java | 2 +- .../shop/service/dto/YxStoreCategoryQueryCriteria.java | 3 +++ .../shop/service/impl/YxStoreCategoryServiceImpl.java | 4 ++-- 7 files changed, 22 insertions(+), 6 deletions(-) diff --git a/sql/yshop2.1升级sql.txt b/sql/yshop2.1升级sql.txt index 0e662a8a..f1c5dd19 100644 --- a/sql/yshop2.1升级sql.txt +++ b/sql/yshop2.1升级sql.txt @@ -22,4 +22,7 @@ ADD COLUMN `uid` int(0) UNSIGNED NULL DEFAULT 0 COMMENT '用户id' AFTER `module ADD COLUMN `invite_code` varchar(50) NULL DEFAULT '' COMMENT '邀请码' AFTER `uid` ALTER TABLE `yx_store_seckill` -ADD COLUMN `time_id` int(10) UNSIGNED NULL DEFAULT 0 COMMENT '时间段id' AFTER `start_time_date` \ No newline at end of file +ADD COLUMN `time_id` int(10) UNSIGNED NULL DEFAULT 0 COMMENT '时间段id' AFTER `start_time_date` + +ALTER TABLE `yx_store_category` +ADD COLUMN `is_del` tinyint(1) UNSIGNED NULL DEFAULT 0 COMMENT '删除状态' AFTER `add_time` \ No newline at end of file diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreCategoryServiceImpl.java b/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreCategoryServiceImpl.java index d7c20607..03d5881f 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreCategoryServiceImpl.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreCategoryServiceImpl.java @@ -52,7 +52,7 @@ public class YxStoreCategoryServiceImpl extends BaseServiceImpl getList() { QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq("is_show",1).orderByAsc("sort"); + wrapper.eq("is_show",1).eq("is_del",0).orderByAsc("sort"); List list = categoryMap.toDto(baseMapper.selectList(wrapper)); return TreeUtil.list2TreeConverter(list,0); } @@ -64,7 +64,7 @@ public class YxStoreCategoryServiceImpl extends BaseServiceImpl list = categoryMap.toDto(baseMapper.selectList(wrapper)); - System.out.println(TreeUtil.getChildList(list,new CateDTO())); + //System.out.println(TreeUtil.getChildList(list,new CateDTO())); return null; } } diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreCategory.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreCategory.java index c5f182b9..5730f8c4 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreCategory.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreCategory.java @@ -5,6 +5,7 @@ import cn.hutool.core.bean.copier.CopyOptions; import lombok.Data; import lombok.Getter; import lombok.Setter; +import org.hibernate.annotations.Where; import javax.persistence.*; import javax.validation.constraints.NotBlank; @@ -20,6 +21,7 @@ import java.util.Objects; @Getter @Setter @Table(name="yx_store_category") +//@Where(clause = "is_del = 0") public class YxStoreCategory implements Serializable { // 商品分类表ID @@ -58,6 +60,9 @@ public class YxStoreCategory implements Serializable { @Column(name = "add_time",nullable = false) private Integer addTime; + @Column(name = "is_del",insertable = false) + private Integer isDel; + public void copy(YxStoreCategory source){ BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); } diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxStoreCategoryRepository.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxStoreCategoryRepository.java index 806f5014..f68317aa 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxStoreCategoryRepository.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxStoreCategoryRepository.java @@ -3,6 +3,7 @@ package co.yixiang.modules.shop.repository; import co.yixiang.modules.shop.domain.YxStoreCategory; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; +import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; /** @@ -13,6 +14,10 @@ public interface YxStoreCategoryRepository extends JpaRepository findByStoreCategory(YxStoreCategory storeCategory); + List findByStoreCategoryAndIsDel(YxStoreCategory storeCategory,int isDel); } \ No newline at end of file diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreCategoryQueryCriteria.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreCategoryQueryCriteria.java index 8432734e..99bf3001 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreCategoryQueryCriteria.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreCategoryQueryCriteria.java @@ -13,4 +13,7 @@ public class YxStoreCategoryQueryCriteria{ // 模糊 @Query(type = Query.Type.INNER_LIKE) private String cateName; + + @Query + private Integer isDel = 0; } \ No newline at end of file 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 79b45567..6b5c1bea 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 @@ -111,11 +111,11 @@ public class YxStoreCategoryServiceImpl implements YxStoreCategoryService { if(storeCategory != null) throw new BadRequestException("请先删除子类"); YxStoreCategory category = new YxStoreCategory(); category.setId(id); - List storeProduct = yxStoreProductRepository.findByStoreCategory(category); + List storeProduct = yxStoreProductRepository.findByStoreCategoryAndIsDel(category,0); if(!storeProduct.isEmpty()) throw new BadRequestException("此分类下有商品,不能删除"); - yxStoreCategoryRepository.deleteById(id); + yxStoreCategoryRepository.delCategory(id); }