From 24a8d17e007545f7426c48352109aa1a9c6587ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 06 五月 2020 12:02:09 +0800
Subject: [PATCH] IOS上线隐藏我的界面的banner与超级会员升级信息

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SwiperPictureServiceImpl.java |   49 +++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 45 insertions(+), 4 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SwiperPictureServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SwiperPictureServiceImpl.java
index 39603e7..b0da86f 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SwiperPictureServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SwiperPictureServiceImpl.java
@@ -22,7 +22,6 @@
 import com.yeshi.fanli.entity.AppVersionInfo;
 import com.yeshi.fanli.entity.bus.homemodule.AdActivityVersionControl;
 import com.yeshi.fanli.entity.bus.homemodule.AdActivityVersionControl.AdActivityType;
-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.banner.SwiperPictureException;
@@ -30,6 +29,7 @@
 import com.yeshi.fanli.service.inter.config.AppVersionService;
 import com.yeshi.fanli.service.inter.homemodule.AdActivityVersionControlService;
 import com.yeshi.fanli.service.inter.homemodule.SwiperPictureService;
+import com.yeshi.fanli.util.FilePathEnum;
 import com.yeshi.fanli.util.StringUtil;
 
 @Service
@@ -95,6 +95,8 @@
 			record.setParams(null);
 		} else if (!StringUtil.isJson(params)) {
 			throw new SwiperPictureException(1, "璺宠浆鍙傛暟闈濲SON鏍煎紡");
+		} else {
+			record.setParams(params.trim());
 		}
 
 		if (!StringUtil.isNullOrEmpty(jumpType)) {
@@ -193,7 +195,7 @@
 		String type = contentType.substring(contentType.indexOf("/") + 1);
 
 		// 鏂囦欢璺緞
-		String filePath = "/img/swiperPic/" + UUID.randomUUID().toString().replace("-", "") + "." + type;
+		String filePath = FilePathEnum.swiper.getPath() + UUID.randomUUID().toString().replace("-", "") + "." + type;
 		// 鎵ц涓婁紶
 		String fileLink = COSManager.getInstance().uploadFile(inputStream, filePath).getUrl();
 
@@ -212,11 +214,36 @@
 			COSManager.getInstance().deleteFile(picture);
 		}
 	}
+	
+	
+	@Override
+	public void switchState(Long id) throws SwiperPictureException {
+		if (id == null) {
+			throw new SwiperPictureException(1, "璇蜂紶閫掓纭弬鏁�");
+		}
+		
+		SwiperPicture resultObj = swiperPictureMapper.selectByPrimaryKey(id);
+		if (resultObj == null) {
+			throw new SwiperPictureException(1, "姝ゅ唴瀹瑰凡涓嶅瓨鍦�");
+		}
+		
+		Integer state = resultObj.getState();
+		if (state == null || state == 0) {
+			state = 1;
+		} else {
+			state = 0;
+		}
+		
+		SwiperPicture updateObj = new SwiperPicture();
+		updateObj.setId(id);
+		updateObj.setState(state);
+		updateObj.setJumpNeedLogin(resultObj.isJumpNeedLogin());
+		swiperPictureMapper.updateByPrimaryKeySelective(updateObj);
+	}
 
 	@Override
-	@Transactional
+	@Transactional(rollbackFor = Exception.class)
 	public int deleteBatchByPrimaryKey(List<Long> list) throws SwiperPictureException {
-
 		List<SwiperPicture> listSwiper = swiperPictureMapper.queryByListPrimaryKey(list);
 		for (SwiperPicture swiperPicture : listSwiper) {
 			String src = swiperPicture.getSrc();
@@ -225,6 +252,14 @@
 			}
 		}
 
+		if (listSwiper != null)
+			for (SwiperPicture picture : listSwiper) {
+				List<AdActivityVersionControl> versionList = adActivityVersionControlService
+						.listByTypeAndSourceId(AdActivityType.banner, picture.getId());
+				if (versionList != null)
+					for (AdActivityVersionControl control : versionList)
+						adActivityVersionControlService.deleteByPrimaryKey(control.getId());
+			}
 		return swiperPictureMapper.deleteBatchByPrimaryKey(list);
 	}
 
@@ -301,6 +336,12 @@
 	public List<SwiperPicture> getByBannerCardAndVersion(String card, String platform, int version) {
 		List<SwiperPicture> list = swiperPictureMapper.getByBannerCard(card);
 		filterSwipePicture(list, platform, version);
+		for (SwiperPicture picture : list) {
+			if (picture.isJumpNeedLogin() && picture.getJumpDetail() != null) {
+				picture.getJumpDetail().setNeedLogin(true);
+			}
+		}
+
 		return list;
 	}
 

--
Gitblit v1.8.0