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/SpecialServiceImpl.java |   22 +++++++++++++++++-----
 1 files changed, 17 insertions(+), 5 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 d5876da..7f1b792 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
@@ -38,6 +38,7 @@
 import com.yeshi.fanli.service.inter.homemodule.SpecialPlaceService;
 import com.yeshi.fanli.service.inter.homemodule.SpecialService;
 import com.yeshi.fanli.util.Constant;
+import com.yeshi.fanli.util.FilePathEnum;
 import com.yeshi.fanli.util.StringUtil;
 import com.yeshi.fanli.util.VersionUtil;
 
@@ -265,7 +266,7 @@
 		String type = contentType.substring(contentType.indexOf("/") + 1);
 
 		// 鏂囦欢璺緞
-		String filePath = "/img/special/" + UUID.randomUUID().toString().replace("-", "") + "." + type;
+		String filePath =FilePathEnum.special.getPath() + UUID.randomUUID().toString().replace("-", "") + "." + type;
 		// 鎵ц涓婁紶
 		String fileLink = COSManager.getInstance().uploadFile(inputStream, filePath).getUrl();
 
@@ -285,7 +286,7 @@
 	}
 
 	@Override
-	@Transactional
+	@Transactional(rollbackFor=Exception.class)
 	public void updateOrder(Long id, Integer moveType, Integer sex) throws SpecialException {
 
 		if (id == null || moveType == null || (!moveType.equals(1) && !moveType.equals(-1)) || sex == null) {
@@ -337,7 +338,7 @@
 	}
 
 	@Override
-	@Transactional
+	@Transactional(rollbackFor = Exception.class)
 	public int deleteBatchByPrimaryKey(List<Long> list) throws Exception {
 		List<Special> listSpecial = specialMapper.queryByListPrimaryKey(list);
 		for (Special special : listSpecial) {
@@ -351,6 +352,15 @@
 				COSManager.getInstance().deleteFile(subPicture);
 			}
 		}
+		
+		if (listSpecial != null)
+			for (Special special : listSpecial) {
+				List<AdActivityVersionControl> versionList = adActivityVersionControlService
+						.listByTypeAndSourceId(AdActivityType.special, special.getId());
+				if (versionList != null)
+					for (AdActivityVersionControl control : versionList)
+						adActivityVersionControlService.deleteByPrimaryKey(control.getId());
+			}
 		return specialMapper.deleteBatchByPrimaryKey(list);
 	}
 
@@ -448,8 +458,10 @@
 
 	@Override
 	@Cacheable(value = "specialCache", key = "'listByVersion-'+#start+'-'+#count+'-'+#card+'-'+#platform+'-'+#versionCode")
-	public List<Special> listByVersion(long start, int count, String card, Integer platform, Integer versionCode) {
-		return specialMapper.listByVersion(start, count, card, platform, versionCode);
+	public List<Special> listByVersion(long start, int count, String card, String platform, Integer versionCode) {
+		List<Special> specialList = specialMapper.listByPlaceKey(card, null, null, null);
+		filterSpecial(specialList, platform, versionCode);
+		return specialList;
 	}
 
 	/**

--
Gitblit v1.8.0