Merge branch 'div_develop' into master_develop

yujian

2019-04-29 9a24f2802a3d6fe3e82c05e52f2880d65ad04dcf

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

@@ -1805,8 +1805,20 @@
      else

         shop.setUserType(0);



      shop.setShopLink(TaoBaoUtil.getShopLink(shop.getId()));

		
      return shop;

   }

	
   /**

    * 根据卖家id获取店铺链接

    * @param sellerId

    * @return

    */

   public static String getShopLink(Long sellerId) {

      return  "http://store.taobao.com/shop/view_shop.htm?user_number_id=" + sellerId;

   }

	


   public static void main(String[] args) {

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