From 17e98d7bcc27072f97976d24eb504abb02914891 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 11 四月 2020 09:20:14 +0800
Subject: [PATCH] 消息

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/UserInviteMsgNotificationServiceImpl.java |   53 +++++++++++++----------------------------------------
 1 files changed, 13 insertions(+), 40 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 0b31901..ca3ba76 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
@@ -8,11 +8,13 @@
 
 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;
 import com.yeshi.fanli.service.inter.user.invite.UserInviteMsgNotificationService;
@@ -23,65 +25,36 @@
 
 	@Resource
 	private MsgInviteDetailService msgInviteDetailService;
+	
+	@Resource
+	private MsgExtraService msgExtraService;
 
 	@Resource
 	private PushService pushService;
 
 	@Override
-	public void inviteScan(Long uid, ThreeSale sale) {
-		MsgInviteDetail detail = MsgInviteDetailFactory.createInviteScanSuccess(sale, uid, null);
+	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 inviteSuccess(Long uid, ThreeSale sale) {
-		MsgInviteDetail detail = MsgInviteDetailFactory.createInviteSuccess(sale, uid, null);
+	public void indirectInviteSuccess(Long uid, String inviteName, String nickName, String portrait, Date time) {
+		MsgInviteDetail detail = MsgInviteDetailFactory.indirectInviteSuccess(uid, inviteName, nickName, portrait, time);
 		try {
 			msgInviteDetailService.addMsgInviteDetail(detail);
-		} catch (MsgInviteDetailException e) {
-			e.printStackTrace();
-		}
-
-		PushContentDTO dto = PushMsgFactory.createInviteTeamSuccess(new Date(), sale.getWorker().getNickName());
-		try {
-			pushService.pushZNX(uid, dto.getTitle(), dto.getContent(), null, null);
-		} catch (NumberFormatException e) {
-			e.printStackTrace();
-		} catch (PushException e) {
-			e.printStackTrace();
-		}
-	}
-
-	
-	@Override
-	public void inviteSuccess2_1(Long uid, ThreeSale sale) {
-		MsgInviteDetail detail = MsgInviteDetailFactory.createInviteSuccess2_1(uid, sale);
-		msgInviteDetailService.insertSelective(detail);
-		PushContentDTO dto = PushMsgFactory.createInviteTeamSuccess(new Date(), sale.getWorker().getNickName());
-		try {
-			pushService.pushZNX(uid, dto.getTitle(), dto.getContent(), null, null);
-		} catch (NumberFormatException e) {
-			e.printStackTrace();
-		} catch (PushException e) {
-			e.printStackTrace();
-		}
-	}
-
-	
-	@Override
-	public void inviteFail(Long uid, ThreeSale sale) {
-		MsgInviteDetail detail = MsgInviteDetailFactory.createInviteFail(sale, uid, null);
-		try {
-			msgInviteDetailService.addMsgInviteDetail(detail);
+			// 娑堟伅鍐呭
+			msgExtraService.addMsgExtra(detail.getId(), detail.getExtraInfo(), MsgExtra.MSG_TYPE_INVITE);
 		} catch (MsgInviteDetailException e) {
 			e.printStackTrace();
 		}
 	}
-
 	
 	@Override
 	public void receiveGift(Long uid, String beizu, MsgInviteContentDTO content) {

--
Gitblit v1.8.0