From 6fdcc0c26dd33e87a024a69ed635d9aedb59cad6 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 07 一月 2020 12:02:50 +0800
Subject: [PATCH] 订单搜索引擎增量更新

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SwiperPictureServiceImpl.java |   20 +++++++++++++++++---
 1 files changed, 17 insertions(+), 3 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..2ef0365 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
@@ -193,7 +193,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();
 
@@ -214,7 +214,7 @@
 	}
 
 	@Override
-	@Transactional
+	@Transactional(rollbackFor = Exception.class)
 	public int deleteBatchByPrimaryKey(List<Long> list) throws SwiperPictureException {
 
 		List<SwiperPicture> listSwiper = swiperPictureMapper.queryByListPrimaryKey(list);
@@ -225,6 +225,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 +309,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