From 573868c096a920acdb2c003f518d3a94f2e5567c Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 09 四月 2019 17:57:25 +0800
Subject: [PATCH] 系統緩存bug修改
---
fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java | 34 ++++++++++++++++++----------------
1 files changed, 18 insertions(+), 16 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 aff7182..40223c5 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
@@ -100,6 +100,7 @@
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.RedisManager;
import com.yeshi.fanli.util.StringUtil;
+import com.yeshi.fanli.util.TaoBaoConstant;
import com.yeshi.fanli.util.ThreadUtil;
import com.yeshi.fanli.util.TimeUtil;
import com.yeshi.fanli.util.factory.MonitorFactory;
@@ -404,12 +405,13 @@
jumpDetail = jumpDetailService.getlastJumpDetailCache();
}
List<RecommendSpecial> recommendSpecialList = null;
-
- List<SuperRecommendSpecial> superRecommendSpecialList = superRecommendSpecialService.getSuperRecommendSpecialBySystemId(system.getId());
+
+ List<SuperRecommendSpecial> superRecommendSpecialList = superRecommendSpecialService
+ .getSuperRecommendSpecialBySystemId(system.getId());
if (superRecommendSpecialList != null && superRecommendSpecialList.size() > 0) {
-
+
recommendSpecialList = new ArrayList<RecommendSpecial>();
-
+
for (SuperRecommendSpecial superRecommendSpecial : superRecommendSpecialList) {
RecommendSpecial recommendSpecial = superRecommendSpecial.getRecommendSpecial();
if (jumpDetail != null) {
@@ -418,12 +420,12 @@
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();
@@ -570,8 +572,8 @@
// 鑾峰彇娣樺鍙傛暟
ClientTBPid clientTBPid = null;
if (simpleGoods.getMaterialLibType() != null && simpleGoods.getMaterialLibType() == 1) {
- String pid = Constant.TAOBAO_SPECIAL_PID_DEFAULT;
- clientTBPid = new ClientTBPid(Constant.TAOBAO_AUTH_APPKEY, Constant.TAOBAO_AUTH_APPSECRET,
+ String pid = TaoBaoConstant.TAOBAO_SPECIAL_PID_DEFAULT;
+ clientTBPid = new ClientTBPid(TaoBaoConstant.TAOBAO_AUTH_APPKEY, TaoBaoConstant.TAOBAO_AUTH_APPSECRET,
pid.split("_")[2], pid.split("_")[3]);
} else {
if (acceptData.getPlatform().equalsIgnoreCase("android")) {
@@ -1308,7 +1310,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 {
@@ -1369,8 +1371,8 @@
}
// 棣栭〉Banner
- List<RecommendBannerV2> listBanner = superRecommendBannerV2Service.getSuperRecommendBannerV2sBySystem(system.getId());
-
+ List<RecommendBannerV2> listBanner = superRecommendBannerV2Service
+ .getSuperRecommendBannerV2sBySystem(system.getId());
JSONObject root = new JSONObject();
root.put("banner", listBanner);
@@ -1814,12 +1816,12 @@
tb.setCouponLinkTaoToken(token);
// 鏈嶅姟绔浆閾�
- if (convertInServer && !StringUtil.isNullOrEmpty(tb.getCouponLink())) {
+// if (convertInServer && !StringUtil.isNullOrEmpty(tb.getCouponLink())) {
couponInfo.put("couponUrl", tb.getCouponLink());
- } else {
- couponInfo.put("couponUrl",
- TaoBaoCouponUtil.getCoupleUrl(tb.getCouponActivityId() + "", pid, tb.getAuctionId() + ""));
- }
+// } else {
+// couponInfo.put("couponUrl",
+// TaoBaoCouponUtil.getCoupleUrl(tb.getCouponActivityId() + "", pid, tb.getAuctionId() + ""));
+// }
couponInfo.put("couponAmount", NumberUtil.subZeroAndDot(tb.getCouponAmount().toString()));
couponInfo.put("couponTime", "浣跨敤鏈熼檺锛�" + tb.getCouponEffectiveStartTime().replace("-", ".") + "-"
--
Gitblit v1.8.0