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 |   15 ++++++---------
 1 files changed, 6 insertions(+), 9 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 b7c6fca..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);
 
 
 	
@@ -148,11 +146,10 @@
 	 * 鍥㈤槦鏀剁泭娑堟伅
 	 * @param uid
 	 * @param money 鏈鍒拌处閲戦
-	 * @param subsidy 琛ヨ创閲戦
 	 * @param balance 浣欓
 	 * @param receivedDate  缁撶畻鏈堝害
 	 */
-	public void teamReceive(Long uid, BigDecimal money,BigDecimal subsidy,  BigDecimal balance, Date receivedDate);
+	public void teamReceive(Long uid, BigDecimal money, BigDecimal balance, Date receivedDate);
 
 	/**
 	 * 浣跨敤濂栧姳鍒�

--
Gitblit v1.8.0