From 263d995ed175dc8260b0f830751db376221e4ac9 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 12 十二月 2018 10:44:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/service/inter/activity/ActivityService.java | 22 +++++++++++++++++++++-
1 files changed, 21 insertions(+), 1 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..53e9a15 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,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;
}
--
Gitblit v1.8.0