From 18ef3cfe9992b3c1663c7bccb45279a4c6732245 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 28 十一月 2019 17:46:55 +0800
Subject: [PATCH] 假用户发布邀请码
---
fanli/src/main/java/com/yeshi/fanli/service/impl/goods/GoodsSubClassServiceImpl.java | 58 +++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 45 insertions(+), 13 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 d984973..adbb3f0 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
@@ -18,10 +18,14 @@
import com.yeshi.fanli.entity.accept.AcceptData;
import com.yeshi.fanli.entity.bus.clazz.GoodsClass;
import com.yeshi.fanli.entity.bus.clazz.GoodsSubClass;
-import com.yeshi.fanli.exception.GoodsSubClassException;
+import com.yeshi.fanli.entity.bus.clazz.GoodsSubClassLabel;
+import com.yeshi.fanli.entity.bus.clazz.GoodsSubClassLabelMap;
+import com.yeshi.fanli.exception.goods.GoodsSubClassException;
+import com.yeshi.fanli.service.inter.clazz.GoodsSubClassLabelService;
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.Constant;
import com.yeshi.fanli.util.StringUtil;
@Service
@@ -36,6 +40,9 @@
@Resource
private TaoBaoClassService taoBaoClassService;
+
+ @Resource
+ private GoodsSubClassLabelService goodsSubClassLabelService;
@Override
public int deleteByPrimaryKey(Long id) {
@@ -66,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());
@@ -122,13 +129,16 @@
}
@Override
- public void saveObject(MultipartFile file, MultipartFile file2, GoodsSubClass record, Integer type, Long pid)
- throws GoodsSubClassException, Exception {
+ public void saveObject(MultipartFile file, MultipartFile file2, GoodsSubClass record, Integer type, Long pid,
+ Long labelId) throws GoodsSubClassException, Exception {
String name = record.getName();
if (name == null || name.trim().length() == 0) {
throw new GoodsSubClassException(1, "鍒嗙被鍚嶇О涓嶈兘涓虹┖");
}
+
+ if (StringUtil.isNullOrEmpty(record.getMonth()))
+ record.setMonth(null);
// 鍥剧墖涓婁紶
String picture = null;
@@ -188,6 +198,8 @@
record.setIosClick(0L);
record.setCreatetime(new Date());
record.setUpdatetime(new Date());
+ if (labelId != null)
+ record.setClassLabel(new GoodsSubClassLabel(labelId));
if (params == null || params.trim().length() == 0 || "null".equalsIgnoreCase(params)) {
// 鎼滅储鏉′欢:鏈夊埜銆佸湪鍞环20-200銆佺墰鐨櫍杞诲井
@@ -195,6 +207,13 @@
}
goodsSubClassMapper.insert(record);
+
+ if (labelId != null) {
+ GoodsSubClassLabelMap map = new GoodsSubClassLabelMap();
+ map.setGoodsSubClass(record);
+ map.setLabel(new GoodsSubClassLabel(labelId));
+ goodsSubClassLabelService.addSubClassLabelMap(map);
+ }
} else {
// 淇敼
@@ -205,7 +224,8 @@
if (picture != null && picture.trim().length() > 0) {
// 鍒犻櫎鑰佸浘
- removePicture(resultObj.getPicture());
+ if (!Constant.IS_TEST)
+ removePicture(resultObj.getPicture());
// 瀛樺偍鏂板浘
record.setPicture(picture);
} else {
@@ -214,7 +234,8 @@
if (pictureSecond != null && pictureSecond.trim().length() > 0) {
// 鍒犻櫎鑰佸浘
- removePicture(resultObj.getPictureSecond());
+ if (!Constant.IS_TEST)
+ removePicture(resultObj.getPictureSecond());
// 瀛樺偍鏂板浘
record.setPictureSecond(pictureSecond);
} else {
@@ -228,20 +249,31 @@
record.setAndroidClick(resultObj.getAndroidClick());
record.setCreatetime(resultObj.getCreatetime());
record.setUpdatetime(new Date());
+ if (labelId != null) {
+ GoodsSubClassLabelMap map = new GoodsSubClassLabelMap();
+ map.setGoodsSubClass(record);
+ map.setLabel(new GoodsSubClassLabel(labelId));
+ try {
+ goodsSubClassLabelService.addSubClassLabelMap(map);
+ } catch (Exception e) {
+ }
+ }
+
goodsSubClassMapper.updateByPrimaryKey(record);
}
// 淇濆瓨娣樺疂鍟嗗搧鍒嗙被id
String taobaoCids = record.getTaobaoCids();
+ List<Long> tbCidList = new ArrayList<>();
if (!StringUtil.isNullOrEmpty(taobaoCids) && !"null".equalsIgnoreCase(taobaoCids)) {
- List<Long> tbCidList = new ArrayList<>();
+
String[] sts = taobaoCids.split(",");
for (String st : sts) {
String cid = st.split("-")[st.split("-").length - 1];
tbCidList.add(Long.parseLong(cid));
}
- taoBaoClassService.saveSub(record.getId(), tbCidList);
}
+ taoBaoClassService.saveSub(record.getId(), tbCidList);
}
/**
@@ -306,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
@@ -325,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