Merge remote-tracking branch 'origin/div' into div

yujian

2020-05-06 a4637ae9d71aa4a624b217ed3a1483f0e3a3a7ed

 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java

@@ -49,6 +49,7 @@
import com.yeshi.fanli.entity.goods.CommonGoods;

import com.yeshi.fanli.entity.goods.ScanHistoryV2;

import com.yeshi.fanli.entity.system.BusinessSystem;

import com.yeshi.fanli.entity.system.ConfigKeyEnum;

import com.yeshi.fanli.entity.system.SystemClientParams;

import com.yeshi.fanli.entity.taobao.ClientTBPid;

import com.yeshi.fanli.entity.taobao.PidUser;

@@ -680,11 +681,11 @@


         // taoBaoGoodsBriefExtra.setAuctionUrl(null);

         data.put("taobao", taobaoJson);

         String info = configService.get("detail_prompt");

         String info = configService.get(ConfigKeyEnum.detailPrompt.getKey());

         data.put("info", info);

         String onlyInfo = configService.get("only_info");

         String onlyInfo = configService.get(ConfigKeyEnum.onlyInfo.getKey());

         data.put("only", onlyInfo);

         data.put("helpUrl", configService.get("old_goods_detail_help_url"));

         data.put("helpUrl", configService.get(ConfigKeyEnum.oldGoodsDetailHelpUrl.getKey()));



         int showType = taoBaoGoodsBriefExtra.getShowType();

         String price = "";

@@ -699,7 +700,7 @@
         data.put("shareTitle", taoBaoGoodsBriefExtra.getTitle());

         data.put("shareContent", "¥" + price + "元");

         data.put("shareImg", taoBaoGoodsBriefExtra.getPictUrl());

         String html = configService.get("downAPP");

         String html = configService.get(ConfigKeyEnum.downAPP.getKey());

         data.put("downAPP", html);

         String shareSinaContent = configService.get("shareSinaContent");

         data.put("shareSina",

@@ -1415,7 +1416,7 @@
         if (!StringUtil.isNullOrEmpty(imei) || !StringUtil.isNullOrEmpty(idfa)) {

            long startTime = java.lang.System.currentTimeMillis();



            TaoBaoSearchResult result = TaoKeApiUtil.guessDeviceLike(page, 50, imei, idfa);

            TaoBaoSearchResult result = TaoKeApiUtil.guessDeviceLike(page, 50, imei, idfa,"");



            if (result != null && result.getTaoBaoGoodsBriefs() != null) {

               // 筛选

@@ -1674,7 +1675,7 @@
      JSONObject invite = new JSONObject();

      JumpDetailV2 jumpDetail = jumpDetailV2Service.getByTypeCache("invite");

      invite.put("jumpDetail", jumpDetail);

      invite.put("picture", configService.get("home_invite_banner"));

      invite.put("picture", configService.get(ConfigKeyEnum.homeInviteBanner.getKey()));



      if ("ios".equalsIgnoreCase(acceptData.getPlatform())

            && configService.iosOnLining(Integer.parseInt(acceptData.getVersion()))) {

@@ -1739,7 +1740,7 @@
         // 4、IOS的底部网页链接

         String platform = acceptData.getPlatform();

         if ("ios".equalsIgnoreCase(platform)) {

            root.put("htmlLink", configService.get("index_html_link_ios"));

            root.put("htmlLink", configService.get(ConfigKeyEnum.indexHtmlLinkIos.getKey()));

         }



         root.put("spikeGoods", getSpikeGoodsContent(acceptData));

@@ -1865,7 +1866,7 @@
                  .toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(), null)));

            goods.put("jumpDetail", jumpDetail);

            JSONObject params = new JSONObject();

            params.put("url", configService.get("spike_goods_link") + "?id=" + taoBaoGoodsBrief.getAuctionId());

            params.put("url", configService.get(ConfigKeyEnum.spikeGoodsLink.getKey()) + "?id=" + taoBaoGoodsBrief.getAuctionId());

            goods.put("params", params);



            // 1.5.4及以后返回

@@ -1887,7 +1888,7 @@
      root.put("listgoods", array);



      JSONObject params = new JSONObject();

      params.put("url", configService.get("spike_goods_link"));

      params.put("url", configService.get(ConfigKeyEnum.spikeGoodsLink.getKey()));



      root.put("params", params);

      root.put("jumpDetail", jumpDetail);

@@ -2073,7 +2074,7 @@


      // 大淘客商品过滤

      try {

         goods = daTaoKeGoodsDetailV2Service.filterTaoBaoGoods(goods);

         goods = daTaoKeGoodsDetailV2Service.filterTaoBaoGoods(goods).getGoods();

      } catch (Exception e) {

         LogHelper.errorDetailInfo(e);

      }

@@ -2252,7 +2253,7 @@
      data.put("shareUrl", shareUrl);

      data.put("shareUsers", listShareUser);

      data.put("couponUsers", listCouponUser);

      data.put("detailWebUrl", "http://apph5.yeshitv.com/apppage/goods_img.html?id=" + id);

      data.put("detailWebUrl", "http://apph5.banliapp.com/apppage/goods_img.html?id=" + id);



      String noRebateHelpLink = null;



@@ -2344,7 +2345,7 @@
         }



      } else if (from != null && from.equals("taolijin_buy")) {

         noRebateHelpLink = configService.get("zigoulijian_nofanli_help");

         noRebateHelpLink = configService.get(ConfigKeyEnum.zigoulijianNofanliHelp.getKey());

         // 查询分享库

         TLJBuyGoods buyGoods = tljBuyGoodsService.selectByAuctionIdAndDay(goods.getAuctionId(),

               TimeUtil.getGernalTime(System.currentTimeMillis(), "yyyy-MM-dd"));

@@ -2373,7 +2374,7 @@
      if (!StringUtil.isNullOrEmpty(noRebateHelpLink)) {

         data.put("noRebateHelpLink", noRebateHelpLink);

      } else {

         data.put("noRebateHelpLink", configService.get("no_rebate_help_link"));

         data.put("noRebateHelpLink", configService.get(ConfigKeyEnum.noRebateHelpLink.getKey()));

      }



      // 取消分享活动