From 9a24f2802a3d6fe3e82c05e52f2880d65ad04dcf Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期一, 29 四月 2019 08:59:47 +0800
Subject: [PATCH] Merge branch 'div_develop' into master_develop
---
fanli/src/main/java/com/yeshi/fanli/service/impl/goods/GoodsClassServiceImpl.java | 47 ++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 44 insertions(+), 3 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..903e4a1 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
@@ -9,10 +9,10 @@
import java.util.UUID;
import javax.annotation.Resource;
-import javax.transaction.Transactional;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
import org.yeshi.utils.tencentcloud.COSManager;
@@ -21,9 +21,11 @@
import com.yeshi.fanli.dao.mybatis.GoodsClassMapper;
import com.yeshi.fanli.entity.bus.clazz.GoodsClass;
import com.yeshi.fanli.entity.bus.clazz.GoodsSubClass;
+import com.yeshi.fanli.entity.bus.clazz.TaoBaoClass;
import com.yeshi.fanli.exception.GoodsClassException;
import com.yeshi.fanli.service.inter.goods.GoodsClassService;
import com.yeshi.fanli.service.inter.goods.GoodsSubClassService;
+import com.yeshi.fanli.service.inter.goods.TaoBaoClassService;
import com.yeshi.fanli.service.inter.lable.LabelClassService;
import com.yeshi.fanli.util.StringUtil;
@@ -39,6 +41,9 @@
@Resource
private LabelClassService labelClassService;
+ @Resource
+ private TaoBaoClassService taoBaoClassService;
+
public GoodsClass getGoodsClass(long id) {
return goodsClassMapper.selectByPrimaryKey(id);
@@ -112,6 +117,23 @@
// 鏍囩
int countlabel = labelClassService.getCountQueryByClassId(gclass.getId());
gclass.setCountlabel(countlabel);
+
+
+ List<TaoBaoClass> listTB = taoBaoClassService.listBySystemCid(0, Integer.MAX_VALUE, gclass.getId());
+ if (listTB == null || listTB.size() == 0) {
+ gclass.setTaobaoCids("");
+ } else {
+ String taobaoCids = "";
+ for (TaoBaoClass taoBaoClass: listTB) {
+ taobaoCids = taobaoCids + taoBaoClass.getCategoryName() + "-" + taoBaoClass.getCategoryId() + ",";
+ }
+
+ if (!StringUtil.isNullOrEmpty(taobaoCids)){
+ taobaoCids = taobaoCids.substring(0, taobaoCids.length()-1);
+ }
+ gclass.setTaobaoCids(taobaoCids);
+ }
+
}
return list;
}
@@ -122,6 +144,7 @@
@Override
+ @Transactional
public void saveObject(MultipartFile file, GoodsClass record) throws GoodsClassException, Exception{
String name = record.getName();
@@ -141,6 +164,7 @@
} else if (!StringUtil.isJson(params)) {
throw new GoodsClassException(1, "绛涢�夋潯浠堕潪JSON鏍煎紡");
}
+
Long id = record.getId();
@@ -188,6 +212,12 @@
record.setAndroidClick(resultObj.getAndroidClick());
record.setCreatetime(resultObj.getCreatetime());
goodsClassMapper.updateByPrimaryKey(record);
+ }
+
+ // 淇濆瓨娣樺疂鍟嗗搧鍒嗙被id
+ String taobaoCids = record.getTaobaoCids();
+ if (!StringUtil.isNullOrEmpty(taobaoCids) && !"null".equalsIgnoreCase(taobaoCids)) {
+ taoBaoClassService.save(record.getId(), taobaoCids);
}
}
@@ -284,8 +314,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 +342,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