From b3fce41f7960a21c707788aa87448c3e4de82da9 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期三, 27 二月 2019 11:47:51 +0800
Subject: [PATCH] 福利券 邀请队员成功之后激活

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/activity/ActivityServiceImpl.java |   17 ++++++++++++++---
 1 files changed, 14 insertions(+), 3 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 8aae473..43b8ea0 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
@@ -13,6 +13,7 @@
 
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.yeshi.utils.entity.FileUploadResult;
 import org.yeshi.utils.taobao.TbImgUtil;
 
@@ -306,6 +307,7 @@
 		return activityUserMapper.selectList();
 	}
 
+	@Transactional
 	@Override
 	public RecommendActivity addShareGoodsRecommendActivity(Long activityUid, String title, List<Long> goodsList,
 			boolean top, int shareCount) throws ActivityException {
@@ -369,9 +371,12 @@
 		return activity;
 	}
 
+	@Transactional
 	@Override
 	public RecommendActivity addInviteImgRecommendActivity(Long activityUid, String title, String url, boolean top,
 			int shareCount, int px, int py, int erCodeSize) throws ActivityException {
+		if (StringUtil.isNullOrEmpty(url))
+			throw new ActivityException(1, "鍥剧墖涓虹┖");
 		RecommendActivity activity = new RecommendActivity();
 		activity.setActivityUser(new ActivityUser(activityUid));
 		activity.setCreateTime(new Date());
@@ -401,11 +406,11 @@
 		recommendActivityInviteInfo.setRecommendActivity(activity);
 		recommendActivityInviteInfo.setSize(erCodeSize);
 		recommendActivityInviteInfoMapper.insertSelective(recommendActivityInviteInfo);
-
 		recommendActivityImgMapper.insertSelective(img);
 		return activity;
 	}
 
+	@Transactional
 	@Override
 	public RecommendActivity addTextAndImgRecommendActivity(Long activityUid, String title, List<String> imgList,
 			boolean top, int shareCount) throws ActivityException {
@@ -436,6 +441,7 @@
 		return activity;
 	}
 
+	@Transactional
 	@Override
 	public void deleteRecommendActivity(long[] ids) {
 		recommendActivityMapper.batchDeleteByPrimaryKey(ids);
@@ -449,6 +455,7 @@
 		return recommendActivityMapper.selectByPrimaryKey(id);
 	}
 
+	@Transactional
 	@Override
 	public RecommendActivity updateShareGoodsRecommendActivity(Long id, Long activityUid, String title,
 			List<Long> goodsList, boolean top, int shareCount) throws ActivityException {
@@ -503,6 +510,7 @@
 		return activity;
 	}
 
+	@Transactional
 	@Override
 	public RecommendActivity updateInviteImgRecommendActivity(Long id, Long activityUid, String title, String url,
 			boolean top, int shareCount, int px, int py, int erCodeSize) throws ActivityException {
@@ -545,6 +553,7 @@
 		return activity;
 	}
 
+	@Transactional
 	@Override
 	public RecommendActivity updateTextAndImgRecommendActivity(Long id, Long activityUid, String title,
 			List<String> imgList, boolean top, int shareCount) throws ActivityException {
@@ -601,6 +610,7 @@
 		return getRecommendActivityCount();
 	}
 
+	@Transactional
 	@Override
 	public void upgradeShareGoodsRecommendActivity(Long id) throws ActivityException {
 		// 鑾峰彇鍟嗗搧
@@ -706,13 +716,14 @@
 		return activityUserMapper.selectByPrimaryKey(id);
 	}
 
+	@Transactional
 	@Override
 	public void updateRecommendActivityGoods(TaoBaoGoodsBrief goods) {
 		List<RecommendActivityTaoBaoGoods> list = recommendActivityTaoBaoGoodsMapper
 				.selectByAuctionId(goods.getAuctionId());
-		
+
 		BigDecimal d = TaoBaoUtil.getAfterUseCouplePrice(goods);
-		
+
 		RecommendActivityTaoBaoGoods updateGoods = new RecommendActivityTaoBaoGoods();
 		if (!StringUtil.isNullOrEmpty(goods.getCouponInfo()) && !"鏃�".equalsIgnoreCase(goods.getCouponInfo())) {
 			updateGoods.setDesc("鍒稿悗浠凤細楼" + d);

--
Gitblit v1.8.0