From f3e5745f67d885352691100336aacad8b064cd64 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期三, 17 四月 2019 16:00:59 +0800
Subject: [PATCH] Merge branch 'div'

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/goods/GoodsClassServiceImpl.java |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/GoodsClassServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/GoodsClassServiceImpl.java
index 99e2a11..00546e2 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/GoodsClassServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/GoodsClassServiceImpl.java
@@ -284,8 +284,8 @@
 	
 	
 	@Override
-	@Cacheable(value="classCache",key="'getClassListAllCache'")
-	public List<Map<String, Object>> getClassListAllCache() throws Exception {
+	@Cacheable(value="classCache",key="'getClassListAllCache'+#changePicture")
+	public List<Map<String, Object>> getClassListAllCache(boolean changePicture) throws Exception {
 
 		List<GoodsClass> goodsClassList = goodsClassMapper.getEffectiveClass();
 		if (goodsClassList == null || goodsClassList.size() == 0) {
@@ -312,10 +312,21 @@
 					GoodsSubClass goodsSubClass = iterator.next();
 					GoodsClass goodsClassInner = goodsSubClass.getRootClass();
 					if (goodsClass.getId() == goodsClassInner.getId()) {
+						
+						// 1.5.3鏂扮増鍥剧墖鏇挎崲
+						if (changePicture) {
+							String pictureSecond = goodsSubClass.getPictureSecond();
+							if (pictureSecond != null && pictureSecond.trim().length() > 0) {
+								goodsSubClass.setPicture(pictureSecond);
+							}
+						}
+						
 						// 瀵瑰簲涓嬪瓙鍒嗙被
 						subClassList.add(goodsSubClass);
 						iterator.remove();
 					}
+					
+					
 				}
 			}
 

--
Gitblit v1.8.0