From 4ccdfd05dc5967eaa7876920eeaff190f49e6a81 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 17 五月 2019 15:47:59 +0800
Subject: [PATCH] 品牌版本控制修改，淘宝授权之后取消提示页面
---
fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SpecialServiceImpl.java | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SpecialServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SpecialServiceImpl.java
index bfeddf2..2a5120f 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SpecialServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SpecialServiceImpl.java
@@ -327,7 +327,7 @@
}
@Override
- @Cacheable(value = "configCache", key = "'listCacheSpecialToIndex'")
+ @Cacheable(value = "configCache", key = "'listCacheSpecialToIndex'+#acceptData.platform+'-'+#acceptData.version")
public JSONObject listCacheSpecialToIndex(AcceptData acceptData) throws Exception {
// 棣栭〉-5鍦嗗舰2鎺掑尯鍩�
@@ -365,16 +365,6 @@
activityMap.put("bottomPicture", special.getBottomPicture());
}
}
- // 鍝佺墝鍒�
- // >=1.5.40鍚庣殑鐗堟湰鍙互鐢�
- if (("android".equalsIgnoreCase(acceptData.getPlatform()) && Integer.parseInt(acceptData.getVersion()) > 39)
- || "ios".equalsIgnoreCase(acceptData.getPlatform()) && Integer.parseInt(acceptData.getVersion()) > 48)
- if (listActivity != null)
- for (int i = 0; i < listActivity.size(); i++) {
- if ("鍝佺墝鍒�".equalsIgnoreCase(listActivity.get(i).getName())) {
- listActivity.get(i).setJumpDetail(jumpDetailV2Service.getByTypeCache("hot_cakes"));
- }
- }
handlelist(listActivity);
@@ -392,6 +382,18 @@
blockJsonMap.put("bottomPicture", special.getBottomPicture());
}
}
+
+ // 鍝佺墝鍒�
+ // >=1.5.40鍚庣殑鐗堟湰鍙互鐢�
+ if (("android".equalsIgnoreCase(acceptData.getPlatform()) && Integer.parseInt(acceptData.getVersion()) > 39)
+ || "ios".equalsIgnoreCase(acceptData.getPlatform()) && Integer.parseInt(acceptData.getVersion()) > 48)
+ if (listBlock != null)
+ for (int i = 0; i < listBlock.size(); i++) {
+ if ("鍝佺墝鍒�".equalsIgnoreCase(listBlock.get(i).getName())) {
+ listBlock.get(i).setJumpDetail(jumpDetailV2Service.getByTypeCache("hot_cakes"));
+ }
+ }
+
// 鏁版嵁澶勭悊
handlelist(listBlock);
blockJsonMap.put("list", JsonUtil.getApiCommonGson().toJson(listBlock));
--
Gitblit v1.8.0