From cdcbed9af813b2a02cdc01eefa24db8bec6b51a9 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期三, 27 三月 2019 12:17:33 +0800
Subject: [PATCH] 主分类 + 子分类 DAO改造
---
fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java | 181 ++++++++++++++++++++++++---------------------
1 files changed, 96 insertions(+), 85 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..9000ddd 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,13 +33,11 @@
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;
import com.yeshi.fanli.entity.bus.recommend.RecommendSpecial;
import com.yeshi.fanli.entity.bus.su.recommend.SuperRecommendBanner;
-import com.yeshi.fanli.entity.bus.su.recommend.SuperRecommendBannerV2;
import com.yeshi.fanli.entity.bus.su.recommend.SuperRecommendSpecial;
import com.yeshi.fanli.entity.bus.user.Order;
import com.yeshi.fanli.entity.bus.user.ShamUser;
@@ -404,25 +403,28 @@
if (!"1".equals(version) && "android".equalsIgnoreCase(acceptData.getPlatform())) {
jumpDetail = jumpDetailService.getlastJumpDetailCache();
}
+ List<RecommendSpecial> recommendSpecialList = null;
+
List<SuperRecommendSpecial> superRecommendSpecialList = superRecommendSpecialService
.getSuperRecommendSpecialBySystemId(system.getId());
+ if (superRecommendSpecialList != null && superRecommendSpecialList.size() > 0) {
- List<RecommendSpecial> recommendSpecialList = null;
- for (SuperRecommendSpecial superRecommendSpecial : superRecommendSpecialList) {
- if (recommendSpecialList == null) {
- recommendSpecialList = new ArrayList<RecommendSpecial>();
+ recommendSpecialList = new ArrayList<RecommendSpecial>();
+
+ for (SuperRecommendSpecial superRecommendSpecial : superRecommendSpecialList) {
+ RecommendSpecial recommendSpecial = superRecommendSpecial.getRecommendSpecial();
+ if (jumpDetail != null) {
+ recommendSpecial.setJumpDetail(jumpDetail);
+ }
+ recommendSpecialList.add(recommendSpecial);
}
- RecommendSpecial recommendSpecial = superRecommendSpecial.getRecommendSpecial();
- if (jumpDetail != null) {
- recommendSpecial.setJumpDetail(jumpDetail);
- }
- recommendSpecialList.add(recommendSpecial);
}
if (recommendSpecialList == null || recommendSpecialList.size() == 0) {
out.print(JsonUtil.loadFalseResult(1, "鏆傛棤鏁版嵁"));
return;
}
+
JSONObject data = new JSONObject();
data.put("count", recommendSpecialList.size());
Gson gson = new Gson();
@@ -1307,7 +1309,7 @@
for (TaoBaoGoodsBrief goods : result.getTaoBaoGoodsBriefs()) {
if (!StringUtil.isNullOrEmpty(goods.getCouponInfo()) && goods.getCouponAmount() != null
&& goods.getCouponAmount().compareTo(new BigDecimal("5")) >= 0
- && goods.getBiz30day() > 1000)
+ && goods.getBiz30day() > 1000 && !StringUtil.isNullOrEmpty(goods.getPictUrlWhite()))
goodsList.add(goods);
}
try {
@@ -1368,26 +1370,8 @@
}
// 棣栭〉Banner
- List<RecommendBannerV2> listBanner = null;
-
- List<SuperRecommendBannerV2> listRecommendBanner = superRecommendBannerV2Service
- .getSuperRecommendBannerV2sBySystem(system);
-
- if (listRecommendBanner != null && listRecommendBanner.size() > 0) {
-
- listBanner = new ArrayList<RecommendBannerV2>();
-
- for (SuperRecommendBannerV2 superRecommendBanner : listRecommendBanner) {
- RecommendBannerV2 recommendBanner = superRecommendBanner.getRecommendBanner();
- // 娣樼壒浠锋殏鏃朵慨鏀�
- if (system.getId() == 7) {
- recommendBanner.getJumpDetail().setActivity(recommendBanner.getJumpDetail().getActivity()
- .replace("com.yeshi.ec.rebate.myapplication", "com.yeshi.ec.taospecial"));
- }
-
- listBanner.add(recommendBanner);
- }
- }
+ List<RecommendBannerV2> listBanner = superRecommendBannerV2Service
+ .getSuperRecommendBannerV2sBySystem(system.getId());
JSONObject root = new JSONObject();
root.put("banner", listBanner);
@@ -1628,21 +1612,11 @@
// 鑾峰彇娣樺鍙傛暟
ClientTBPid clientTBPid = null;
- if (StringUtil.isNullOrEmpty(uid)) {
- // 鐢ㄦ埛鏈櫥褰�
- if (acceptData.getPlatform().equalsIgnoreCase("android")) {
- clientTBPid = tbPidService.getAndroidDefault();
- } else {
- clientTBPid = tbPidService.getIOSDefault();
- }
-
+ // 鐢ㄦ埛鏈櫥褰�
+ if (acceptData.getPlatform().equalsIgnoreCase("android")) {
+ clientTBPid = tbPidService.getAndroidDefault();
} else {
- // 鐢ㄦ埛宸茬粡鐧诲綍
- if (acceptData.getPlatform().equalsIgnoreCase("android")) {
- clientTBPid = tbPidService.getAndroidDefault();
- } else {
- clientTBPid = tbPidService.getIOSDefault();
- }
+ clientTBPid = tbPidService.getIOSDefault();
}
LogHelper.test("鑾峰彇PID鑰楁椂锛�" + (java.lang.System.currentTimeMillis() - startTime));
@@ -1665,6 +1639,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 +1680,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 +1806,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 +1889,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 +2024,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) {
@@ -2061,8 +2072,8 @@
}
JSONObject data = new JSONObject();
- data.put("listGuess", JsonUtil.getApiCommonGson().toJson(listExtra));
- data.put("listQuality", JsonUtil.getApiCommonGson().toJson(listQuality));
+ data.put("listQuality", JsonUtil.getApiCommonGson().toJson(listExtra));
+ data.put("listGuess", JsonUtil.getApiCommonGson().toJson(listQuality));
out.print(JsonUtil.loadTrueResult(data));
}
--
Gitblit v1.8.0