设备消息BUG解决，品牌

admin

2019-06-14 1e92eff67b997263ecefa255c63eb6641c47b57f

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

@@ -72,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("操作异常")));

      }

   }

	


	


   /**

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

@@ -196,21 +152,16 @@
   @RequestMapping(value = "removeGoods")

   public void removeGoods(String callback, String ids, PrintWriter out) {

      try {



         Gson gson = new Gson();

         List<String> goodsIds = gson.fromJson(ids, new TypeToken<ArrayList<String>>() {}.getType());

         List<Long> goodsIds = gson.fromJson(ids, new TypeToken<ArrayList<Long>>() {}.getType());



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

            out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult("未检测到移除商品数据")));

         } else {

            // 商品移除精品库

            qualityFactoryService.deleteByGoodsId(goodsIds);

            // 清理商品所有标签

            labelGoodsService.deleteByGoodsId(goodsIds);



            out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult("移除成功")));

         }



            return;

         } 
			
         qualityFactoryService.deleteBatchByTaoBaoGoodsId(goodsIds);

         out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult("移除成功")));

      } catch (Exception e) {

         out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult("操作失败")));

         e.printStackTrace();

@@ -384,6 +335,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();

@@ -919,6 +877,9 @@
         if (!StringUtil.isNullOrEmpty(pictUrl)) 

            taobao.setPictUrl(pictUrl);

         

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

			
         // 更新商品

         taoBaoGoodsUpdateService.getUpdateTaoBaoGoodsBrief(taobao);