From 486e22c57ca8a1e2dc6877b539e2f3add67250f1 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 23 十一月 2019 18:28:00 +0800
Subject: [PATCH] 冲突解决

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/money/msg/UserMoneyMsgNotificationServiceImpl.java |   20 ++++++++++++++++++++
 1 files changed, 20 insertions(+), 0 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 ee50596..1d83835 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
@@ -14,6 +14,7 @@
 import com.yeshi.fanli.entity.bus.user.AlipayAccountValidNormalHistory;
 import com.yeshi.fanli.entity.bus.user.Extract;
 import com.yeshi.fanli.entity.bus.user.ExtractWeiXinRecord;
+import com.yeshi.fanli.entity.bus.user.UserInfo;
 import com.yeshi.fanli.entity.config.push.PushMsgFactory;
 import com.yeshi.fanli.exception.msg.MsgMoneyDetailException;
 import com.yeshi.fanli.exception.push.PushException;
@@ -295,6 +296,25 @@
 			e.printStackTrace();
 		}
 	}
+	
+	@Override
+	public void teamRedPackRewardMsg(Long uid, MsgTypeMoneyTypeEnum type,BigDecimal money, String stateDesc, 
+			String content) {
+		MsgMoneyDetail detail = new MsgMoneyDetail();
+		detail.setRead(false);
+		detail.setMoney(money);
+		detail.setMsgType(type);
+		detail.setContent(content);
+		detail.setStateDesc(stateDesc);
+		detail.setUser(new UserInfo(uid));
+		detail.setBeiZhu("绯荤粺宸蹭笅鍙戝埌鈥滄垜鐨�-绾㈠寘鈥濅腑");
+		detail.setCreateTime(new Date());
+		try {
+			msgMoneyDetailService.addMsgMoneyDetail(detail);
+		} catch (MsgMoneyDetailException e) {
+			e.printStackTrace();
+		}
+	}
 
 	@Override
 	public void inviteOrderSubSidy(Long uid, Date date, String from, BigDecimal money, BigDecimal balance) {

--
Gitblit v1.8.0