From 878a63654c6909e8122115b89dac50c64375490f Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期三, 30 一月 2019 09:59:14 +0800
Subject: [PATCH] 队员失效删除通知消息

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/ThreeSaleSerivceImpl.java |   43 ++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/ThreeSaleSerivceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/ThreeSaleSerivceImpl.java
index 849c6e4..a409971 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/ThreeSaleSerivceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/ThreeSaleSerivceImpl.java
@@ -10,9 +10,6 @@
 
 import javax.annotation.Resource;
 
-import net.sf.json.JSONArray;
-import net.sf.json.JSONObject;
-
 import org.hibernate.HibernateException;
 import org.hibernate.Query;
 import org.hibernate.SQLQuery;
@@ -32,10 +29,14 @@
 import com.yeshi.fanli.service.inter.config.InviteGetMoneyService;
 import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
 import com.yeshi.fanli.service.inter.hongbao.ThreeSaleSerivce;
+import com.yeshi.fanli.service.inter.msg.MsgInviteDetailService;
 import com.yeshi.fanli.service.inter.msg.UserInviteMsgNotificationService;
 import com.yeshi.fanli.service.inter.user.UserInfoService;
 import com.yeshi.fanli.util.Constant;
 import com.yeshi.fanli.util.StringUtil;
+
+import net.sf.json.JSONArray;
+import net.sf.json.JSONObject;
 
 @Service
 public class ThreeSaleSerivceImpl implements ThreeSaleSerivce {
@@ -60,6 +61,11 @@
 	
 	@Resource
 	private UserInviteMsgNotificationService userInviteMsgNotificationService;
+	
+	@Resource
+	private  MsgInviteDetailService msgInviteDetailService;
+	
+	
 
 	public UserInfo getBoss(final long uid) {
 		return (UserInfo) dao.excute(new HibernateCallback<UserInfo>() {
@@ -113,8 +119,15 @@
 			threeSale.setWorker(inviteeUser);
 			threeSaleMapper.insertSelective(threeSale);
 			
-			// 鍒犻櫎宸插け鏁堝叧绯�
-			threeSaleMapper.deleteExpireRecord(inviter.getId(), inviteeUser.getId());
+			List<ThreeSale> listExpire = threeSaleMapper.getExpireRecord(inviter.getId(), inviteeUser.getId());
+			if (listExpire != null && listExpire.size() > 0) {
+				// 鍒犻櫎澶辨晥
+				for (ThreeSale saleExpire: listExpire) {
+					msgInviteDetailService.deleteByThreeSale(saleExpire);
+				}
+				// 鍒犻櫎宸插け鏁堝叧绯�
+				threeSaleMapper.deleteExpireRecord(inviter.getId(), inviteeUser.getId());
+			}
 			
 			//鍒涘缓閫氱煡
 			userInviteMsgNotificationService.inviteScan(inviter.getId(), threeSale);
@@ -148,6 +161,16 @@
 						
 						// 鍒犻櫎宸插け鏁堝叧绯�
 						threeSaleMapper.deleteExpireRecord(inviter.getId(), invitee.getId());
+						
+						List<ThreeSale> listExpire = threeSaleMapper.getExpireRecord(inviter.getId(), invitee.getId());
+						if (listExpire != null && listExpire.size() > 0) {
+							// 鍒犻櫎鍘嗗彶閫氱煡
+							for (ThreeSale saleExpire: listExpire) {
+								msgInviteDetailService.deleteByThreeSale(saleExpire);
+							}
+							// 鍒犻櫎宸插け鏁堝叧绯�
+							threeSaleMapper.deleteExpireRecord(inviter.getId(), invitee.getId());
+						}
 						
 						userInviteMsgNotificationService.inviteScan(inviter.getId(), threeSale);
 						// threeSaleSerivce.bind(invitee, inviter);
@@ -632,9 +655,19 @@
 			threeSale.setUpdateTime(java.lang.System.currentTimeMillis());
 			threeSaleMapper.insertSelective(threeSale);
 			
+			
+		}
+		
+		List<ThreeSale> listExpire = threeSaleMapper.getExpireRecord(inviter.getId(), invitee.getId());
+		if (listExpire != null && listExpire.size() > 0) {
+			// 鍒犻櫎鍘嗗彶閫氱煡
+			for (ThreeSale saleExpire: listExpire) {
+				msgInviteDetailService.deleteByThreeSale(saleExpire);
+			}
 			// 鍒犻櫎宸插け鏁堝叧绯�
 			threeSaleMapper.deleteExpireRecord(inviter.getId(), invitee.getId());
 		}
+		
 		// 閭�璇锋秷鎭�
 		userInviteMsgNotificationService.inviteSuccess(inviter.getId(), threeSale);
 

--
Gitblit v1.8.0