From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/activity/ActivityService.java |   38 +++++++++++++++++++++++++-------------
 1 files changed, 25 insertions(+), 13 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 5a7d610..78e25ec 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
@@ -46,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;
 
 	/**
 	 * 淇敼鍟嗗搧鍒嗕韩鍔ㄦ��
@@ -61,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;
 
 	/**
 	 * 鏇存柊鍒嗕韩鍟嗗搧鍔ㄦ�佺殑鍟嗗搧
@@ -95,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;
 
 	/**
 	 * 淇敼閭�璇峰浘鍔ㄦ��
@@ -113,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;
 
 	/**
 	 * 娣诲姞鍥炬枃鍔ㄦ��
@@ -125,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;
 
 	/**
 	 * 淇敼鍥炬枃鍔ㄦ��
@@ -140,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;
 
 	/**
 	 * 鑾峰彇鎺ㄨ崘娲诲姩鍒楄〃
@@ -160,7 +159,7 @@
 	 * 
 	 * @return
 	 */
-	public long getRecommendActivityCount();
+	public long getRecommendActivityCount(String title);
 
 	
 	public long getRecommendActivityCountCache();
@@ -256,4 +255,17 @@
 	 * @param goods
 	 */
 	public void updateRecommendActivityGoods(TaoBaoGoodsBrief goods);
+	
+	/**
+	 * 鏌ヨ闇�鍙戝竷鐨勫姩鎬�
+	 * @return
+	 */
+	public List<RecommendActivity> getNeedPublish();
+
+	/**
+	 * 鍔ㄦ�佸浘鐗�
+	 * @param activityId
+	 * @return
+	 */
+	public List<String> getImgByActivityId(Long activityId);
 }

--
Gitblit v1.8.0