From 626d711cb15896055c13fe344eb7fcc824589715 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期四, 19 十二月 2019 15:38:42 +0800
Subject: [PATCH] 帮助中心

---
 fanli/src/main/java/com/yeshi/fanli/controller/admin/GoodsSubClassAdminController.java |   24 +++++++++++++++++++-----
 1 files changed, 19 insertions(+), 5 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 7373ca7..d5e137e 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.homemodule.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;
@@ -39,6 +41,9 @@
 	@Resource
 	private TaoBaoClassService taoBaoClassService;
 
+	@Resource
+	private GoodsSubClassLabelService goodsSubClassLabelService;
+
 	/**
 	 * 淇濆瓨淇℃伅
 	 * 
@@ -47,16 +52,19 @@
 	 * @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("锛�", ","));
+
 		try {
 			// 1. 鍏堝垽鏂環ttpRequest 鏄惁鍚湁鏂囦欢绫诲瀷
 			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("淇濆瓨鎴愬姛"));
@@ -209,6 +217,12 @@
 					}
 					goodsSubClass.setTaobaoCids(taobaoCids);
 				}
+
+				// 鏌ヨ鏍囩
+				GoodsSubClassLabelMap map = goodsSubClassLabelService.selectBySubClassId(goodsSubClass.getId());
+				if (map != null)
+					goodsSubClass.setClassLabel(map.getLabel());
+
 			}
 
 			GsonBuilder gsonBuilder = new GsonBuilder();

--
Gitblit v1.8.0