From 455c7eddac87682e76d0168891be16a8ab1820d2 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 28 六月 2019 15:01:46 +0800
Subject: [PATCH] 增加二级分类的季节

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/goods/GoodsSubClassServiceImpl.java |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/GoodsSubClassServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/GoodsSubClassServiceImpl.java
index 0052f7b..cebc335 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/GoodsSubClassServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/GoodsSubClassServiceImpl.java
@@ -73,7 +73,7 @@
 	@Transactional
 	public void deleteByRootId(Long id) throws Exception {
 
-		List<GoodsSubClass> subClassList = goodsSubClassMapper.queryByRootId(id, null);
+		List<GoodsSubClass> subClassList = goodsSubClassMapper.queryByRootId(id, null, null);
 		if (subClassList != null && subClassList.size() > 0) {
 			for (GoodsSubClass goodsSubClass : subClassList) {
 				deleteSub(goodsSubClass.getId());
@@ -136,6 +136,9 @@
 		if (name == null || name.trim().length() == 0) {
 			throw new GoodsSubClassException(1, "鍒嗙被鍚嶇О涓嶈兘涓虹┖");
 		}
+
+		if (StringUtil.isNullOrEmpty(record.getMonth()))
+			record.setMonth(null);
 
 		// 鍥剧墖涓婁紶
 		String picture = null;
@@ -335,7 +338,7 @@
 
 	@Override
 	public List<GoodsSubClass> queryByRootId(Long rootId, Integer state) throws Exception {
-		return goodsSubClassMapper.queryByRootId(rootId, state);
+		return goodsSubClassMapper.queryByRootId(rootId, state, null);
 	}
 
 	@Override
@@ -354,14 +357,14 @@
 	}
 
 	@Override
-	public List<GoodsSubClass> getGoodsSecondClass(Long rootId, Integer state) throws Exception {
-		return goodsSubClassMapper.queryByRootId(rootId, state);
+	public List<GoodsSubClass> getGoodsSecondClass(Long rootId, Integer state, Integer month) throws Exception {
+		return goodsSubClassMapper.queryByRootId(rootId, state, month);
 	}
 
 	@Override
 	@Cacheable(value = "classCache", key = "'getSubClassCache-'+#rootId +'-'+#state")
-	public List<GoodsSubClass> getSubClassCache(Long rootId, Integer state) throws Exception {
-		return getGoodsSecondClass(rootId, state);
+	public List<GoodsSubClass> getSubClassCache(Long rootId, Integer state, Integer month) throws Exception {
+		return getGoodsSecondClass(rootId, state, month);
 	}
 
 	@Override

--
Gitblit v1.8.0