From cc67c404945fb81c87f8e8aa85f4c4d8f3ef6051 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 24 六月 2019 14:30:53 +0800
Subject: [PATCH] 增加圆形专题与方块儿专题的版本控制
---
fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SpecialServiceImpl.java | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 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 e348fd5..4a29026 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
@@ -31,7 +31,6 @@
import com.yeshi.fanli.util.VersionUtil;
import net.sf.json.JSONObject;
-import sun.security.krb5.internal.ccache.CCacheInputStream;
@Service
public class SpecialServiceImpl implements SpecialService {
@@ -335,7 +334,11 @@
// 棣栭〉-5鍦嗗舰2鎺掑尯鍩�
JSONObject arcMap = new JSONObject();
- List<Special> listArc = specialMapper.listByPlaceKey("index_arc");
+ String indexArc = "index_arc";
+ if (VersionUtil.greaterThan_1_5_60(acceptData.getPlatform(), acceptData.getVersion()))
+ indexArc = "index_arc_1.5.6";
+
+ List<Special> listArc = specialMapper.listByPlaceKey(indexArc);
if (listArc == null) {
listArc = new ArrayList<Special>();
} else if (listArc.size() > 0) {
@@ -347,7 +350,8 @@
}
// 澶勭悊9.9鍖呴偖
- if (listArc != null && VersionUtil.greaterThan_1_5_50(acceptData.getPlatform(), acceptData.getVersion())&&!Constant.IS_TEST)
+ if (listArc != null && VersionUtil.greaterThan_1_5_50(acceptData.getPlatform(), acceptData.getVersion())
+ && !Constant.IS_TEST)
for (Special s : listArc) {
if (s.getName().contains("9.9")) {// 9鍧�9
s.setJumpDetail(jumpDetailV2Service.getByTypeCache("common_template"));
@@ -387,8 +391,12 @@
activityMap.put("list", JsonUtil.getApiCommonGson().toJson(listActivity));
// 棣栭〉-鏂瑰舰涓撻锛堝搧鐗屽埜銆佹瘝濠�...锛�
+ String indexBlock = "index_block";
+ if (VersionUtil.greaterThan_1_5_60(acceptData.getPlatform(), acceptData.getVersion()))
+ indexBlock = "index_block_1.5.6";
+
JSONObject blockJsonMap = new JSONObject();
- List<Special> listBlock = specialMapper.listByPlaceKey("index_block");
+ List<Special> listBlock = specialMapper.listByPlaceKey(indexBlock);
if (listBlock == null) {
listBlock = new ArrayList<Special>();
} else if (listBlock.size() > 0) {
--
Gitblit v1.8.0