From efa2645b74ebfadc43ebe448370adb22aecc1ad7 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 14 五月 2019 11:14:09 +0800
Subject: [PATCH] Merge branch 'div_10'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/goods/GoodsSubClassServiceImpl.java | 20 ++------------------
1 files changed, 2 insertions(+), 18 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 4749d03..0a3b2d2 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,9 +18,7 @@
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.entity.bus.clazz.GoodsSubClassLabelMap;
import com.yeshi.fanli.exception.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;
@@ -39,9 +37,6 @@
@Resource
private TaoBaoClassService taoBaoClassService;
-
- @Resource
- private GoodsSubClassLabelService goodsSubClassLabelService;
@Override
public int deleteByPrimaryKey(Long id) {
@@ -128,8 +123,8 @@
}
@Override
- public void saveObject(MultipartFile file, MultipartFile file2, GoodsSubClass record, Integer type, Long pid,
- GoodsSubClassLabelMap labelMap) throws GoodsSubClassException, Exception {
+ public void saveObject(MultipartFile file, MultipartFile file2, GoodsSubClass record, Integer type, Long pid)
+ throws GoodsSubClassException, Exception {
String name = record.getName();
if (name == null || name.trim().length() == 0) {
@@ -201,11 +196,6 @@
}
goodsSubClassMapper.insert(record);
- if (labelMap != null) {
- labelMap.setCreateTime(new Date());
- labelMap.setGoodsSubClass(record);
- goodsSubClassLabelService.addSubClassLabelMap(labelMap);
- }
} else {
// 淇敼
@@ -242,12 +232,6 @@
record.setCreatetime(resultObj.getCreatetime());
record.setUpdatetime(new Date());
goodsSubClassMapper.updateByPrimaryKey(record);
-
- if (labelMap != null) {
- labelMap.setCreateTime(new Date());
- labelMap.setGoodsSubClass(record);
- goodsSubClassLabelService.addSubClassLabelMap(labelMap);
- }
}
// 淇濆瓨娣樺疂鍟嗗搧鍒嗙被id
--
Gitblit v1.8.0