From 9fc5a5bf46a7db97bec59a672cf2b16fb9b9d832 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 16 十月 2019 16:47:27 +0800
Subject: [PATCH] VIVO推送修改

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/activity/ActivityService.java |   72 ++++++++++++++++++++++++++++-------
 1 files changed, 57 insertions(+), 15 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 7b063ea..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
@@ -2,13 +2,15 @@
 
 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;
 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;
 
 /**
  * 鍔ㄦ�佹湇鍔�
@@ -17,6 +19,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);
 
 	/**
 	 * 鑾峰彇娲诲姩鐢ㄦ埛鍒楄〃
@@ -34,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;
 
 	/**
 	 * 淇敼鍟嗗搧鍒嗕韩鍔ㄦ��
@@ -49,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;
 
 	/**
 	 * 鏇存柊鍒嗕韩鍟嗗搧鍔ㄦ�佺殑鍟嗗搧
@@ -83,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;
 
 	/**
 	 * 淇敼閭�璇峰浘鍔ㄦ��
@@ -101,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;
 
 	/**
 	 * 娣诲姞鍥炬枃鍔ㄦ��
@@ -113,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;
 
 	/**
 	 * 淇敼鍥炬枃鍔ㄦ��
@@ -128,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;
 
 	/**
 	 * 鑾峰彇鎺ㄨ崘娲诲姩鍒楄〃
@@ -148,7 +159,7 @@
 	 * 
 	 * @return
 	 */
-	public long getRecommendActivityCount();
+	public long getRecommendActivityCount(String title);
 
 	
 	public long getRecommendActivityCountCache();
@@ -163,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;
 
 	/**
 	 * 鍒嗕韩閭�璇峰浘鐗�
@@ -226,4 +238,34 @@
 	
 	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;
+	
+	
+	/**
+	 * 鏇存柊鍔ㄦ�佸晢鍝佽鎯�
+	 * @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