From 30a832ddbab4fa85ac3a831f5d1c9e45d8d82bb2 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 22 三月 2019 15:29:09 +0800
Subject: [PATCH] Bug修改

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java |  113 +++++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 75 insertions(+), 38 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java
index 2c5d5e1..8d8827c 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java
@@ -16,6 +16,7 @@
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
+import org.yeshi.utils.HttpUtil;
 import org.yeshi.utils.IPUtil;
 import org.yeshi.utils.JsonUtil;
 import org.yeshi.utils.NumberUtil;
@@ -32,7 +33,6 @@
 import com.yeshi.fanli.entity.bus.homemodule.Special;
 import com.yeshi.fanli.entity.bus.homemodule.SuperSpecial;
 import com.yeshi.fanli.entity.bus.homemodule.SwiperPicture;
-import com.yeshi.fanli.entity.bus.lable.QualityFactory;
 import com.yeshi.fanli.entity.bus.recommend.Honest;
 import com.yeshi.fanli.entity.bus.recommend.RecommendBanner;
 import com.yeshi.fanli.entity.bus.recommend.RecommendBannerV2;
@@ -1665,6 +1665,21 @@
 
 					try {
 						goods = redisManager.getTaoBaoGoodsBrief(Long.parseLong(id));
+						if (goods.getTkRate() == null || new BigDecimal(0).compareTo(goods.getTkRate()) == 0) {
+							String appId = clientPid.split("_")[2];
+							TaoBaoUnionConfig config = taoBaoUnionConfigService.getConfigByAppIdCache(appId);
+							TaoKeAppInfo app = new TaoKeAppInfo();
+							app.setAdzoneId(clientPid.split("_")[3]);
+							app.setAppKey(config.getAppKey());
+							app.setAppSecret(config.getAppSecret());
+							app.setPid(clientPid);
+							TaoBaoGoodsBrief linkInfo = TaoKeApiUtil.specialConvertCoupon(goods.getAuctionId(), app);
+							if (linkInfo != null) {
+								goods.setAuctionUrl(linkInfo.getAuctionUrl());
+								goods.setCouponLink(linkInfo.getCouponLink());
+								goods.setTkRate(linkInfo.getTkRate());
+							}
+						}
 					} catch (TaobaoGoodsDownException e) {
 						// 鍟嗗搧涓嬫灦
 						ThreadUtil.run(new Runnable() {
@@ -1691,6 +1706,15 @@
 							// 娴嬭瘯浣跨敤
 							ticket.put("couponUrl", goods.getCouponLink());
 							data.put("ticket", ticket);
+						}
+
+						if (goods.getTkRate() == null || new BigDecimal(0).compareTo(goods.getTkRate()) == 0) {
+							TaoBaoGoodsBrief linkInfo = TaoKeApiUtil.specialConvertCoupon(goods.getAuctionId(), app);
+							if (linkInfo != null) {
+								goods.setAuctionUrl(linkInfo.getAuctionUrl());
+								goods.setCouponLink(linkInfo.getCouponLink());
+								goods.setTkRate(linkInfo.getTkRate());
+							}
 						}
 
 					} catch (NumberFormatException e) {
@@ -1808,9 +1832,13 @@
 
 			String token = "";
 			if (!StringUtil.isNullOrEmpty(tb.getCouponLink())) {
-				token = TaoKeApiUtil.getTKToken(tb.getPictUrl(), tb.getTitle(), tb.getCouponLink());
-				tb.setCouponLinkTaoToken(token);
+				token = redisManager.getCommonTaoToken(tb.getAuctionId());
+				if (StringUtil.isNullOrEmpty(token)) {
+					token = TaoKeApiUtil.getTKToken(tb.getPictUrl(), tb.getTitle(), tb.getCouponLink());
+					redisManager.saveCommonTaoToken(tb.getAuctionId(), token);
+				}
 			}
+			tb.setCouponLinkTaoToken(token);
 
 			// 鏈嶅姟绔浆閾�
 			if (convertInServer && !StringUtil.isNullOrEmpty(tb.getCouponLink())) {
@@ -1887,8 +1915,13 @@
 		data.put("couponUsers", listCouponUser);
 		data.put("detailWebUrl", "http://apph5.yeshitv.com/apppage/goods_img.html?id=" + id);
 		// 鍟嗗搧閾炬帴
-		data.put("h5Url", String.format("http://%s%s?id=%s&appType=flq", configService.getH5Host(),
-				Constant.systemCommonConfig.getShareGoodsPagePath(), tb.getAuctionId() + ""));
+		String h5Url = String.format("http://%s%s?id=%s&appType=flq", configService.getH5Host(),
+				Constant.systemCommonConfig.getShareGoodsPagePath(), tb.getAuctionId() + "");
+		try {
+			data.put("h5Url", HttpUtil.getShortLink(h5Url));
+		} catch (Exception e) {
+			data.put("h5Url", h5Url);
+		}
 
 		// 鍙栨秷鍒嗕韩娲诲姩
 		// if (!StringUtil.isNullOrEmpty(uid)
@@ -2017,39 +2050,43 @@
 		});
 
 		List<TaoBaoGoodsBrief> listQuality = new ArrayList<TaoBaoGoodsBrief>();
-
-		try {
-			List<QualityFactory> listRecommend = qualityGoodsService.recommendByAuctionId(id);
-
-			if (listRecommend != null && listRecommend.size() > 1) {
-				for (QualityFactory quality : listRecommend) {
-
-					TaoBaoGoodsBrief taoBaoGoodsBrief = quality.getTaoBaoGoodsBrief();
-					if (taoBaoGoodsBrief == null) {
-						continue;
-					}
-
-					int biz30day = taoBaoGoodsBrief.getBiz30day();
-					if (biz30day >= 10000) {
-						double sales = biz30day;
-						String salesCountMidea = String.format("%.1f", sales / 10000);
-						taoBaoGoodsBrief.setSalesCount(salesCountMidea + "涓�");
-					} else {
-						taoBaoGoodsBrief.setSalesCount(biz30day + "");
-					}
-
-					// 鏀瑰彉鍥剧墖灏哄
-					String pictUrl = taoBaoGoodsBrief.getPictUrl();
-					if (!StringUtil.isNullOrEmpty(pictUrl) && !pictUrl.contains("320x320")) {
-						taoBaoGoodsBrief.setPictUrl(TbImgUtil.getTBSize320Img(pictUrl));
-					}
-
-					listQuality.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(), null));
-				}
-			}
-		} catch (Exception e2) {
-			e2.printStackTrace();
-		}
+		// 鍒犻櫎鎺ㄨ崘
+		//
+		// try {
+		// List<QualityFactory> listRecommend =
+		// qualityGoodsService.recommendByAuctionId(id);
+		//
+		// if (listRecommend != null && listRecommend.size() > 1) {
+		// for (QualityFactory quality : listRecommend) {
+		//
+		// TaoBaoGoodsBrief taoBaoGoodsBrief = quality.getTaoBaoGoodsBrief();
+		// if (taoBaoGoodsBrief == null) {
+		// continue;
+		// }
+		//
+		// int biz30day = taoBaoGoodsBrief.getBiz30day();
+		// if (biz30day >= 10000) {
+		// double sales = biz30day;
+		// String salesCountMidea = String.format("%.1f", sales / 10000);
+		// taoBaoGoodsBrief.setSalesCount(salesCountMidea + "涓�");
+		// } else {
+		// taoBaoGoodsBrief.setSalesCount(biz30day + "");
+		// }
+		//
+		// // 鏀瑰彉鍥剧墖灏哄
+		// String pictUrl = taoBaoGoodsBrief.getPictUrl();
+		// if (!StringUtil.isNullOrEmpty(pictUrl) &&
+		// !pictUrl.contains("320x320")) {
+		// taoBaoGoodsBrief.setPictUrl(TbImgUtil.getTBSize320Img(pictUrl));
+		// }
+		//
+		// listQuality.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief,
+		// proportion.toString(), null));
+		// }
+		// }
+		// } catch (Exception e2) {
+		// e2.printStackTrace();
+		// }
 
 		// 鍙栧伓鏁颁釜鏁版嵁
 		if (listExtra.size() % 2 != 0) {

--
Gitblit v1.8.0