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

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/money/msg/UserMoneyMsgNotificationService.java |   29 +++++++++++++++++++++++++----
 1 files changed, 25 insertions(+), 4 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 cdc3eee..bd78bd6 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
@@ -155,10 +155,6 @@
 	 */
 	public void extractAuto(ExtractWeiXinRecord extractRecord, String stateDesc, String desc, String beiZhu);
 
-	/**
-	 * 绾㈠寘娑堟伅
-	 */
-	public void redPackMsg(Long uid, MsgTypeMoneyTypeEnum type, String content, String beiZhu);
 	
 	/**
 	 * 琛ヨ创娑堟伅
@@ -171,4 +167,29 @@
 	 */
 	public void inviteOrderSubSidy(Long uid, Date date, String from, BigDecimal money, BigDecimal balance);
 
+	/**
+	 * 绾㈠寘娑堟伅
+	 */
+	public void redPackMsg(Long uid, MsgTypeMoneyTypeEnum type, String content, String beiZhu);
+
+	/**
+	 * 绾㈠寘娑堟伅-闃熷弸濂栧姳
+	 */
+	public void teamRedPackRewardMsg(Long uid, MsgTypeMoneyTypeEnum type, BigDecimal money, String stateDesc,String content);
+	
+	/**
+	 * 鍥㈤槦濂栧姳娑堟伅
+	 * @Title: orderTeamReward
+	 * @Description: 
+	 * @param uid
+	 * @param date
+	 * @param from
+	 * @param money
+	 * @param balance 
+	 * void 杩斿洖绫诲瀷
+	 * @throws
+	 */
+	public void orderTeamReward(Long uid, Date date, String from, BigDecimal money, BigDecimal balance);
+
+	
 }

--
Gitblit v1.8.0