From 1e92eff67b997263ecefa255c63eb6641c47b57f Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 14 六月 2019 10:22:33 +0800
Subject: [PATCH] 设备消息BUG解决，品牌

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserNotificationService.java |   69 +++++++++++++++++++++++++++++-----
 1 files changed, 59 insertions(+), 10 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserNotificationService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserNotificationService.java
index 235ec69..aef48a0 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserNotificationService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserNotificationService.java
@@ -2,6 +2,8 @@
 
 import java.math.BigDecimal;
 
+import com.yeshi.fanli.entity.bus.user.Extract;
+
 /**
  * 鐢ㄦ埛閫氱煡鏈嶅姟
  * 
@@ -19,13 +21,19 @@
 	public void newerHongBao(Long uid, BigDecimal money);
 
 	/**
-	 * 璁㈠崟杩斿埄鍒拌处
+	 * 杩斿埄鍒拌处閫氱煡
 	 * 
 	 * @param uid
+	 *            -鐢ㄦ埛ID
 	 * @param orderId
-	 * @param money
+	 *            -璁㈠崟鍙�
+	 * @param goodsCount
+	 *            -鍟嗗搧鏁伴噺
+	 * @param balance-璐︽埛浣欓
+	 * @param money-杩斿埄璧勯噾
 	 */
-	public void orderFanliRecieved(Long uid, String orderId, BigDecimal money);
+	public void orderFanliRecieved(Long uid, String orderId, int goodsCount, BigDecimal balance,
+			BigDecimal money);
 
 	/**
 	 * 鎻愭垚鍒拌处
@@ -36,12 +44,27 @@
 	public void tiChengRecieved(Long uid, BigDecimal money);
 
 	/**
-	 * 璁㈠崟琚粺璁�
+	 * 閭�璇峰埌璐�
 	 * 
 	 * @param uid
-	 * @param orderId
+	 * @param orderCount-璁㈠崟鏁�
+	 * @param goodsCount-鍟嗗搧鏁�
+	 * @param balance-璐︽埛浣欓
+	 * @param money-璧勯噾
 	 */
-	public void orderFanliStatisticed(Long uid, String orderId);
+	public void tiChengInviteRecieved(Long uid, int orderCount, int goodsCount, BigDecimal balance, BigDecimal money);
+
+	/**
+	 * 鍒嗕韩鎻愭垚鍒拌处
+	 * 
+	 * @param uid
+	 * @param orderCount
+	 * @param goodsCount
+	 * @param balance
+	 * @param money
+	 */
+	public void tiChengShareRecieved(Long uid, int orderCount, int goodsCount, BigDecimal balance, BigDecimal money);
+
 
 	/**
 	 * 鎻愭垚璁㈠崟琚粺璁�
@@ -50,7 +73,33 @@
 	 * @param orderId
 	 * @param money
 	 */
-	public void tiChengStatisticed(Long uid, String orderId, BigDecimal money);
+	public void tiChengStatisticed(Long uid, String orderId,BigDecimal money);
+
+	/**
+	 * 鍒嗕韩璁㈠崟琚粺璁�
+	 * 
+	 * @param uid
+	 * @param orderId
+	 * @param goodsCount
+	 * @param orderState
+	 * @param payMoney
+	 * @param money
+	 */
+	public void orderShareStatisticed(Long uid, String orderId, int goodsCount, int orderState, BigDecimal payMoney,
+			BigDecimal money);
+
+	/**
+	 * 閭�璇疯鍗曡缁熻
+	 * 
+	 * @param uid
+	 * @param orderId
+	 * @param goodsCount
+	 * @param orderState
+	 * @param payMoney
+	 * @param money
+	 */
+	public void orderInviteStatisticed(Long uid, String orderId, int goodsCount, int orderState, BigDecimal payMoney,
+			BigDecimal money);
 
 	/**
 	 * 缁存潈杩斿埄璁㈠崟鎵ｆ
@@ -91,7 +140,7 @@
 	 * @param uid
 	 * @param time
 	 */
-	public void extractWrong(Long uid, String time);
+	public void extractWrong(Long uid, Extract extract, String time);
 
 	/**
 	 * 鎻愮幇鎴愬姛
@@ -99,7 +148,7 @@
 	 * @param uid
 	 * @param time
 	 */
-	public void extractSuccess(Long uid, String time);
+	public void extractSuccess(Long uid, Extract extract, String time);
 
 	/**
 	 * 鏀粯瀹濊处鍙烽獙璇佹垚鍔�
@@ -107,6 +156,6 @@
 	 * @param uid
 	 * @param money
 	 */
-	public void alipayAccountValidRight(Long uid, BigDecimal money,String account);
+	public void alipayAccountValidRight(Long uid, BigDecimal money, String account);
 
 }

--
Gitblit v1.8.0