Merge remote-tracking branch 'origin/master'

admin

2019-05-14 aa784ab65cc24caf45a4c38af7e5fdeb526eb393

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

@@ -11,8 +11,6 @@
import javax.annotation.Resource;

import javax.servlet.http.HttpServletRequest;



import net.sf.json.JSONObject;



import org.springframework.stereotype.Controller;

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

import org.yeshi.utils.JsonUtil;

@@ -27,7 +25,6 @@
import com.yeshi.fanli.entity.common.AdminUser;

import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;

import com.yeshi.fanli.exception.QualityFactoryException;

import com.yeshi.fanli.service.AdminUserService;

import com.yeshi.fanli.service.inter.goods.TaoBaoGoodsBriefService;

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

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

@@ -41,6 +38,8 @@
import com.yeshi.fanli.util.taobao.TaoBaoUtil;

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

import com.yeshi.fanli.vo.quality.QualityFactoryVO;



import net.sf.json.JSONObject;



@Controller

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

@@ -59,10 +58,6 @@
   @Resource

   private TaoBaoGoodsUpdateService taoBaoGoodsUpdateService;

   

   @Resource

   private AdminUserService adminUserService;

	
	


   public static final int SALES_ASC = 1;

   public static final int SALES_DESC = 2;

@@ -77,50 +72,6 @@
   public static final int PROPOR_ASC = 7;

   public static final int PROPOR_DESC = 8;



   /**

    * 批量添加标签 --- 淘宝

    * 
    * @param callback

    * @param label

    * @param request

    * @param out

    */

   @RequestMapping(value = "addBatch")

   public void addBatch(String callback, String auctionIds, String lableNames, HttpServletRequest request, PrintWriter out) {



      try {

         // 获取当前操作用户

         AdminUser admin = (AdminUser) request.getSession().getAttribute(Constant.SESSION_ADMIN);

         if (admin == null) {

            out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult("当前账户失效,请重新登陆。")));

            return;

         }



         if (StringUtil.isNullOrEmpty(auctionIds)) {

            out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult("请选择正确的商品入库")));

            return;

         }



         Gson gson = new Gson();

         List<Long> auctionIdList = gson.fromJson(auctionIds, new TypeToken<ArrayList<Long>>() {

         }.getType());

         if (auctionIdList == null || auctionIdList.size() == 0) {

            out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult("请选择正确的商品入库")));

            return;

         }



         qualityFactoryService.addBatch(auctionIdList,lableNames, admin);



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



      } catch (Exception e) {

         e.printStackTrace();

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

      }

   }

	


	


   /**

    * 保存修改精品库商品关联信息

@@ -389,6 +340,13 @@
            if (taoBaoGoodsBrief == null)

               continue; // 为空结束本次循环



				
            String auctionUrl = taoBaoGoodsBrief.getAuctionUrl();

            if (auctionUrl != null && auctionUrl.trim().length() > 0 && auctionUrl.contains("id=null")) {

               auctionUrl =auctionUrl.replace("id=null","id="+ taoBaoGoodsBrief.getAuctionId());

               taoBaoGoodsBrief.setAuctionUrl(auctionUrl);

            }

				
            Map<String, Object> map = new HashMap<String, Object>();

            

            BoutiqueAutoRule boutiqueAutoRule = selectionGoods.getBoutiqueAutoRule();

@@ -924,6 +882,9 @@
         if (!StringUtil.isNullOrEmpty(pictUrl)) 

            taobao.setPictUrl(pictUrl);

         

         if (!StringUtil.isNullOrEmpty(tb.getPictUrlWhite())) 
            taobao.setPictUrlWhite(tb.getPictUrlWhite());

			
         // 更新商品

         taoBaoGoodsUpdateService.getUpdateTaoBaoGoodsBrief(taobao);