From d8359ddb48dab5cc797a9d552e11fde571f4920c Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 27 八月 2019 12:32:46 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/integral/IntegralGetService.java |   22 ++++++++++------------
 1 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/integral/IntegralGetService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/integral/IntegralGetService.java
index 1a62a71..c0534aa 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/integral/IntegralGetService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/integral/IntegralGetService.java
@@ -3,8 +3,6 @@
 import com.yeshi.fanli.entity.integral.IntegralTaskRecord;
 import com.yeshi.fanli.exception.integral.IntegralGetException;
 
-import net.sf.json.JSONObject;
-
 /**
  * 閲戝竵鑾峰彇鏈嶅姟
  * 
@@ -23,7 +21,7 @@
 	 *            浜嬩欢缂栫爜
 	 * @throws IntegralGetException
 	 */
-	public IntegralTaskRecord addEventStatistic(Long uid, String event, JSONObject params) throws IntegralGetException;
+	public IntegralTaskRecord addEventStatistic(Long uid, String event) throws IntegralGetException;
 
 	/**
 	 * 浠庣矘璐存澘鎺ㄨ崘杩涘叆鎼滅储缁撴灉
@@ -31,7 +29,7 @@
 	 * @param uid
 	 * @throws IntegralGetException
 	 */
-	public void addRecommendSearch(Long uid) throws IntegralGetException;
+	public IntegralTaskRecord addRecommendSearch(Long uid);
 
 	/**
 	 * 鎼滅储缁撴灉娴忚
@@ -39,7 +37,7 @@
 	 * @param uid
 	 * @throws IntegralGetException
 	 */
-	public void addSearchResultScan(Long uid,String kw) throws IntegralGetException;
+	public IntegralTaskRecord addSearchResultScan(Long uid,String kw) ;
 
 	/**
 	 * 鍒嗕韩閭�璇峰浘
@@ -47,7 +45,7 @@
 	 * @param uid
 	 * @throws IntegralGetException
 	 */
-	public void addShareInvite(Long uid) throws IntegralGetException;
+	public IntegralTaskRecord addShareInvite(Long uid);
 
 	/**
 	 * 杩涘叆搴楅摵
@@ -55,7 +53,7 @@
 	 * @param uid
 	 * @throws IntegralGetException
 	 */
-	public void addIntoShop(Long uid) throws IntegralGetException;
+	public IntegralTaskRecord addIntoShop(Long uid, String shopUrlMD5);
 
 	/**
 	 * 鎺ㄩ�佽褰曢〉娴忚
@@ -63,7 +61,7 @@
 	 * @param uid
 	 * @throws IntegralGetException
 	 */
-	public void addScanPushHistory(Long uid) throws IntegralGetException;
+	public IntegralTaskRecord addScanPushHistory(Long uid) ;
 
 	/**
 	 * 鍟嗗搧璇︽儏椤垫祻瑙�
@@ -72,28 +70,28 @@
 	 * @param goodsType
 	 * @param goodsId
 	 */
-	public void addScanGoodsDetail(Long uid, int goodsType, Long goodsId);
+	public IntegralTaskRecord addScanGoodsDetail(Long uid, int goodsType, Long goodsId);
 
 	/**
 	 * 鎺ㄨ崘banner娴忚
 	 * 
 	 * @param uid
 	 */
-	public void addScanRecommendBanner(Long uid);
+	public IntegralTaskRecord addScanRecommendBanner(Long uid, String id);
 
 	/**
 	 * 鎺ㄨ崘涓撻娴忚
 	 * 
 	 * @param uid
 	 */
-	public void addScanRecommendSpecial(Long uid);
+	public IntegralTaskRecord addScanRecommendSpecial(Long uid, String id);
 
 	/**
 	 * 娣樺疂璐墿杞︽祻瑙�
 	 * 
 	 * @param uid
 	 */
-	public void addScanTaoBaoCart(Long uid);
+	public IntegralTaskRecord addScanTaoBaoCart(Long uid);
 
 	/**
 	 * 鑷喘绔嬪噺

--
Gitblit v1.8.0