From 179b39401c406579a0d10c442a665aeb2802e931 Mon Sep 17 00:00:00 2001 From: yujian <yujian@123.com> Date: 星期一, 20 五月 2019 09:17:03 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- fanli/src/main/java/com/yeshi/fanli/controller/admin/GoodsSubClassAdminController.java | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 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..6ebb4f9 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.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; @@ -38,6 +40,9 @@ @Resource private TaoBaoClassService taoBaoClassService; + + @Resource + private GoodsSubClassLabelService goodsSubClassLabelService; /** * 淇濆瓨淇℃伅 @@ -212,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