From d146e7bca73c7605af6b718b5df0b757e0034f0e Mon Sep 17 00:00:00 2001 From: Administrator <Administrator@Admin> Date: 星期二, 18 十二月 2018 11:17:41 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- fanli/src/main/java/com/yeshi/fanli/service/inter/activity/ActivityService.java | 17 +++++++++++++++-- 1 files changed, 15 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 65d8a8b..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; /** * 鍒嗕韩閭�璇峰浘鐗� @@ -235,4 +238,14 @@ 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