Merge remote-tracking branch 'origin/master'

admin

2019-03-15 a8e45a802600ca1cde28fe8522a26635328bbd99

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

@@ -693,7 +693,10 @@
      tg.setBiz30day(tb.getBiz30day());

      tg.setSalesCount(TaoBaoUtil.getSaleCount(tb.getBiz30day()));

      tg.setTitle(tb.getTitle());

      tg.setPictUrl(TbImgUtil.getTBSize320Img(tb.getPictUrl()));

      if (!StringUtil.isNullOrEmpty(tb.getPictUrlWhite()))

         tg.setPictUrl(TbImgUtil.getTBSize320Img(tb.getPictUrlWhite()));

      else

         tg.setPictUrl(TbImgUtil.getTBSize320Img(tb.getPictUrl()));

      tg.setZkPrice(tb.getZkPrice());

      tg.setAuctionUrl(tb.getAuctionUrl());

      tg.setReservePrice(tb.getReservePrice());

@@ -1694,6 +1697,7 @@
      taoBaoGoods.setCouponStartFee(commonGoods.getCouponStartPrice());

      taoBaoGoods.setCouponTotalCount(commonGoods.getCouponTotalCount());

      taoBaoGoods.setPictUrl(commonGoods.getPicture());

      taoBaoGoods.setPictUrlWhite(commonGoods.getPictureWhite());

      taoBaoGoods.setSellerId(commonGoods.getSellerId());

      taoBaoGoods.setShopTitle(commonGoods.getSellerName());

      taoBaoGoods.setTitle(commonGoods.getTitle());

@@ -1715,13 +1719,14 @@
    * @param uid-用户ID

    * @return

    */

   public static String getTaoBaoUnionAuthUrl(String appKey, String callBackUrl, Long uid) {

   public static String getTaoBaoUnionAuthUrl(String appKey, String callBackUrl, Long uid, String source) {

      if (uid == null)

         return null;

      long timestamp = System.currentTimeMillis();

      JSONObject json = new JSONObject();

      json.put("u", uid);

      json.put("t", timestamp);

      json.put("s", source);

      String url = null;

      try {

         url = String.format(

@@ -1734,6 +1739,38 @@
      return url;

   }



   public static TaoBaoGoodsBrief getSimpleGoodsBrief(Long actionId) {

      JSONObject data = new JSONObject();

      data.put("itemNumId", actionId + "");



      String url = "";

      try {

         url = String.format("https://acs.m.taobao.com/h5/mtop.taobao.detail.getdetail/6.0/?data=%s",

               URLEncoder.encode(data.toString(), "UTF-8"));

      } catch (UnsupportedEncodingException e) {

         e.printStackTrace();

      }



      String result = HttpUtil.get(url);

      JSONObject resultOBJ = JSONObject.fromObject(result);

      if (resultOBJ.optJSONObject("data") != null) {

         data = resultOBJ.optJSONObject("data");

         JSONObject item = data.optJSONObject("item");

         JSONObject seller = data.optJSONObject("seller");

         TaoBaoGoodsBrief goods = new TaoBaoGoodsBrief();

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

         goods.setTitle(item.optString("title"));

         if (item.optJSONArray("images") != null && item.optJSONArray("images").size() > 0) {

            String picture = item.optJSONArray("images").optString(0);

            goods.setPictUrl(picture.startsWith("http") ? picture : "https:" + picture);

         }

         goods.setSellerId(seller.optLong("shopId"));

         goods.setShopTitle(seller.optString("shopName"));

         return goods;

      }

      return null;

   }



   public static void main(String[] args) {

      String s = channelMap.get("3");

      System.out.println(s);