Merge branch 'dev-hongbao'

admin

2019-01-03 5981b2cae7c20ec9021c8ccbe1a926f35f640210

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

@@ -15,6 +15,7 @@


import org.springframework.stereotype.Controller;

import org.springframework.web.bind.annotation.RequestMapping;

import org.yeshi.utils.JsonUtil;



import com.google.gson.Gson;

import com.google.gson.GsonBuilder;

@@ -31,6 +32,7 @@
import com.yeshi.fanli.service.inter.lable.LabelGoodsService;

import com.yeshi.fanli.service.inter.lable.LabelService;

import com.yeshi.fanli.service.inter.lable.QualityFactoryService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoGoodsUpdateService;

import com.yeshi.fanli.tag.PageEntity;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.MoneyBigDecimalUtil;

@@ -38,7 +40,6 @@
import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.taobao.TaoBaoUtil;

import com.yeshi.fanli.util.taobao.TaoKeApiUtil;

import org.yeshi.utils.JsonUtil;



@Controller

@RequestMapping("admin/new/api/v1/qualityFactory")

@@ -54,6 +55,9 @@
   private QualityFactoryService qualityFactoryService;

   @Resource

   private TaoBaoGoodsBriefService taoBaoGoodsBriefService;

   @Resource

   private TaoBaoGoodsUpdateService taoBaoGoodsUpdateService;

	
   @Resource

   private AdminUserService adminUserService;

   

@@ -619,7 +623,7 @@
            lg.setCreatetime(nowTime);

            lg.setTaoBaoGoodsBrief(taoBaoGoodsBrief);



            int insert = labelGoodsService.insert(lg);

            int insert = labelGoodsService.insertSelective(lg);

            if (insert > 0) {

               out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult("添加成功")));

            } else {

@@ -909,7 +913,6 @@
         JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("操作成功"));



      } catch (Exception e) {

         // TODO Auto-generated catch block

         JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("操作异常"));

         e.printStackTrace();

      }

@@ -944,7 +947,8 @@
         if (!StringUtil.isNullOrEmpty(pictUrl)) 

            taobao.setPictUrl(pictUrl);

         

         taoBaoGoodsBriefService.updateByPrimaryKeySelective(taobao);

         // 更新商品

         taoBaoGoodsUpdateService.getUpdateTaoBaoGoodsBrief(taobao);

         

         out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult("修改成功")));