Merge remote-tracking branch 'origin/master'

admin

2019-01-24 f617136cba7f851a32f6091d5adc3e80f0e224c2

 fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeApiUtil.java

@@ -324,10 +324,11 @@
               goods.setPayRate30(1);



            if (item.optBoolean("free_shipment"))

               goods.setFreeShipment(1);

               goods.setFreeShipment(1);


            if ("1".equalsIgnoreCase(item.optString("material_lib_type")))

               ;


            goodsList.add(goods);

         }

      }

@@ -891,10 +892,16 @@
   private static TaoBaoGoodsBrief parseWuLiaoItem(JSONObject item) {

      TaoBaoGoodsBrief goods = new TaoBaoGoodsBrief();

      goods.setPictUrl(item.optString("pict_url"));

		
      if (!StringUtil.isNullOrEmpty(item.optString("white_image"))) {

         goods.setPictUrlWhite(item.optString("white_image"));

      }

		
      goods.setAuctionId(item.optLong("num_iid"));

      goods.setAuctionUrl("https:" + item.optString("url"));

      goods.setBiz30day(item.optInt("volume"));

      goods.setCouponInfo(item.optString("coupon_info"));

		
      if (goods.getCouponInfo() != null)

         goods.setCouponInfo(goods.getCouponInfo().replace(".00", ""));



@@ -1495,9 +1502,9 @@
      map.put("relation_app", "common");

      JSONObject resultJSON = null;

      try {

         TaoKeAppInfo app = new TaoKeAppInfo();

         TaoKeAppInfo app = new TaoKeAppInfo();
         app.setAppKey(appKey);

         app.setAppSecret(appSecret);

         app.setAppSecret(appSecret);
         resultJSON = TaoKeBaseUtil.baseRequest(map, app);

      } catch (TaoKeApiException e) {

         e.printStackTrace();