Merge remote-tracking branch 'origin/master'

admin

2019-05-14 aa784ab65cc24caf45a4c38af7e5fdeb526eb393

 fanli/src/main/java/com/yeshi/fanli/controller/admin/GoodsSubClassAdminController.java

@@ -18,11 +18,8 @@
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;

@@ -42,9 +39,6 @@
   @Resource

   private TaoBaoClassService taoBaoClassService;



   @Resource

   private GoodsSubClassLabelService goodsSubClassLabelService;



   /**

    * 保存信息

    * 

@@ -53,26 +47,19 @@
    * @param out

    */

   @RequestMapping(value = "save")

   public void save(String callback, GoodsSubClass goodsSubClass, Long pid, Integer type, Long labelId,

         HttpServletRequest request, PrintWriter out) {

   public void save(String callback, GoodsSubClass goodsSubClass, Long pid, Integer type, 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. 先判断httpRequest 是否含有文件类型

         if (request instanceof MultipartHttpServletRequest) {

            MultipartHttpServletRequest fileRequest = (MultipartHttpServletRequest) request;

            goodsSubClassService.saveObject(fileRequest.getFile("file"), fileRequest.getFile("file2"),

                  goodsSubClass, type, pid,map);

                  goodsSubClass, type, pid);

         } else {

            goodsSubClassService.saveObject(null, null, goodsSubClass, type, pid,map);

            goodsSubClassService.saveObject(null, null, goodsSubClass, type, pid);

         }



         JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("保存成功"));

@@ -225,11 +212,6 @@
               }

               goodsSubClass.setTaobaoCids(taobaoCids);

            }



            // 查询分类标签

            GoodsSubClassLabelMap map = goodsSubClassLabelService.selectBySubClassId(goodsSubClass.getId());

            if (map != null)

               goodsSubClass.setClassLabel(map.getLabel());

         }



         GsonBuilder gsonBuilder = new GsonBuilder();