From 3e4ef41ffacd7f5fda2e81c3810cd11a6375b83c Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 15 六月 2020 16:32:35 +0800
Subject: [PATCH] 好单库转链支持

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/activity/ActivityServiceImpl.java |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 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..494f6d1 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
@@ -30,6 +30,7 @@
 import com.yeshi.fanli.entity.bus.activity.RecommendActivityInviteInfo;
 import com.yeshi.fanli.entity.bus.activity.RecommendActivityTaoBaoGoods;
 import com.yeshi.fanli.entity.goods.CommonGoods;
+import com.yeshi.fanli.entity.system.ConfigKeyEnum;
 import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
 import com.yeshi.fanli.exception.ActivityException;
 import com.yeshi.fanli.exception.share.UserShareGoodsRecordException;
@@ -285,7 +286,7 @@
 		data.put("fanMoney", shareMoney);
 		data.put("shareId", shareRecord.getRedisKey());
 		data.put("shareImg", loadResult);
-		data.put("notifyDesc", configService.get("goods_share_multiple_notify"));
+		data.put("notifyDesc", configService.get(ConfigKeyEnum.goodsShareMultipleNotify.getKey()));
 
 		return data;
 
@@ -320,7 +321,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 +398,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 +447,7 @@
 		return activity;
 	}
 
-	@Transactional
+	@Transactional(rollbackFor=Exception.class)
 	@Override
 	public RecommendActivity addTextAndImgRecommendActivity(Long activityUid,  List<String> imgList,
 			RecommendActivity activity) throws ActivityException, Exception {
@@ -509,7 +510,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 +593,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 +660,7 @@
 		return activity;
 	}
 
-	@Transactional
+	@Transactional(rollbackFor=Exception.class)
 	@Override
 	public RecommendActivity updateTextAndImgRecommendActivity(Long activityUid, List<String> imgList, 
 			RecommendActivity activity) throws ActivityException , Exception{
@@ -755,7 +756,7 @@
 		return recommendActivityMapper.getRecommendActivityEffectiveCount();
 	}
 
-	@Transactional
+	@Transactional(rollbackFor=Exception.class)
 	@Override
 	public void upgradeShareGoodsRecommendActivity(Long id) throws ActivityException {
 		// 鑾峰彇鍟嗗搧

--
Gitblit v1.8.0