From 51a4ff5d777028d52a19c314a99f796334cb7b51 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 23 十一月 2019 18:30:01 +0800
Subject: [PATCH] 配置文件修改

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SpecialCardServiceImpl.java |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SpecialCardServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SpecialCardServiceImpl.java
index b3437e9..0e9e4da 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SpecialCardServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SpecialCardServiceImpl.java
@@ -7,16 +7,15 @@
 import java.util.UUID;
 
 import javax.annotation.Resource;
-import javax.transaction.Transactional;
 
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 import org.yeshi.utils.tencentcloud.COSManager;
 
 import com.yeshi.fanli.dao.mybatis.homemodule.SpecialCardMapper;
 import com.yeshi.fanli.entity.bus.homemodule.SpecialCard;
 import com.yeshi.fanli.entity.bus.homemodule.SpecialPlace;
-import com.yeshi.fanli.exception.FloatADException;
 import com.yeshi.fanli.exception.homemodule.SpecialCardException;
 import com.yeshi.fanli.service.inter.config.BusinessSystemService;
 import com.yeshi.fanli.service.inter.homemodule.SpecialCardService;
@@ -79,7 +78,14 @@
 			// 淇敼
 			SpecialCard resultObj = specialCardMapper.selectByPrimaryKey(id);
 			if (resultObj == null) {
-				throw new FloatADException(1, "淇敼鍐呭宸蹭笉瀛樺湪");
+				throw new SpecialCardException(1, "淇敼鍐呭宸蹭笉瀛樺湪");
+			}
+			
+			// 鍒犻櫎鍥剧墖
+			Boolean delPicture = record.getDelPicture();
+			if (delPicture != null && delPicture) {
+				removePicture(resultObj.getBottomPicture());
+				resultObj.setBottomPicture(null);
 			}
 			
 			if (picture != null && picture.trim().length() > 0) {
@@ -178,7 +184,7 @@
 		}
 		
 		for (SpecialCard specialCard: listObj) {
-			long totalSpecial= specialService.countlistQueryByCard(specialCard.getId(), null);
+			long totalSpecial= specialService.countlistQueryByCard(specialCard.getId(), null, null);
 			specialCard.setTotalSpecial(totalSpecial);
 			
 			Date startTime = specialCard.getStartTime();

--
Gitblit v1.8.0