From bb07147aaa96d1ef4c99e358dbbe7dad160dc62a Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期四, 19 十二月 2019 15:43:23 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/activity/ActivityServiceImpl.java |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/activity/ActivityServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/activity/ActivityServiceImpl.java
index e9f3917..9307183 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/activity/ActivityServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/activity/ActivityServiceImpl.java
@@ -320,7 +320,7 @@
 		return activityUserMapper.selectList();
 	}
 
-	@Transactional
+	@Transactional(rollbackFor=Exception.class)
 	@Override
 	public RecommendActivity addShareGoodsRecommendActivity(Long activityUid, List<Long> goodsList,
 			RecommendActivity activity) throws ActivityException , Exception{
@@ -397,7 +397,7 @@
 		return activity;
 	}
 
-	@Transactional
+	@Transactional(rollbackFor=Exception.class)
 	@Override
 	public RecommendActivity addInviteImgRecommendActivity(Long activityUid, RecommendActivity activity, String url,
 			 int px, int py, int erCodeSize) throws ActivityException, Exception {
@@ -446,7 +446,7 @@
 		return activity;
 	}
 
-	@Transactional
+	@Transactional(rollbackFor=Exception.class)
 	@Override
 	public RecommendActivity addTextAndImgRecommendActivity(Long activityUid,  List<String> imgList,
 			RecommendActivity activity) throws ActivityException, Exception {
@@ -509,7 +509,7 @@
 		return recommendActivityMapper.selectByPrimaryKey(id);
 	}
 
-	@Transactional
+	@Transactional(rollbackFor=Exception.class)
 	@Override
 	public RecommendActivity updateShareGoodsRecommendActivity(Long activityUid,
 			List<Long> goodsList, RecommendActivity activity) throws ActivityException , Exception{
@@ -592,7 +592,7 @@
 		return activity;
 	}
 
-	@Transactional
+	@Transactional(rollbackFor=Exception.class)
 	@Override
 	public RecommendActivity updateInviteImgRecommendActivity(Long activityUid, RecommendActivity activity, String url,
 			int px, int py, int erCodeSize) throws ActivityException , Exception{
@@ -659,7 +659,7 @@
 		return activity;
 	}
 
-	@Transactional
+	@Transactional(rollbackFor=Exception.class)
 	@Override
 	public RecommendActivity updateTextAndImgRecommendActivity(Long activityUid, List<String> imgList, 
 			RecommendActivity activity) throws ActivityException , Exception{
@@ -755,7 +755,7 @@
 		return recommendActivityMapper.getRecommendActivityEffectiveCount();
 	}
 
-	@Transactional
+	@Transactional(rollbackFor=Exception.class)
 	@Override
 	public void upgradeShareGoodsRecommendActivity(Long id) throws ActivityException {
 		// 鑾峰彇鍟嗗搧

--
Gitblit v1.8.0