From debb3a579f798d71072f037f74e3e6b43b5fe0ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 15 四月 2019 10:44:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SpecialServiceImpl.java | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 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 733b511..907b97d 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
@@ -16,10 +16,13 @@
import org.yeshi.utils.tencentcloud.COSManager;
import com.yeshi.fanli.dao.mybatis.homemodule.SpecialMapper;
+import com.yeshi.fanli.entity.accept.AcceptData;
import com.yeshi.fanli.entity.bus.homemodule.Special;
+import com.yeshi.fanli.entity.bus.homemodule.SwiperPicture;
import com.yeshi.fanli.entity.common.JumpDetailV2;
import com.yeshi.fanli.exception.homemodule.SpecialException;
import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;
+import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.homemodule.SpecialCardService;
import com.yeshi.fanli.service.inter.homemodule.SpecialPlaceService;
import com.yeshi.fanli.service.inter.homemodule.SpecialService;
@@ -42,6 +45,9 @@
@Resource
private JumpDetailV2Service jumpDetailV2Service;
+
+ @Resource
+ private ConfigService configService;
@Override
@@ -334,7 +340,7 @@
@Override
@Cacheable(value = "configCache", key = "'listCacheSpecialToIndex'")
- public JSONObject listCacheSpecialToIndex() throws Exception{
+ public JSONObject listCacheSpecialToIndex(AcceptData acceptData) throws Exception{
// 棣栭〉-5鍦嗗舰2鎺掑尯鍩�
JSONObject arcMap = new JSONObject();
@@ -355,7 +361,14 @@
// 棣栭〉-娲诲姩鍖哄煙锛堝コ鐜嬭妭锛�
JSONObject activityMap = new JSONObject();
- List<Special> listActivity = specialMapper.listByPlaceKey("index_activity");
+ List<Special> listActivity = null;
+ if ("ios".equalsIgnoreCase(acceptData.getPlatform())
+ && configService.iosOnLining(Integer.parseInt(acceptData.getVersion()))) {
+ // 濡傛灉IOS褰撳墠鐗堟湰澶勪簬瀹℃牳鐘舵�佸氨涓嶈繑鍥�
+ } else {
+ listActivity = specialMapper.listByPlaceKey("index_activity");
+ }
+
if (listActivity == null) {
listActivity = new ArrayList<Special>();
} else if(listActivity.size() > 0){
@@ -370,6 +383,7 @@
activityMap.put("list", JsonUtil.getApiCommonGson().toJson(listActivity));
+
// 棣栭〉-鏂瑰舰涓撻锛堝搧鐗屽埜銆佹瘝濠�...锛�
JSONObject blockJsonMap = new JSONObject();
List<Special> listBlock = specialMapper.listByPlaceKey("index_block");
--
Gitblit v1.8.0