Merge remote-tracking branch 'origin/master'

Administrator

2018-12-18 d146e7bca73c7605af6b718b5df0b757e0034f0e

 fanli/src/main/java/com/yeshi/fanli/service/inter/activity/ActivityService.java

@@ -9,6 +9,7 @@
import com.yeshi.fanli.entity.bus.activity.RecommendActivity;

import com.yeshi.fanli.entity.bus.activity.RecommendActivityInviteInfo;

import com.yeshi.fanli.exception.ActivityException;

import com.yeshi.fanli.exception.share.UserShareGoodsRecordException;



/**

 * 动态服务

@@ -173,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;



   /**

    * 分享邀请图片

@@ -245,5 +247,5 @@
    * @return

    * @throws ActivityException

    */

   public JSONObject shareGoodsV2(Long uid, Long activityId) throws ActivityException;

   public JSONObject shareGoodsV2(Long uid, Long activityId) throws ActivityException, UserShareGoodsRecordException;

}