帮助中心

yujian

2019-12-19 626d711cb15896055c13fe344eb7fcc824589715

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

@@ -41,6 +41,7 @@
import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;

import com.yeshi.fanli.exception.user.TokenRecordException;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.brand.BrandInfoService;

import com.yeshi.fanli.service.inter.config.BusinessSystemService;

import com.yeshi.fanli.service.inter.config.ConfigService;

import com.yeshi.fanli.service.inter.config.SuperHotSearchService;

@@ -128,6 +129,11 @@


   @Resource

   private IntegralGetCacheManager integralGetCacheManager;

	
	
   @Resource

   private BrandInfoService brandInfoService;

	


   /**

    * 粘贴板信息推荐

@@ -255,8 +261,15 @@
         if (tb == null)// 淘宝是空值

         {

            String jdId = JDUtil.getJDGoodsId(text);

				
            // 微信链接

            if (StringUtil.isNullOrEmpty(jdId)) {

               jdId = JDUtil.getJDGoodsIdByWeiXin(text);

            }

				
            // 领券短连接

            if (StringUtil.isNullOrEmpty(jdId) && text.contains("u.jd.com")) {

               jdId = JDUtil.getJDGoodsIdByUJD(text);

            }

            

            if (!StringUtil.isNullOrEmpty(jdId)) {

@@ -765,25 +778,33 @@
      data.put("count", result.getTaoBaoHead().getDocsfound());



      if (page == 1) { // 第一页返回店铺信息

         List<TaoBaoShopVO> listShop = taoBaoShopService.getShopByKeyV2(key);

         if (listShop != null && listShop.size() > 0 && listShop.get(0).getListGoodsVO() != null

               && listShop.get(0).getListGoodsVO().size() > 2) {

            String platform = acceptData.getPlatform();

            TaoBaoShopVO taoBaoShop = listShop.get(0);

            if (("ios".equalsIgnoreCase(platform) && VersionUtil.greaterThan_2_0(platform, acceptData.getVersion()))

                  || ("android".equalsIgnoreCase(platform)

                        && VersionUtil.greaterThan_2_0_1(platform, acceptData.getVersion()))) {

               BrandInfoVO brandInfoVO = new BrandInfoVO();

               brandInfoVO.setId(taoBaoShop.getId());

               brandInfoVO.setName(taoBaoShop.getShopName());

               brandInfoVO.setIcon(taoBaoShop.getShopIcon());

               brandInfoVO.setListGoods(taoBaoShop.getListGoodsVO());

         String platform = acceptData.getPlatform();

         String version = acceptData.getVersion();

         if (("ios".equalsIgnoreCase(platform) && VersionUtil.greaterThan_2_1(platform, version))

               || ("android".equalsIgnoreCase(platform) && VersionUtil.greaterThan_2_0_2(platform, version))) {

            BrandInfoVO brandInfoVO = brandInfoService.listByAlikeName(key);

            if (brandInfoVO != null)

               data.put("shop", JsonUtil.getApiCommonGson().toJson(brandInfoVO));

            } else {

               data.put("shop", JsonUtil.getApiCommonGson().toJson(taoBaoShop));

         } else {

            List<TaoBaoShopVO> listShop = taoBaoShopService.getShopByKeyV2(key);

            if (listShop != null && listShop.size() > 0 && listShop.get(0).getListGoodsVO() != null

                  && listShop.get(0).getListGoodsVO().size() > 2) {

               TaoBaoShopVO taoBaoShop = listShop.get(0);

               if (("ios".equalsIgnoreCase(platform) && VersionUtil.greaterThan_2_0(platform, version))

                  || ("android".equalsIgnoreCase(platform) && VersionUtil.greaterThan_2_0_1(platform, version))) {

                  BrandInfoVO brandInfoVO = new BrandInfoVO();

                  brandInfoVO.setId(taoBaoShop.getId());

                  brandInfoVO.setName(taoBaoShop.getShopName());

                  brandInfoVO.setIcon(taoBaoShop.getShopIcon());

                  brandInfoVO.setListGoods(taoBaoShop.getListGoodsVO());

                  data.put("shop", JsonUtil.getApiCommonGson().toJson(brandInfoVO));

               } else {

                  data.put("shop", JsonUtil.getApiCommonGson().toJson(taoBaoShop));

               }

            }

         }

      }

		
      out.print(JsonUtil.loadTrueResult(data));

   }