From c93dfa3912f0fed74faa2f5f3ef42c318a04a7a2 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 13 四月 2020 11:04:14 +0800
Subject: [PATCH] 消息

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/UserInviteMsgNotificationServiceImpl.java |   66 ++++++++++++++++++++++-----------
 1 files changed, 44 insertions(+), 22 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/UserInviteMsgNotificationServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/UserInviteMsgNotificationServiceImpl.java
index ca3ba76..109c8e7 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/UserInviteMsgNotificationServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/UserInviteMsgNotificationServiceImpl.java
@@ -5,15 +5,12 @@
 import javax.annotation.Resource;
 
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import com.yeshi.fanli.dto.msg.MsgInviteContentDTO;
-import com.yeshi.fanli.dto.push.PushContentDTO;
 import com.yeshi.fanli.entity.bus.msg.MsgExtra;
 import com.yeshi.fanli.entity.bus.msg.MsgInviteDetail;
-import com.yeshi.fanli.entity.bus.user.ThreeSale;
-import com.yeshi.fanli.entity.config.push.PushMsgFactory;
 import com.yeshi.fanli.exception.msg.MsgInviteDetailException;
-import com.yeshi.fanli.exception.push.PushException;
 import com.yeshi.fanli.service.inter.msg.MsgExtraService;
 import com.yeshi.fanli.service.inter.push.PushService;
 import com.yeshi.fanli.service.inter.user.invite.MsgInviteDetailService;
@@ -32,21 +29,8 @@
 	@Resource
 	private PushService pushService;
 
-	@Override
-	public void directInviteSuccess(Long uid, String nickName, String portrait, Date time) {
-		MsgInviteDetail detail = MsgInviteDetailFactory.directInviteSuccess(uid, nickName, portrait, time);
-		try {
-			msgInviteDetailService.addMsgInviteDetail(detail);
-			// 娑堟伅鍐呭
-			msgExtraService.addMsgExtra(detail.getId(), detail.getExtraInfo(), MsgExtra.MSG_TYPE_INVITE);
-		} catch (MsgInviteDetailException e) {
-			e.printStackTrace();
-		}
-	}
-
-	@Override
-	public void indirectInviteSuccess(Long uid, String inviteName, String nickName, String portrait, Date time) {
-		MsgInviteDetail detail = MsgInviteDetailFactory.indirectInviteSuccess(uid, inviteName, nickName, portrait, time);
+	@Transactional(rollbackFor = Exception.class)
+	private void saveMsgDetail(MsgInviteDetail detail) {
 		try {
 			msgInviteDetailService.addMsgInviteDetail(detail);
 			// 娑堟伅鍐呭
@@ -57,9 +41,47 @@
 	}
 	
 	@Override
-	public void receiveGift(Long uid, String beizu, MsgInviteContentDTO content) {
-		MsgInviteDetail detail = MsgInviteDetailFactory.receiveGift(uid, beizu, content);
-		msgInviteDetailService.insertSelective(detail);
+	@Transactional(rollbackFor = Exception.class)
+	public void directInviteSuccess(Long uid, String nickName, String portrait, Date time) {
+		saveMsgDetail(MsgInviteDetailFactory.directInviteSuccess(uid, nickName, portrait, time));
 	}
 
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public void indirectInviteSuccess(Long uid, String inviteName, String nickName, String portrait, Date time) {
+		saveMsgDetail(MsgInviteDetailFactory.indirectInviteSuccess(uid, inviteName, nickName, portrait, time));
+	}
+	
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public void fansUpgrade(Long uid, String relation, String rankName, String nickName, String item, Date time) {
+		saveMsgDetail(MsgInviteDetailFactory.fansUpgrade(uid, relation, rankName, nickName, item, time));
+	}
+	
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public void fansPreDivorced(Long uid, String rankName, String nickName, String item, Date time) {
+		saveMsgDetail(MsgInviteDetailFactory.fansPreDivorced(uid, rankName, nickName, item, time));
+	}
+	
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public void fansPredivorcedIndirect(Long uid, String rankName, String nickName, String fansName,
+			String item, Date time) {
+		saveMsgDetail(MsgInviteDetailFactory.fansPredivorcedIndirect(uid, rankName, nickName, fansName, item, time));
+	}
+	
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public void fansDivorced(Long uid, String nickName, Date time) {
+		saveMsgDetail(MsgInviteDetailFactory.fansDivorced(uid, nickName, time));
+	}
+	
+	
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public void fansDivorcedIndirect(Long uid, String nickName, String fansName, Date time) {
+		saveMsgDetail(MsgInviteDetailFactory.fansDivorcedIndirect(uid, nickName, fansName, time));
+	}
+	
 }

--
Gitblit v1.8.0