From 3bc4da858de83bcd53319533a87f35c56694e876 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 22 十二月 2018 12:01:17 +0800
Subject: [PATCH] 测试版本修改

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/activity/ActivityService.java |   16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/activity/ActivityService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/activity/ActivityService.java
index 5f491d8..0efba10 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/activity/ActivityService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/activity/ActivityService.java
@@ -2,12 +2,14 @@
 
 import java.util.List;
 
+import net.sf.json.JSONObject;
+
 import com.yeshi.fanli.entity.bus.activity.ActivityShareResult;
 import com.yeshi.fanli.entity.bus.activity.ActivityUser;
 import com.yeshi.fanli.entity.bus.activity.RecommendActivity;
-import com.yeshi.fanli.entity.bus.activity.RecommendActivityImg;
 import com.yeshi.fanli.entity.bus.activity.RecommendActivityInviteInfo;
 import com.yeshi.fanli.exception.ActivityException;
+import com.yeshi.fanli.exception.share.UserShareGoodsRecordException;
 
 /**
  * 鍔ㄦ�佹湇鍔�
@@ -172,8 +174,9 @@
 	 * @param uid
 	 * @param activityId
 	 * @return
+	 * @throws UserShareGoodsRecordException 
 	 */
-	public ActivityShareResult shareActivityGoods(Long uid, Long activityId) throws ActivityException;
+	public ActivityShareResult shareActivityGoods(Long uid, Long activityId) throws ActivityException, UserShareGoodsRecordException;
 
 	/**
 	 * 鍒嗕韩閭�璇峰浘鐗�
@@ -236,4 +239,13 @@
 	public RecommendActivity getRecommendActivityDetail(Long activityId);
 
 	public ActivityUser selectActivityUserByPrimaryKey(Long id);
+	
+	/**
+	 * 鍔ㄦ�佸垎浜�
+	 * @param uid
+	 * @param activityId
+	 * @return
+	 * @throws ActivityException
+	 */
+	public JSONObject shareGoodsV2(Long uid, Long activityId) throws ActivityException, UserShareGoodsRecordException;
 }

--
Gitblit v1.8.0