From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/GoodsSubClassAdminController.java | 57 +++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 37 insertions(+), 20 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 b55d497..1a9080c 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,8 +18,10 @@
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.GoodsSubClassLabelMap;
import com.yeshi.fanli.entity.bus.clazz.TaoBaoClass;
-import com.yeshi.fanli.exception.FloatADException;
+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;
@@ -39,6 +41,9 @@
@Resource
private TaoBaoClassService taoBaoClassService;
+ @Resource
+ private GoodsSubClassLabelService goodsSubClassLabelService;
+
/**
* 淇濆瓨淇℃伅
*
@@ -47,8 +52,8 @@
* @param out
*/
@RequestMapping(value = "save")
- public void save(String callback, GoodsSubClass goodsSubClass, Long pid, Integer type, HttpServletRequest request,
- PrintWriter out) {
+ public void save(String callback, GoodsSubClass goodsSubClass, Long pid, Integer type, Long labelId,
+ HttpServletRequest request, PrintWriter out) {
if (goodsSubClass.getTaobaoCids() != null)
goodsSubClass.setTaobaoCids(goodsSubClass.getTaobaoCids().replace("锛�", ","));
@@ -57,16 +62,36 @@
if (request instanceof MultipartHttpServletRequest) {
MultipartHttpServletRequest fileRequest = (MultipartHttpServletRequest) request;
goodsSubClassService.saveObject(fileRequest.getFile("file"), fileRequest.getFile("file2"),
- goodsSubClass, type, pid);
+ goodsSubClass, type, pid, labelId);
} else {
- goodsSubClassService.saveObject(null, null, goodsSubClass, type, pid);
+ goodsSubClassService.saveObject(null, null, goodsSubClass, type, pid, labelId);
}
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("淇濆瓨鎴愬姛"));
- } catch (FloatADException e) {
+ } catch (GoodsSubClassException e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
} catch (Exception e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("淇濆瓨澶辫触"));
+ e.printStackTrace();
+ }
+ }
+
+
+ /**
+ * 淇敼鐘舵��
+ * @param callback
+ * @param id
+ * @param out
+ */
+ @RequestMapping(value = "switchState")
+ public void switchState(String callback, Long id, PrintWriter out) {
+ try {
+ goodsSubClassService.switchState(id);
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎿嶄綔鎴愬姛"));
+ } catch (GoodsSubClassException e) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
+ } catch (Exception e) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔澶辫触"));
e.printStackTrace();
}
}
@@ -80,9 +105,7 @@
*/
@RequestMapping(value = "deleteBatch")
public void deleteBatch(String callback, String ids, PrintWriter out) {
-
Gson gson = new Gson();
-
try {
List<String> recordIds = gson.fromJson(ids, new TypeToken<ArrayList<String>>() {
}.getType());
@@ -94,7 +117,6 @@
goodsSubClassService.deleteByPrimaryKeyBatch(recordIds);
out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult("鍒犻櫎鎴愬姛")));
}
-
} catch (Exception e) {
out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父")));
e.printStackTrace();
@@ -111,7 +133,6 @@
*/
@RequestMapping(value = "removePicture")
public void removePicture(String callback, Long id, PrintWriter out) {
-
try {
GoodsSubClass goodsSubClass = goodsSubClassService.selectByPrimaryKey(id);
@@ -129,12 +150,10 @@
} else {
out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult("鍥剧墖鍒犻櫎鎴愬姛,鏁版嵁鏇存柊澶辫触")));
}
-
} catch (Exception e) {
e.printStackTrace();
out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父")));
}
-
}
/**
@@ -146,9 +165,7 @@
*/
@RequestMapping(value = "querySub")
public void querySub(String callback, Long pid, Integer type, PrintWriter out) {
-
try {
-
if (pid == null) {
out.print(JsonUtil.loadFalseResult("涓婄骇id涓虹┖"));
return;
@@ -212,6 +229,12 @@
}
goodsSubClass.setTaobaoCids(taobaoCids);
}
+
+ // 鏌ヨ鏍囩
+ GoodsSubClassLabelMap map = goodsSubClassLabelService.selectBySubClassId(goodsSubClass.getId());
+ if (map != null)
+ goodsSubClass.setClassLabel(map.getLabel());
+
}
GsonBuilder gsonBuilder = new GsonBuilder();
@@ -221,7 +244,6 @@
JSONObject data = new JSONObject();
data.put("subClassList", gson.toJson(goodsSubClassList));
out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(data)));
-
} catch (Exception e) {
e.printStackTrace();
out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父")));
@@ -236,7 +258,6 @@
*/
@RequestMapping(value = "queryOverSecond")
public void queryOverSecond(String callback, Long pid, PrintWriter out) {
-
try {
Integer state = null;
List<GoodsSubClass> goodsSubClassList = goodsSubClassService.queryByPid(pid, state);
@@ -253,7 +274,6 @@
JSONObject data = new JSONObject();
data.put("subClassList", gson.toJson(goodsSubClassList));
out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(data)));
-
} catch (Exception e) {
e.printStackTrace();
out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父")));
@@ -270,7 +290,6 @@
@RequestMapping(value = "saveOrder")
public void saveOrder(String callback, Long id, Integer type, Integer moveType, PrintWriter out) {
try {
-
if (moveType == null || (!moveType.equals(1) && !moveType.equals(-1))) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("浼犻�掔殑绫诲瀷涓嶆纭�"));
return;
@@ -306,9 +325,7 @@
resultObj.setUpdatetime(new Date());
goodsSubClassService.updateByPrimaryKeySelective(resultObj);
-
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎿嶄綔鎴愬姛"));
-
} catch (Exception e) {
e.printStackTrace();
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
--
Gitblit v1.8.0