From 9a24f2802a3d6fe3e82c05e52f2880d65ad04dcf Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期一, 29 四月 2019 08:59:47 +0800
Subject: [PATCH] Merge branch 'div_develop' into master_develop
---
fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SpecialServiceImpl.java | 43 ++++++++++++++++++++++++++++++++++++++++---
1 files changed, 40 insertions(+), 3 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 c4401cb..64cd60d 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
@@ -7,19 +7,21 @@
import java.util.UUID;
import javax.annotation.Resource;
-import javax.transaction.Transactional;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
import org.yeshi.utils.JsonUtil;
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.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 +44,9 @@
@Resource
private JumpDetailV2Service jumpDetailV2Service;
+
+ @Resource
+ private ConfigService configService;
@Override
@@ -119,6 +124,25 @@
if (resultObj == null) {
throw new SpecialException(1, "淇敼鍐呭宸蹭笉瀛樺湪");
}
+
+ // 鍒犻櫎鍥剧墖
+ Boolean delIcon = record.getDelIcon();
+ if (delIcon != null && delIcon) {
+ removePicture(resultObj.getIcon());
+ resultObj.setIcon(null);
+ }
+ Boolean delPicture = record.getDelPicture();
+ if (delPicture != null && delPicture) {
+ removePicture(resultObj.getPicture());
+ resultObj.setPicture(null);
+ }
+ Boolean delSubPicture = record.getDelSubPicture();
+ if (delSubPicture != null && delSubPicture) {
+ removePicture(resultObj.getSubPicture());
+ resultObj.setSubPicture(null);
+ }
+
+
if (picture != null && picture.trim().length() > 0) {
// 鍒犻櫎鑰佸浘
@@ -315,7 +339,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();
@@ -336,7 +360,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){
@@ -349,6 +380,7 @@
// 鏁版嵁澶勭悊
handlelist(listActivity);
activityMap.put("list", JsonUtil.getApiCommonGson().toJson(listActivity));
+
// 棣栭〉-鏂瑰舰涓撻锛堝搧鐗屽埜銆佹瘝濠�...锛�
@@ -374,6 +406,11 @@
return root;
}
+ @Override
+ public List<Special> listByPlaceKey(String placeKey) {
+ return specialMapper.listByPlaceKey(placeKey);
+ }
+
/**
* 澶勭悊 鏁版嵁
--
Gitblit v1.8.0