Merge remote-tracking branch 'origin/master'

admin

2019-04-15 debb3a579f798d71072f037f74e3e6b43b5fe0ee

 fanli/src/main/java/com/yeshi/fanli/controller/h5/H5RecommendController.java

@@ -99,7 +99,8 @@
   @RequestMapping(value = "getRecommenBanner", method = RequestMethod.GET)

   public void getRecommendBanner(AcceptData acceptData, String callback, PrintWriter out) {



      BusinessSystem system = businessSystemService.getBusinessSystem("WEB", Constant.systemCommonConfig.getH5PackageName());

      BusinessSystem system = businessSystemService.getBusinessSystem("WEB",

            Constant.systemCommonConfig.getH5PackageName());

      JSONObject json = new JSONObject();

      if (system == null) {

         out.print(JsonUtil.loadFalseResult(1, H5ControllerUtil.NOSYSTEM));

@@ -139,7 +140,6 @@
      out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(json)));

      return;

   }





   /**

    * 

@@ -194,7 +194,7 @@
            List<TaoBaoUnionConfig> configList = taoBaoUnionConfigService

                  .getConfigByTypeCache(PidUser.TYPE_SHARE_GOODS);

            String pid = null;

            ClientTBPid  tbPid = tbPidService.getSharePid();

            ClientTBPid tbPid = tbPidService.getSharePid();

            if (tbPid != null)

               pid = tbPid.getPid();

            else {

@@ -226,7 +226,7 @@
      } else {

         List<TaoBaoUnionConfig> configList = taoBaoUnionConfigService

               .getConfigByTypeCache(PidUser.TYPE_SHARE_GOODS);

         String pid =tbPidService.getSharePid().getPid();

         String pid = tbPidService.getSharePid().getPid();

         TaoKeAppInfo app = new TaoKeAppInfo();

         app.setAdzoneId(pid.split("_")[3]);

         app.setAppKey(configList.get(0).getAppKey());

@@ -244,6 +244,13 @@
            if (!StringUtil.isNullOrEmpty(goods.getCouponLink())) {

               url = goods.getCouponLink();

            }

            if (!url.contains("uland.taobao.com") && !url.contains("s.click.taobao.com")) {

               TaoBaoGoodsBrief linkInfo = TaoKeApiUtil.specialConvertCoupon(Long.parseLong(id), app);

               url = linkInfo.getCouponLink();

               if (StringUtil.isNullOrEmpty(url))

                  url = linkInfo.getAuctionUrl();

            }



            token = TaoKeApiUtil.getTKToken(goods.getPictUrl(), goods.getTitle(), url);

         }

      }