Administrator
2018-11-20 7d0137653430fead485d7f554ed40f8dd893a07f
fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java
@@ -204,7 +204,6 @@
   @Resource
   private SwiperPictureService swiperPictureService;
   
   @Resource
   private MonitorService monitorService;
@@ -622,37 +621,6 @@
         out.print(JsonUtil.loadFalseResult(1, "系统不存在"));
         return;
      }
      // TaoBaoGoodsBrief alimama = TaoBaoUtil.isAlimama(id);
      TaoBaoGoodsBrief tb = null;
      try {
         tb = redisManager.getTaoBaoGoodsBrief(Long.parseLong(id));
      } catch (NumberFormatException e1) {
         e1.printStackTrace();
      } catch (TaobaoGoodsDownException e1) {
         e1.printStackTrace();
      }
      if (tb != null) {
         tb.setAuctionUrl(null);
         tb.setId(null);
         int type = 0;
         if ("android".equalsIgnoreCase(acceptData.getPlatform()))
            type = PidUser.TYPE_FANLI_ANDROID;
         else
            type = PidUser.TYPE_FANLI_IOS;
         List<TaoBaoUnionConfig> configList = taoBaoUnionConfigService.getConfigByTypeCache(type);
         Gson gson = new GsonBuilder().excludeFieldsWithoutExposeAnnotation().create();
         JSONObject data = new JSONObject();
         TaoBaoGoodsBriefExtra taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(tb, configList.get(0));
         if (uid != null && !"".equals(uid.trim())) {
            CollectionGoods collectionGoods = collectionGoodsService.findByUidAndAuctionId(Long.parseLong(uid),
                  Long.parseLong(id));
            data.put("collection", collectionGoods != null ? true : false);
         }
         // 获取淘客参数
         ClientTBPid clientTBPid = null;
         // 用户已经登录
@@ -672,7 +640,6 @@
            } else {
               tbPid = tbPidService.getTBPid(Long.parseLong(uid), PidUser.TYPE_FANLI_IOS);
               if (tbPid != null) {
                  String siteId = tbPid.getPid().split("_")[2];
                  String adzoneId = tbPid.getPid().split("_")[3];
                  TaoBaoUnionConfig config = taoBaoUnionConfigService.getConfigByAppIdCache(siteId);
@@ -681,11 +648,6 @@
                  clientTBPid = tbPidService.getIOSDefault();
               }
            }
            if (!StringUtil.isNullOrEmpty(tb.getCouponLink()) && taoBaoGoodsBriefExtra.getTaoBaoQuanInfo() != null)
               taoBaoGoodsBriefExtra.getTaoBaoQuanInfo().setCouponLink(TaoBaoCouponUtil
                     .getCoupleUrl(tb.getCouponActivityId(), tbPid.getPid(), tb.getAuctionId() + ""));
         } else {
            if (acceptData.getPlatform().equalsIgnoreCase("android"))
               clientTBPid = tbPidService.getAndroidDefault();
@@ -693,9 +655,48 @@
               clientTBPid = tbPidService.getIOSDefault();
         }
      TaoBaoGoodsBrief tb = null;
      try {
         TaoKeAppInfo app = new TaoKeAppInfo();
         TaoBaoUnionConfig config = taoBaoUnionConfigService.getConfigByAppIdCache(clientTBPid.getSiteId());
         app.setAdzoneId(clientTBPid.getAdZoneId());
         app.setAppKey(clientTBPid.getAppKey());
         app.setAppSecret(config.getAppSecret());
         app.setPid(clientTBPid.getPid());
         tb = TaoKeApiUtil.searchGoodsDetail(Long.parseLong(id), app);
      } catch (NumberFormatException e1) {
         e1.printStackTrace();
      } catch (TaobaoGoodsDownException e1) {
         out.print(JsonUtil.loadFalseResult(2, "商品已下架"));
         return;
      }
      if (tb != null) {
         // tb.setAuctionUrl(null);
         tb.setId(null);
         int type = 0;
         if ("android".equalsIgnoreCase(acceptData.getPlatform()))
            type = PidUser.TYPE_FANLI_ANDROID;
         else
            type = PidUser.TYPE_FANLI_IOS;
         List<TaoBaoUnionConfig> configList = taoBaoUnionConfigService.getConfigByTypeCache(type);
         Gson gson = new GsonBuilder().excludeFieldsWithoutExposeAnnotation().create();
         JSONObject data = new JSONObject();
         TaoBaoGoodsBriefExtra taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(tb, configList.get(0));
         if (!StringUtil.isNullOrEmpty(tb.getCouponLink()) && taoBaoGoodsBriefExtra.getTaoBaoQuanInfo() != null)
            taoBaoGoodsBriefExtra.getTaoBaoQuanInfo().setCouponLink(tb.getCouponLink());
         taoBaoGoodsBriefExtra.setAuctionUrl(tb.getAuctionUrl());
         if (uid != null && !"".equals(uid.trim())) {
            CollectionGoods collectionGoods = collectionGoodsService.findByUidAndAuctionId(Long.parseLong(uid),
                  Long.parseLong(id));
            data.put("collection", collectionGoods != null ? true : false);
         }
         data.put("tbPidInfo", clientTBPid);
         taoBaoGoodsBriefExtra.setAuctionUrl(null);
         // taoBaoGoodsBriefExtra.setAuctionUrl(null);
         data.put("taobao", gson.toJson(taoBaoGoodsBriefExtra));
         String info = configService.get("detail_prompt");
         data.put("info", info);
@@ -1579,7 +1580,6 @@
      out.print(JsonUtil.loadTrueResult(root));
   }
   /**
    * 新版推荐专题管理(1.4.0)
    * 
@@ -1686,8 +1686,6 @@
      out.print(JsonUtil.loadTrueResult(root));
      
   }
   
   /**
    * 商品基本详情 (1.4.0)