From 2b35e920a8873ba81530f4d86002a459185725ff Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 06 九月 2019 16:44:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/integral/IntegralTaskRecordService.java |   30 ++++++++++++++++++++++++++----
 1 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/integral/IntegralTaskRecordService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/integral/IntegralTaskRecordService.java
index 85fee40..a05452f 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/integral/IntegralTaskRecordService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/integral/IntegralTaskRecordService.java
@@ -149,11 +149,33 @@
 	 */
 	public long countByCidAndUidAndCreateTime(Long cid,Long uid, Date minTime, Date maxTime);
 
+	
 	/**
-	 * 琚個璇蜂汉涓嬩簡棣栧崟锛堢涓�绗旇繑鍒╄鍗曪級锛屽垯鐩存帴缁欓個璇蜂汉涓�绗旈噾甯佽繘鍏ュ埌閲戝竵浣欓涓紙閲戝竵鐨勯搴︽殏瀹氫负1500閲戝竵锛�
-	 * @param uid  閭�璇蜂汉id
-	 * @param beizu 澶囨敞淇℃伅
+	 * 琛ュ伩涓婄骇 锛氫竴绾ч槦鍛橀绗旇繑鍒╄鍗曚笉瓒�0.01鍏�
+	 * @param uid
+	 * @param beizu
 	 */
-	public void firstOrderRewardInviter(Long uid, String beizu);
+	public void firstRebateOrderRewardBoss(Long uid, Long originUid, String beizu);
+
+	/**
+	 * 琛ュ伩涓婁笂绾э細浜岀骇闃熷憳棣栫瑪杩斿埄璁㈠崟涓嶈冻0.01鍏�
+	 * @param uid
+	 * @param beizu
+	 */
+	public void firstRebateOrderRewardBossSuper(Long uid, Long originUid,String beizu);
+
+	/**
+	 * 棣栫瑪鍒嗕韩璁㈠崟涓嶈冻0.01鍏冭ˉ鍋�
+	 * @param uid
+	 * @param beizu
+	 */
+	public void firstShareOrderReward(Long uid, String beizu);
+
+	/**
+	 * 琛ュ伩涓婄骇 锛氶绗斿垎浜鍗曚笉瓒�0.01鍏冭ˉ鍋�
+	 * @param uid
+	 * @param beizu
+	 */
+	public void firstSharerOrderRewardBoss(Long uid, Long originUid, String beizu);
 
 }

--
Gitblit v1.8.0