From aa784ab65cc24caf45a4c38af7e5fdeb526eb393 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 14 五月 2019 14:49:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/GoodsSubClassAdminController.java | 26 ++++----------------------
1 files changed, 4 insertions(+), 22 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/GoodsSubClassAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/GoodsSubClassAdminController.java
index 82ac66f..b55d497 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/GoodsSubClassAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/GoodsSubClassAdminController.java
@@ -18,11 +18,8 @@
import com.google.gson.reflect.TypeToken;
import com.yeshi.fanli.entity.bus.clazz.GoodsClass;
import com.yeshi.fanli.entity.bus.clazz.GoodsSubClass;
-import com.yeshi.fanli.entity.bus.clazz.GoodsSubClassLabel;
-import com.yeshi.fanli.entity.bus.clazz.GoodsSubClassLabelMap;
import com.yeshi.fanli.entity.bus.clazz.TaoBaoClass;
import com.yeshi.fanli.exception.FloatADException;
-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;
@@ -42,9 +39,6 @@
@Resource
private TaoBaoClassService taoBaoClassService;
- @Resource
- private GoodsSubClassLabelService goodsSubClassLabelService;
-
/**
* 淇濆瓨淇℃伅
*
@@ -53,26 +47,19 @@
* @param out
*/
@RequestMapping(value = "save")
- public void save(String callback, GoodsSubClass goodsSubClass, Long pid, Integer type, Long labelId,
- HttpServletRequest request, PrintWriter out) {
+ public void save(String callback, GoodsSubClass goodsSubClass, Long pid, Integer type, HttpServletRequest request,
+ PrintWriter out) {
if (goodsSubClass.getTaobaoCids() != null)
goodsSubClass.setTaobaoCids(goodsSubClass.getTaobaoCids().replace("锛�", ","));
-
- GoodsSubClassLabelMap map = null;
- if (labelId != null) {
- map = new GoodsSubClassLabelMap();
- map.setLabel(new GoodsSubClassLabel(labelId));
- map.setOrderBy(0);
- }
try {
// 1. 鍏堝垽鏂環ttpRequest 鏄惁鍚湁鏂囦欢绫诲瀷
if (request instanceof MultipartHttpServletRequest) {
MultipartHttpServletRequest fileRequest = (MultipartHttpServletRequest) request;
goodsSubClassService.saveObject(fileRequest.getFile("file"), fileRequest.getFile("file2"),
- goodsSubClass, type, pid,map);
+ goodsSubClass, type, pid);
} else {
- goodsSubClassService.saveObject(null, null, goodsSubClass, type, pid,map);
+ goodsSubClassService.saveObject(null, null, goodsSubClass, type, pid);
}
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("淇濆瓨鎴愬姛"));
@@ -225,11 +212,6 @@
}
goodsSubClass.setTaobaoCids(taobaoCids);
}
-
- // 鏌ヨ鍒嗙被鏍囩
- GoodsSubClassLabelMap map = goodsSubClassLabelService.selectBySubClassId(goodsSubClass.getId());
- if (map != null)
- goodsSubClass.setClassLabel(map.getLabel());
}
GsonBuilder gsonBuilder = new GsonBuilder();
--
Gitblit v1.8.0