学院

yujian

2019-12-28 c3f10da9aa6f4d8fecccc1c9574567ee0766ab48

 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,9 @@


   @Resource

   private IntegralGetCacheManager integralGetCacheManager;



   @Resource

   private BrandInfoService brandInfoService;



   /**

    * 粘贴板信息推荐

@@ -255,6 +259,17 @@
         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)) {

               JDGoods goods = JDApiUtil.getGoodsDetail(Long.parseLong(jdId));

               if (goods != null) {

@@ -345,13 +360,12 @@
            commonGoods = CommonGoodsFactory.create(goodsBrief);

         }



         BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

         BigDecimal shareRate = hongBaoManageService.getShareRate();

         Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())

               .excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();

         data.put("type", type);

         data.put("goods", gson.toJson(GoodsDetailVOFactory.convertCommonGoods(commonGoods,

               new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE))));

         data.put("goods",

               gson.toJson(GoodsDetailVOFactory.convertCommonGoods(commonGoods,hongBaoManageService.getShowComputeRate(acceptData.getPlatform(),

                     acceptData.getVersion()))));

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

         return;

      }

@@ -467,15 +481,15 @@
                     return false;

                  }



                  BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

                  BigDecimal shareRate = hongBaoManageService.getShareRate();

                  Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())

                        .excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();



                  JSONObject data = new JSONObject();

                  data.put("type", 3);

                  data.put("goods", gson.toJson(GoodsDetailVOFactory.convertTaoBao(goodsBrief,

                        new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE))));

                  data.put("goods",

                        gson.toJson(GoodsDetailVOFactory.convertTaoBao(goodsBrief,

                              hongBaoManageService.getShowComputeRate(acceptData.getPlatform(),

                                    acceptData.getVersion()))));

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

                  return true;

               }

@@ -745,9 +759,8 @@
      }



      List<GoodsDetailVO> list = new ArrayList<GoodsDetailVO>();

      BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

      BigDecimal shareRate = hongBaoManageService.getShareRate();

      ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE);

      ConfigParamsDTO paramsDTO =  hongBaoManageService.getShowComputeRate(acceptData.getPlatform(),

            acceptData.getVersion());



      for (TaoBaoGoodsBrief goods : taoBaoGoodsBriefs) {

         list.add(GoodsDetailVOFactory.convertTaoBao(goods, paramsDTO));

@@ -761,25 +774,38 @@
      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 = null;

            try {

               brandInfoVO = brandInfoService.listByAlikeName(key,acceptData.getPlatform(),acceptData.getVersion());

            } catch (Exception e) {

            }

            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,acceptData.getPlatform(),acceptData.getVersion());

            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));

   }



@@ -937,12 +963,10 @@


         List<JDGoods> goodsList = result.getGoodsList();

         if (goodsList != null && goodsList.size() > 0) {

            BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

            BigDecimal shareRate = hongBaoManageService.getShareRate();

            Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())

                  .excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();

            ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE);



            ConfigParamsDTO paramsDTO = hongBaoManageService.getShowComputeRate(acceptData.getPlatform(),

                  acceptData.getVersion());

            for (JDGoods goods : goodsList) {

               GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertJDGoods(goods, paramsDTO);

               if (hasCoupon) {

@@ -1023,9 +1047,8 @@
         Gson gson = JsonUtil.getApiCommonGson();

         List<PDDGoodsDetail> goodsList = result.getGoodsList();

         if (goodsList != null && goodsList.size() > 0) {

            BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

            BigDecimal shareRate = hongBaoManageService.getShareRate();

            ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE);

            ConfigParamsDTO paramsDTO =  hongBaoManageService.getShowComputeRate(acceptData.getPlatform(),

                  acceptData.getVersion());



            for (PDDGoodsDetail goods : goodsList) {

               GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertPDDGoods(goods, paramsDTO);