From 7e7db2fa55a9a3af46d4fd8ede0dee147f101d64 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 09 五月 2020 21:41:27 +0800
Subject: [PATCH] 2.1需求

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/user/msg/UserAccountMsgNotificationServiceImpl.java |  122 ++++++----------------------------------
 1 files changed, 19 insertions(+), 103 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/msg/UserAccountMsgNotificationServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/msg/UserAccountMsgNotificationServiceImpl.java
index b156b9f..444fd62 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/msg/UserAccountMsgNotificationServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/msg/UserAccountMsgNotificationServiceImpl.java
@@ -5,7 +5,6 @@
 import org.springframework.stereotype.Service;
 
 import com.yeshi.fanli.entity.bus.msg.MsgAccountDetail;
-import com.yeshi.fanli.entity.bus.msg.MsgExtra;
 import com.yeshi.fanli.exception.msg.MsgAccountDetailException;
 import com.yeshi.fanli.service.inter.msg.MsgExtraService;
 import com.yeshi.fanli.service.inter.user.msg.MsgAccountDetailService;
@@ -23,144 +22,61 @@
 
 	@Override
 	public void bindingSuccess(Long uid, int type) {
-		MsgAccountDetail detail = MsgAccountDetailFactory.createBindSuccess(uid, type, MsgAccountDetailFactory.WAY_BIND);
-		try {
-			msgAccountDetailService.addMsgAccountDetail(detail);
-			// 娑堟伅鍐呭
-			msgExtraService.addMsgExtra(detail.getId(), detail.getExtraInfo(), MsgExtra.MSG_TYPE_ACCOUNT);
-		} catch (MsgAccountDetailException e) {
-			e.printStackTrace();
-		}
+		saveDetail(MsgAccountDetailFactory.createBindSuccess(uid, type, MsgAccountDetailFactory.WAY_BIND));
 	}
 
 	@Override
 	public void unBindingSuccess(Long uid, int type) {
-		MsgAccountDetail detail = MsgAccountDetailFactory.createBindSuccess(uid, type, MsgAccountDetailFactory.WAY_UNBIND);
-		try {
-			msgAccountDetailService.addMsgAccountDetail(detail);
-			// 娑堟伅鍐呭
-			msgExtraService.addMsgExtra(detail.getId(), detail.getExtraInfo(), MsgExtra.MSG_TYPE_ACCOUNT);
-		} catch (MsgAccountDetailException e) {
-			e.printStackTrace();
-		}
+		saveDetail(MsgAccountDetailFactory.createBindSuccess(uid, type, MsgAccountDetailFactory.WAY_UNBIND));
 	}
 
 	@Override
 	public void changeBindingSuccess(Long uid, int type) {
-		MsgAccountDetail detail = MsgAccountDetailFactory.createBindSuccess(uid, type, MsgAccountDetailFactory.WAY_CHANGE);
-		try {
-			msgAccountDetailService.addMsgAccountDetail(detail);
-			// 娑堟伅鍐呭
-			msgExtraService.addMsgExtra(detail.getId(), detail.getExtraInfo(), MsgExtra.MSG_TYPE_ACCOUNT);
-		} catch (MsgAccountDetailException e) {
-			e.printStackTrace();
-		}
-	}
-
-	@Override
-	public void connectSuccess(Long uid, Long lessUid) {
-		MsgAccountDetail detail = MsgAccountDetailFactory.createConnectAccount(uid, lessUid);
-		try {
-			msgAccountDetailService.addMsgAccountDetail(detail);
-		} catch (MsgAccountDetailException e) {
-			e.printStackTrace();
-		}
-	}
-
-	@Override
-	public void userRank(Long uid, String orderType, int orderCount, String rankName) {
-		MsgAccountDetail detail = MsgAccountDetailFactory.createUserRank(uid, orderType, orderCount, rankName);
-		try {
-			msgAccountDetailService.addMsgAccountDetail(detail);
-		} catch (MsgAccountDetailException e) {
-			e.printStackTrace();
-		}
+		saveDetail(MsgAccountDetailFactory.createBindSuccess(uid, type, MsgAccountDetailFactory.WAY_CHANGE));
 	}
 
 	@Override
 	public void taoBaoAuthFail(Long uid, String taoBaoNickName, String reason) {
-		MsgAccountDetail detail = MsgAccountDetailFactory.createBindFail(uid, MsgAccountDetailFactory.TYPE_TB, 
-				MsgAccountDetailFactory.WAY_CHANGE, reason);
-		try {
-			msgAccountDetailService.addMsgAccountDetail(detail);
-			// 娑堟伅鍐呭
-			msgExtraService.addMsgExtra(detail.getId(), detail.getExtraInfo(), MsgExtra.MSG_TYPE_ACCOUNT);
-		} catch (MsgAccountDetailException e) {
-			e.printStackTrace();
-		}
+		saveDetail(MsgAccountDetailFactory.createBindFail(uid, MsgAccountDetailFactory.TYPE_TB, 
+				MsgAccountDetailFactory.WAY_CHANGE, reason));
 	}
 	
 	@Override
 	public void createChangeInviteCode(Long uid, String oldCode, String newCode) {
-		MsgAccountDetail detail = MsgAccountDetailFactory.createChangeInviteCode(uid, oldCode, newCode);
-		try {
-			msgAccountDetailService.addMsgAccountDetail(detail);
-			// 娑堟伅鍐呭
-			msgExtraService.addMsgExtra(detail.getId(), detail.getExtraInfo(), MsgExtra.MSG_TYPE_ACCOUNT);
-		} catch (MsgAccountDetailException e) {
-			e.printStackTrace();
-		}
+		saveDetail(MsgAccountDetailFactory.createChangeInviteCode(uid, oldCode, newCode));
 	}
 	
-	
 	@Override
-	public void vipPreUpgrade(Long uid, String originalName, String upName, int days, long targetNum1, Long targetNum2,Integer type) {
-		MsgAccountDetail detail = MsgAccountDetailFactory.vipPreUpgrade(uid, originalName, upName, days, targetNum1,
-				targetNum2, type, null);
-		try {
-			msgAccountDetailService.addMsgAccountDetail(detail);
-			// 娑堟伅鍐呭
-			msgExtraService.addMsgExtra(detail.getId(), detail.getExtraInfo(), MsgExtra.MSG_TYPE_ACCOUNT);
-		} catch (MsgAccountDetailException e) {
-			e.printStackTrace();
-		}
+	public void vipPreUpgrade(Long uid, String originalName, String upName, int days, long targetNum1, Long targetNum2, boolean teamPass) {
+		saveDetail( MsgAccountDetailFactory.vipPreUpgrade(uid, originalName, upName, days, targetNum1,targetNum2, teamPass));
 	}
 	
 	@Override
 	public void vipUpgradeSuccess(Long uid, int days) {
-		MsgAccountDetail detail = MsgAccountDetailFactory.vipUpgradeSuccess(uid, days);
-		try {
-			msgAccountDetailService.addMsgAccountDetail(detail);
-			// 娑堟伅鍐呭
-			msgExtraService.addMsgExtra(detail.getId(), detail.getExtraInfo(), MsgExtra.MSG_TYPE_ACCOUNT);
-		} catch (MsgAccountDetailException e) {
-			e.printStackTrace();
-		}
+		saveDetail(MsgAccountDetailFactory.vipUpgradeSuccess(uid, days));
 	}
 
 	@Override
 	public void vipUpgradeFail(Long uid, String reason) {
-		MsgAccountDetail detail = MsgAccountDetailFactory.vipUpgradeFail(uid, reason);
-		try {
-			msgAccountDetailService.addMsgAccountDetail(detail);
-			// 娑堟伅鍐呭
-			msgExtraService.addMsgExtra(detail.getId(), detail.getExtraInfo(), MsgExtra.MSG_TYPE_ACCOUNT);
-		} catch (MsgAccountDetailException e) {
-			e.printStackTrace();
-		}
+		saveDetail(MsgAccountDetailFactory.vipUpgradeFail(uid, reason));
 	}
 	
 	@Override
 	public void teacherInvite(Long uid, String nickname,String kefuName, String kefuWX) {
-		MsgAccountDetail detail = MsgAccountDetailFactory.teacherInvite(uid, nickname, kefuName, kefuWX);
+		 saveDetail(MsgAccountDetailFactory.teacherInvite(uid, nickname, kefuName, kefuWX));
+	}
+	
+	@Override
+	public void teacherSuccess(Long uid, int days, String kefuName, String kefuWX) {
+		saveDetail(MsgAccountDetailFactory.teacherSuccess(uid, days, kefuName, kefuWX));
+	}
+	
+	private void saveDetail(MsgAccountDetail detail) {
 		try {
 			msgAccountDetailService.addMsgAccountDetail(detail);
-			// 娑堟伅鍐呭
-			msgExtraService.addMsgExtra(detail.getId(), detail.getExtraInfo(), MsgExtra.MSG_TYPE_ACCOUNT);
 		} catch (MsgAccountDetailException e) {
 			e.printStackTrace();
 		}
 	}
 	
-	@Override
-	public void teacherSuccess(Long uid, int days, String kefuName, String kefuWX) {
-		MsgAccountDetail detail = MsgAccountDetailFactory.teacherSuccess(uid, days, kefuName, kefuWX);
-		try {
-			msgAccountDetailService.addMsgAccountDetail(detail);
-			// 娑堟伅鍐呭
-			msgExtraService.addMsgExtra(detail.getId(), detail.getExtraInfo(), MsgExtra.MSG_TYPE_ACCOUNT);
-		} catch (MsgAccountDetailException e) {
-			e.printStackTrace();
-		}
-	}
 }

--
Gitblit v1.8.0