From 486e22c57ca8a1e2dc6877b539e2f3add67250f1 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 23 十一月 2019 18:28:00 +0800
Subject: [PATCH] 冲突解决

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/user/integral/IntegralGetService.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/user/integral/IntegralGetService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/user/integral/IntegralGetService.java
index 79952b3..f4a6a27 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/user/integral/IntegralGetService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/user/integral/IntegralGetService.java
@@ -159,26 +159,26 @@
 	 *  杩斿埄璁㈠崟
 	 * @param uid
 	 */
-	public void addRebateOrder(Long uid);
+	public void addRebateOrder(Long uid,String orderNo,int sourceType);
 
 	/**
 	 * 涓�绾ч個璇疯鍗�
 	 * @param uid
 	 */
-	public void addInviteOrderLevelOne(Long uid);
+	public void addInviteOrderLevelOne(Long uid,String orderNo,int sourceType);
 
 	/**
 	 * 浜岀骇閭�璇疯鍗�
 	 * @param uid
 	 */
-	public void addInviteOrderLevelTwo(Long uid);
+	public void addInviteOrderLevelTwo(Long uid,String orderNo,int sourceType);
 
 	
 	/**
 	 * 鍒嗕韩璁㈠崟
 	 * @param uid
 	 */
-	public void addShareOrder(Long uid);
+	public void addShareOrder(Long uid,String orderNo,int sourceType);
 
 	/**
 	 * 寰俊鎺堟潈

--
Gitblit v1.8.0