From dd5b15229cb15459fa7c31ccea77dac28cbfafbd Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 13 四月 2020 10:04:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/money/msg/UserMoneyMsgNotificationService.java |   93 ++++++++++++++++++++++++++++++----------------
 1 files changed, 61 insertions(+), 32 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 3d52938..c3086d4 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
@@ -6,7 +6,6 @@
 import com.yeshi.fanli.entity.bus.msg.MsgMoneyDetail.MsgTypeMoneyTypeEnum;
 import com.yeshi.fanli.entity.bus.user.AlipayAccountValidNormalHistory;
 import com.yeshi.fanli.entity.bus.user.Extract;
-import com.yeshi.fanli.entity.bus.user.ExtractWeiXinRecord;
 
 /**
  * 鐢ㄦ埛璧勯噾娑堟伅閫氱煡
@@ -31,20 +30,37 @@
 	 */
 	public void extractFail(Extract extract, String stateDesc);
 
+	
 	/**
-	 * 鎻愮幇鎴愬姛
-	 * 
+	 *  鎻愮幇鎴愬姛
+	 * @Title: extractSuccess
+	 * @Description: 
 	 * @param extract
+	 * @param alipayNo 鏀粯瀹濇祦姘村彿
+	 * void 杩斿洖绫诲瀷
+	 * @throws
 	 */
-	public void extractSuccess(Extract extract);
+	public void extractSuccess(Extract extract, String alipayNo);
 
 	/**
 	 * 鏀粯瀹濊处鍙烽獙璇�
 	 * 
 	 * @param history
+	 * @param limitDay 闄愬埗鏃堕棿
+	 * @param change 鏄惁涓轰慨鏀�  true 淇敼   false 棣栨缁戝畾
 	 */
-	public void alipayAccountValid(AlipayAccountValidNormalHistory history);
+	public void alipayAccountValid(AlipayAccountValidNormalHistory history, String limitDay, boolean change);
 
+	/**
+	 * 浠樺疂璐﹀彿楠岃瘉澶辫触
+	 * @param history
+	 * @param limitDay
+	 * @param change
+	 */
+	public void alipayAccountValidFail(AlipayAccountValidNormalHistory history, int limitDay, boolean change);
+	
+	
+	
 	/**
 	 * 杩斿埄璁㈠崟鍒拌处
 	 * 
@@ -55,20 +71,26 @@
 	 * @param balance
 	 */
 	public void fanliOrderReceived(Long uid, String orderId, int orderType, int goodsCount, BigDecimal money,
-			BigDecimal balance);
+			BigDecimal balance, Date downTime);
 
 	/**
 	 * 杩斿埄璁㈠崟缁存潈
-	 * 
-	 * @param uid
-	 * @param orderId
-	 * @param money
-	 * @param balance
+	 * @Title: fanliOrderWeiQuan
+	 * @Description: 
+	 * @param uid 鐢ㄦ埛ID
+	 * @param orderId -璁㈠崟鍙�
+	 * @param orderType -璁㈠崟绫诲瀷
+	 * @param money -缁存潈鎵ｉ櫎閲戦
+	 * @param fanliMoney -杩斿埄閲戦
+	 * @param goodsCount 鍟嗗搧鏁伴噺
+	 * @param downTime 涓嬪崟鏃堕棿
+	 * void 杩斿洖绫诲瀷
+	 * @throws
 	 */
-	public void fanliOrderWeiQuan(Long uid, String orderId, int orderType, BigDecimal money, BigDecimal balance);
+	public void fanliOrderWeiQuan(Long uid, String orderId, int orderType, BigDecimal money, BigDecimal fanliMoney, int goodsCount, Date downTime);
 
 	/**
-	 * 鍒嗕韩璧氳鍗曡缁熻
+	 * 鍒嗕韩璧氳鍗曞埌璐�
 	 * 
 	 * @param uid
 	 * @param orderCount
@@ -77,18 +99,26 @@
 	 * @param balance
 	 */
 	public void shareOrderReceived(Long uid, int orderType, int orderCount, int goodsCount, BigDecimal money,
-			BigDecimal balance);
+			BigDecimal balance, String orderId, Date downTime);
 
+
+	
 	/**
 	 * 鍒嗕韩璁㈠崟缁存潈
-	 * 
+	 * @Title: shareOrderWeiQuan
+	 * @Description: 
 	 * @param uid
-	 * @param orderId
-	 * @param money
-	 * @param balance
+	 * @param orderId -璁㈠崟鍙�
+	 * @param orderType 璁㈠崟绫诲瀷
+	 * @param money 缁存潈閲戦
+	 * @param fanliMoney 杩斿埄閲戦
+	 * @param goodsCount -鍟嗗搧鏁伴噺
+	 * @param downTime 涓嬪崟鏃堕棿
+	 * void 杩斿洖绫诲瀷
+	 * @throws
 	 */
 
-	public void shareOrderWeiQuan(Long uid, String orderId, int orderType, BigDecimal money, BigDecimal balance);
+	public void shareOrderWeiQuan(Long uid, String orderId, int orderType, BigDecimal money,BigDecimal fanliMoney, int goodsCount, Date downTime);
 
 	/**
 	 * 閭�璇疯禋璁㈠崟琚粺璁�
@@ -142,19 +172,6 @@
 	 */
 	public void elmeFanli(Long uid, String orderId, BigDecimal money, BigDecimal balance);
 
-	/**
-	 * 鑷姩鎻愮幇娑堟伅-寰俊
-	 * 
-	 * @param extractRecord
-	 * 
-	 * @param stateDesc
-	 * 
-	 * @param desc
-	 * 
-	 * @param beiZhu
-	 */
-	public void extractAuto(ExtractWeiXinRecord extractRecord, String stateDesc, String desc, String beiZhu);
-
 	
 	/**
 	 * 琛ヨ创娑堟伅
@@ -177,4 +194,16 @@
 	 */
 	public void teamRedPackRewardMsg(Long uid, MsgTypeMoneyTypeEnum type, BigDecimal money, String stateDesc,String content);
 	
+	
+	/**
+	 * 鍥㈤槦鏀剁泭娑堟伅
+	 * @param uid
+	 * @param money 鏈鍒拌处閲戦
+	 * @param balance 浣欓
+	 * @param receivedDate  缁撶畻鏈堝害
+	 */
+	public void teamReceive(Long uid, BigDecimal money, BigDecimal balance, Date receivedDate);
+
+
+	
 }

--
Gitblit v1.8.0