Merge remote-tracking branch 'origin/master'

admin

2018-12-12 dc73adfa9d92d11d1a8512778deacc34fa877eef

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

@@ -2,7 +2,7 @@


import java.util.List;



import org.springframework.cache.annotation.Cacheable;

import net.sf.json.JSONObject;



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

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

@@ -17,6 +17,16 @@
 *

 */

public interface ActivityService {

	
   public int insert(RecommendActivity record);



   public int insertSelective(RecommendActivity record);



   public RecommendActivity selectByPrimaryKey(Long id);



   public int updateByPrimaryKeySelective(RecommendActivity record);



   public int updateByPrimaryKey(RecommendActivity record);



   /**

    * 获取活动用户列表

@@ -226,4 +236,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;

}