From 1980a44902bc179420448d96100e0c5477a93005 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 10 五月 2019 18:16:18 +0800
Subject: [PATCH] 增加二级分类标签

---
 fanli/src/main/java/com/yeshi/fanli/controller/admin/GoodsSubClassAdminController.java |   26 ++++++++++++++++++++++----
 1 files changed, 22 insertions(+), 4 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..82ac66f 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,11 @@
 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;
@@ -39,6 +42,9 @@
 	@Resource
 	private TaoBaoClassService taoBaoClassService;
 
+	@Resource
+	private GoodsSubClassLabelService goodsSubClassLabelService;
+
 	/**
 	 * 淇濆瓨淇℃伅
 	 * 
@@ -47,19 +53,26 @@
 	 * @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("锛�", ","));
+
+		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);
+						goodsSubClass, type, pid,map);
 			} else {
-				goodsSubClassService.saveObject(null, null, goodsSubClass, type, pid);
+				goodsSubClassService.saveObject(null, null, goodsSubClass, type, pid,map);
 			}
 
 			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("淇濆瓨鎴愬姛"));
@@ -212,6 +225,11 @@
 					}
 					goodsSubClass.setTaobaoCids(taobaoCids);
 				}
+
+				// 鏌ヨ鍒嗙被鏍囩
+				GoodsSubClassLabelMap map = goodsSubClassLabelService.selectBySubClassId(goodsSubClass.getId());
+				if (map != null)
+					goodsSubClass.setClassLabel(map.getLabel());
 			}
 
 			GsonBuilder gsonBuilder = new GsonBuilder();

--
Gitblit v1.8.0