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/dynamic/DynamicInfoService.java |   20 +++++++++++++++-----
 1 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/dynamic/DynamicInfoService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/dynamic/DynamicInfoService.java
index 009b4f7..a92b94b 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/dynamic/DynamicInfoService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/dynamic/DynamicInfoService.java
@@ -3,7 +3,6 @@
 import java.util.Date;
 import java.util.List;
 
-import com.yeshi.fanli.entity.bus.activity.ActivityUser;
 import com.yeshi.fanli.entity.bus.activity.RecommendActivity;
 import com.yeshi.fanli.entity.dynamic.DynamicInfo;
 
@@ -44,13 +43,13 @@
 	public void updateShareCount(DynamicInfo record);
 
 	/**
-	 * 鎻掑叆閭�璇风礌鏉�
+	 * 鎻掑叆閭�璇风礌鏉� - 鍔ㄦ��
 	 * @param content
 	 * @param picUrl
 	 */
-	public void insertInviteMaterial(String content, String picUrl, Long activityId, ActivityUser activityUser);
+	public void insertInviteActivity(RecommendActivity activity) throws Exception;
 
-	void insert(DynamicInfo record);
+	public void insert(DynamicInfo record);
 
 	public long count(Long cid, Long subId);
 
@@ -70,7 +69,7 @@
 	 *  鍔ㄦ�佸晢鍝�
 	 * @param activity
 	 */
-	public void saveActivityRecommend(RecommendActivity activity);
+	public void insertActivityRecommend(RecommendActivity activity);
 
 	/**
 	 * 鍒犻櫎鍔ㄦ�佷俊鎭�
@@ -83,4 +82,15 @@
 	 */
 	public void insertTimeInvite();
 
+
+	/**
+	 * 鏂扮増鍟嗗搧璇︽儏
+	 * @param start
+	 * @param count
+	 * @param cid
+	 * @param subId
+	 * @return
+	 */
+	public List<DynamicInfo> queryV2(int platform, int version, int start, int count, Long cid, Long subId);
+
 }

--
Gitblit v1.8.0