Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-10-11 8b505f74e1094fd67f86373ab9e9f80b54bca54e

 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java

@@ -238,6 +238,17 @@
         return;

      } else {

         tb = TaoBaoUtil.parsePhoneShareUrlByTB(text);

			
         if (tb == null) {

            String goodsId = TaoBaoUtil.getGoodsIdByPhoneShareUrl(text);

            if (!StringUtil.isNullOrEmpty(goodsId)) {

               tb = TaoBaoUtil.getTmallGoodsInfo(goodsId);

               if (tb != null) 
                  type = 4;

            }

         }

			
			
         if (tb == null)// 淘宝是空值

         {

            String jdId = JDUtil.getJDGoodsId(text);