Merge remote-tracking branch 'origin/div' into 2.1.2

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

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

@@ -8,6 +8,7 @@
import com.yeshi.fanli.entity.bus.activity.ActivityUser;

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

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

import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;

import com.yeshi.fanli.exception.ActivityException;

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



@@ -45,8 +46,7 @@
    * @param top

    * @return

    */

   public RecommendActivity addShareGoodsRecommendActivity(Long activityUid, String title, List<Long> goodsList,

         boolean top, int shareCount) throws ActivityException;

   public RecommendActivity addShareGoodsRecommendActivity(Long activityUid, List<Long> goodsList,RecommendActivity activity) throws ActivityException, Exception;



   /**

    * 修改商品分享动态

@@ -60,8 +60,8 @@
    * @return

    * @throws ActivityException

    */

   public RecommendActivity updateShareGoodsRecommendActivity(Long id, Long activityUid, String title,

         List<Long> goodsList, boolean top, int shareCount) throws ActivityException;

   public RecommendActivity updateShareGoodsRecommendActivity(Long activityUid, List<Long> goodsList,

         RecommendActivity activity) throws ActivityException, Exception;



   /**

    * 更新分享商品动态的商品

@@ -94,8 +94,8 @@
    * @return

    * @throws ActivityException

    */

   public RecommendActivity addInviteImgRecommendActivity(Long activityUid, String title, String url, boolean top,

         int shareCount, int px, int py, int erCodeSize) throws ActivityException;

   public RecommendActivity addInviteImgRecommendActivity(Long activityUid, RecommendActivity activity, String url,

         int px, int py, int erCodeSize) throws ActivityException, Exception;



   /**

    * 修改邀请图动态

@@ -112,8 +112,8 @@
    * @return

    * @throws ActivityException

    */

   public RecommendActivity updateInviteImgRecommendActivity(Long id, Long activityUid, String title, String url,

         boolean top, int shareCount, int px, int py, int erCodeSize) throws ActivityException;

   public RecommendActivity updateInviteImgRecommendActivity(Long activityUid, RecommendActivity activity, String url,

       int px, int py, int erCodeSize) throws ActivityException, Exception;



   /**

    * 添加图文动态

@@ -124,8 +124,8 @@
    * @param top

    * @return

    */

   public RecommendActivity addTextAndImgRecommendActivity(Long activityUid, String title, List<String> imgList,

         boolean top, int shareCount) throws ActivityException;

   public RecommendActivity addTextAndImgRecommendActivity(Long activityUid, List<String> imgList,

         RecommendActivity activity) throws ActivityException, Exception;



   /**

    * 修改图文动态

@@ -139,8 +139,8 @@
    * @return

    * @throws ActivityException

    */

   public RecommendActivity updateTextAndImgRecommendActivity(Long id, Long activityUid, String title,

         List<String> imgList, boolean top, int shareCount) throws ActivityException;

   public RecommendActivity updateTextAndImgRecommendActivity(Long activityUid, List<String> imgList, 
         RecommendActivity activity) throws ActivityException, Exception;



   /**

    * 获取推荐活动列表

@@ -159,7 +159,7 @@
    * 

    * @return

    */

   public long getRecommendActivityCount();

   public long getRecommendActivityCount(String title);



   

   public long getRecommendActivityCountCache();

@@ -248,4 +248,24 @@
    * @throws ActivityException

    */

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

	
	
   /**

    * 更新动态商品详情

    * @param goods

    */

   public void updateRecommendActivityGoods(TaoBaoGoodsBrief goods);

	
   /**

    * 查询需发布的动态

    * @return

    */

   public List<RecommendActivity> getNeedPublish();



   /**

    * 动态图片

    * @param activityId

    * @return

    */

   public List<String> getImgByActivityId(Long activityId);

}