From 88c7df1d5089d8e39f356a68eaccc18f308e190c Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 24 三月 2020 12:10:07 +0800
Subject: [PATCH] Merge branch 'div' into div-1

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/money/msg/UserMoneyMsgNotificationServiceImpl.java |   21 +++++++++++++++++----
 1 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/money/msg/UserMoneyMsgNotificationServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/money/msg/UserMoneyMsgNotificationServiceImpl.java
index 3b8be1c..d928082 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/money/msg/UserMoneyMsgNotificationServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/money/msg/UserMoneyMsgNotificationServiceImpl.java
@@ -286,7 +286,7 @@
 			e.printStackTrace();
 		}
 	}
-	
+
 	@Override
 	public void redPackMsg(Long uid, MsgTypeMoneyTypeEnum type, String content, String beiZhu) {
 		MsgMoneyDetail detail = MsgMoneyDetailFactory.createRedPackMsg(uid, type, content, beiZhu);
@@ -296,9 +296,9 @@
 			e.printStackTrace();
 		}
 	}
-	
+
 	@Override
-	public void teamRedPackRewardMsg(Long uid, MsgTypeMoneyTypeEnum type,BigDecimal money, String stateDesc, 
+	public void teamRedPackRewardMsg(Long uid, MsgTypeMoneyTypeEnum type, BigDecimal money, String stateDesc,
 			String content) {
 		MsgMoneyDetail detail = new MsgMoneyDetail();
 		detail.setRead(false);
@@ -318,7 +318,8 @@
 
 	@Override
 	public void inviteOrderSubSidy(Long uid, Date date, String from, BigDecimal money, BigDecimal balance) {
-		MsgMoneyDetail detail = MsgMoneyDetailFactory.createInviteOrderSubSidyMsg(uid, date, from, money, balance, null);
+		MsgMoneyDetail detail = MsgMoneyDetailFactory.createInviteOrderSubSidyMsg(uid, date, from, money, balance,
+				null);
 		try {
 			msgMoneyDetailService.addMsgMoneyDetail(detail);
 		} catch (MsgMoneyDetailException e) {
@@ -326,4 +327,16 @@
 		}
 	}
 
+	@Override
+	public void orderTeamReward(Long uid, Date date, String from, BigDecimal money, BigDecimal balance) {
+
+		MsgMoneyDetail detail = MsgMoneyDetailFactory.createOrderTeamRewardMsg(uid, date, from, money, balance, null);
+		try {
+			msgMoneyDetailService.addMsgMoneyDetail(detail);
+		} catch (MsgMoneyDetailException e) {
+			e.printStackTrace();
+		}
+
+	}
+
 }

--
Gitblit v1.8.0