Merge remote-tracking branch 'origin/master'

yujian

2019-05-20 179b39401c406579a0d10c442a665aeb2802e931

 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();