Merge remote-tracking branch 'origin/master'

admin

2019-01-24 f617136cba7f851a32f6091d5adc3e80f0e224c2

 fanli/src/main/java/com/yeshi/fanli/controller/client/GoodsController.java

@@ -75,6 +75,7 @@
         link.put("couponUrl", taoBaoLink.getCouponLink());

         data.put("type", 1);

         data.put("link", link);

         // TODO 添加jumpType（h5,native,auto）

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



      } catch (Exception e) {

@@ -98,6 +99,7 @@
            ClientTBPid clientTBPid = new ClientTBPid(config.getAppKey(), tbPid.getPid(), siteId, adzoneId);

            data.put("type", 2);

            data.put("tbPidInfo", clientTBPid);

            // TODO 添加jumpType（h5,native,auto）

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

         } else {

            out.print(JsonUtil.loadFalseResult(1, "请求失败"));