From d4588f4e43336b26b356b869c29d0c76390167d5 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 15 四月 2020 10:22:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/money/msg/UserMoneyMsgNotificationService.java |   64 ++++++-------------------------
 1 files changed, 13 insertions(+), 51 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/money/msg/UserMoneyMsgNotificationService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/money/msg/UserMoneyMsgNotificationService.java
index c3086d4..0eb7fff 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/money/msg/UserMoneyMsgNotificationService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/money/msg/UserMoneyMsgNotificationService.java
@@ -120,37 +120,7 @@
 
 	public void shareOrderWeiQuan(Long uid, String orderId, int orderType, BigDecimal money,BigDecimal fanliMoney, int goodsCount, Date downTime);
 
-	/**
-	 * 閭�璇疯禋璁㈠崟琚粺璁�
-	 * 
-	 * @param uid
-	 * @param orderCount
-	 * @param goodsCount
-	 * @param money
-	 * @param balance
-	 */
-	public void inviteOrderReceived(Long uid, int orderType, int orderCount, int goodsCount, BigDecimal money,
-			BigDecimal balance);
 
-	/**
-	 * 閭�璇疯鍗曠淮鏉�
-	 * 
-	 * @param uid
-	 * @param orderId
-	 * @param money
-	 * @param balance
-	 */
-	public void inviteOrderWeiQuan(Long uid, String orderId, int orderType, BigDecimal money, BigDecimal balance);
-
-	/**
-	 * 濂栧姳璁㈠崟鍒拌处
-	 * 
-	 * @param uid
-	 * @param orderId
-	 * @param money
-	 * @param balance
-	 */
-	public void orderReward(Long uid, String orderId, int orderType, BigDecimal money, BigDecimal balance);
 
 	/**
 	 * 绯荤粺琛ラ綈
@@ -162,27 +132,6 @@
 	 */
 	public void systemEqualize(Long uid, String reason, BigDecimal money, BigDecimal balance);
 
-	/**
-	 * 楗夸簡涔堣繑鍒╁埌璐�
-	 * 
-	 * @param uid
-	 * @param orderId
-	 * @param money
-	 * @param balance
-	 */
-	public void elmeFanli(Long uid, String orderId, BigDecimal money, BigDecimal balance);
-
-	
-	/**
-	 * 琛ヨ创娑堟伅
-	 * 
-	 * @param uid
-	 * @param date
-	 * @param from
-	 * @param money
-	 * @param balance
-	 */
-	public void inviteOrderSubSidy(Long uid, Date date, String from, BigDecimal money, BigDecimal balance);
 
 	/**
 	 * 绾㈠寘娑堟伅
@@ -204,6 +153,19 @@
 	 */
 	public void teamReceive(Long uid, BigDecimal money, BigDecimal balance, Date receivedDate);
 
+	/**
+	 * 浣跨敤濂栧姳鍒�
+	 * @param uid
+	 * @param orderId
+	 * @param orderType
+	 * @param goodsCount
+	 * @param money
+	 * @param balance
+	 * @param downTime
+	 */
+	public void rewardCounponReceived(Long uid, String orderId, int orderType, int goodsCount, BigDecimal money,
+			BigDecimal balance, Date downTime);
+
 
 	
 }

--
Gitblit v1.8.0