yujian
2019-05-23 31a566a0f1e2d69662dfcbce8a1418c3cbe42ad3
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/GoodsController.java
@@ -140,7 +140,6 @@
      if (acceptData.getPlatform().equalsIgnoreCase("ios"))
         pidType = PidUser.TYPE_FANLI_IOS;
      try {
         TaoBaoLink taoBaoLink = null;
         // 是返利商品库的商品
         if (specialConvert) {
@@ -208,12 +207,33 @@
         data.put("native", isNative);
         if (tbPid != null) {
            try {
               TaoBaoLink taoBaoLink = null;
               if (pidType == PidUser.TYPE_FANLI_ANDROID)
                  taoBaoLink = shareGoodsService.getTaoBaoLink(uid, auctionId,
                        tbPidService.getAndroidDefault().getPid());
               else
                  taoBaoLink = shareGoodsService.getTaoBaoLink(uid, auctionId,
                        tbPidService.getIOSDefault().getPid());
               JSONObject link = new JSONObject();
               link.put("clickUrl", taoBaoLink.getClickUrl());
               link.put("couponUrl", taoBaoLink.getCouponLink());
               data.put("type", 1);
               data.put("link", link);
               data.put("native", true);
            } catch (Exception e1) {
            String siteId = tbPid.getPid().split("_")[2];
            String adzoneId = tbPid.getPid().split("_")[3];
            TaoBaoUnionConfig config = taoBaoUnionConfigService.getConfigByAppIdCache(siteId);
            ClientTBPid clientTBPid = new ClientTBPid(config.getAppKey(), tbPid.getPid(), siteId, adzoneId);
            data.put("type", 2);
            data.put("tbPidInfo", clientTBPid);
               data.put("native", true);
            }
            out.print(JsonUtil.loadTrueResult(data));
         } else {
            out.print(JsonUtil.loadFalseResult(1, "请求失败"));