From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/money/msg/UserMoneyMsgNotificationService.java |   34 +++++++++++++++++++++++++++-------
 1 files changed, 27 insertions(+), 7 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 e9c4239..516ef35 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
@@ -91,15 +91,13 @@
 
 	/**
 	 * 鍒嗕韩璧氳鍗曞埌璐�
-	 * 
 	 * @param uid
-	 * @param orderCount
-	 * @param goodsCount
-	 * @param money
-	 * @param balance
+	 * @param orderType 1-娣樺疂 2-浜笢绛夋笭閬�
+	 * @param money 鍒拌处閲戦
+	 * @param balance  璐︽埛浣欓
+	 * @param receivedDate 缁撶畻鏈堜唤
 	 */
-	public void shareOrderReceived(Long uid, int orderType, int orderCount, int goodsCount, BigDecimal money,
-			BigDecimal balance, String orderId, Date downTime);
+	public void shareOrderReceived(Long uid, int orderType,  BigDecimal money, BigDecimal balance,  Date receivedDate);
 
 
 	
@@ -153,6 +151,28 @@
 	 */
 	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);
+
+	/**
+	 * 鍥㈤槦鍒嗙孩
+	 * @param uid
+	 * @param money
+	 * @param balance
+	 * @param receivedDate
+	 */
+	public void teamDividend(Long uid, BigDecimal money, BigDecimal balance, Date receivedDate);
+
 
 	
 }

--
Gitblit v1.8.0