From 573c491b4a1ba60e12a5678a01c1546c0077c1ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 09:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/msg/UserMsgReadStateServiceImpl.java |  105 ++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 100 insertions(+), 5 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/msg/UserMsgReadStateServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/msg/UserMsgReadStateServiceImpl.java
index 02438e3..4e20a38 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/msg/UserMsgReadStateServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/msg/UserMsgReadStateServiceImpl.java
@@ -14,6 +14,7 @@
 import com.yeshi.fanli.service.inter.msg.MsgInviteDetailService;
 import com.yeshi.fanli.service.inter.msg.MsgMoneyDetailService;
 import com.yeshi.fanli.service.inter.msg.MsgOrderDetailService;
+import com.yeshi.fanli.service.inter.msg.MsgOtherDetailService;
 import com.yeshi.fanli.service.inter.msg.UserMsgReadStateService;
 import com.yeshi.fanli.service.inter.msg.UserSystemMsgService;
 
@@ -36,6 +37,9 @@
 	private MsgMoneyDetailService msgMoneyDetailService;
 
 	@Resource
+	private MsgOtherDetailService msgOtherDetailService;
+
+	@Resource
 	private UserSystemMsgService userSystemMsgService;
 
 	private UserMsgUnReadNum getUserMsgUnReadNum(Long uid) {
@@ -52,27 +56,62 @@
 
 	@Override
 	public void addOrderMsgUnReadCount(Long uid, int count) {
-		getUserMsgUnReadNum(uid);
+		UserMsgUnReadNum num = getUserMsgUnReadNum(uid);
+		UserMsgUnReadNum update = new UserMsgUnReadNum();
+		update.setId(num.getId());
+		update.setTypeOrder(num.getTypeOrder() + count);
+		update.setUpdateTime(new Date());
+		userMsgUnReadNumMapper.updateByPrimaryKeySelective(update);
 	}
 
 	@Override
 	public void addAccountMsgUnReadCount(Long uid, int count) {
-		getUserMsgUnReadNum(uid);
+		UserMsgUnReadNum num = getUserMsgUnReadNum(uid);
+		UserMsgUnReadNum update = new UserMsgUnReadNum();
+		update.setId(num.getId());
+		update.setTypeAccount(num.getTypeAccount() + count);
+		update.setUpdateTime(new Date());
+		userMsgUnReadNumMapper.updateByPrimaryKeySelective(update);
 	}
 
 	@Override
 	public void addMoneyMsgUnReadCount(Long uid, int count) {
-		getUserMsgUnReadNum(uid);
+		UserMsgUnReadNum num = getUserMsgUnReadNum(uid);
+		UserMsgUnReadNum update = new UserMsgUnReadNum();
+		update.setId(num.getId());
+		update.setTypeMoney(num.getTypeMoney() + count);
+		update.setUpdateTime(new Date());
+		userMsgUnReadNumMapper.updateByPrimaryKeySelective(update);
 	}
 
 	@Override
 	public void addInviteMsgUnReadCount(Long uid, int count) {
-		getUserMsgUnReadNum(uid);
+		UserMsgUnReadNum num = getUserMsgUnReadNum(uid);
+		UserMsgUnReadNum update = new UserMsgUnReadNum();
+		update.setId(num.getId());
+		update.setTypeInvite(num.getTypeInvite() + count);
+		update.setUpdateTime(new Date());
+		userMsgUnReadNumMapper.updateByPrimaryKeySelective(update);
 	}
 
 	@Override
 	public void addSystemMsgUnReadCount(Long uid, int count) {
-		getUserMsgUnReadNum(uid);
+		UserMsgUnReadNum num = getUserMsgUnReadNum(uid);
+		UserMsgUnReadNum update = new UserMsgUnReadNum();
+		update.setId(num.getId());
+		update.setTypeSystem(num.getTypeSystem() + count);
+		update.setUpdateTime(new Date());
+		userMsgUnReadNumMapper.updateByPrimaryKeySelective(update);
+	}
+
+	@Override
+	public void addOtherMsgUnReadCount(Long uid, int count) {
+		UserMsgUnReadNum num = getUserMsgUnReadNum(uid);
+		UserMsgUnReadNum update = new UserMsgUnReadNum();
+		update.setId(num.getId());
+		update.setTypeOther(num.getTypeOther() + count);
+		update.setUpdateTime(new Date());
+		userMsgUnReadNumMapper.updateByPrimaryKeySelective(update);
 	}
 
 	@Override
@@ -80,29 +119,65 @@
 		return getUserMsgUnReadNum(uid);
 	}
 
+	@Transactional
 	@Override
 	public void readOrderMsg(Long uid) {
 		msgOrderDetailService.readMsgByUid(uid);
+		UserMsgUnReadNum num = getUserMsgUnReadNum(uid);
+		UserMsgUnReadNum update = new UserMsgUnReadNum();
+		update.setId(num.getId());
+		update.setTypeOrder(0);
+		update.setUpdateTime(new Date());
+		userMsgUnReadNumMapper.updateByPrimaryKeySelective(update);
+
 	}
 
+	@Transactional
 	@Override
 	public void readAccountMsg(Long uid) {
 		msgAccountDetailService.readMsgByUid(uid);
+		UserMsgUnReadNum num = getUserMsgUnReadNum(uid);
+		UserMsgUnReadNum update = new UserMsgUnReadNum();
+		update.setId(num.getId());
+		update.setTypeAccount(0);
+		update.setUpdateTime(new Date());
+		userMsgUnReadNumMapper.updateByPrimaryKeySelective(update);
 	}
 
+	@Transactional
 	@Override
 	public void readMoneyMsg(Long uid) {
 		msgMoneyDetailService.readMsgByUid(uid);
+		UserMsgUnReadNum num = getUserMsgUnReadNum(uid);
+		UserMsgUnReadNum update = new UserMsgUnReadNum();
+		update.setId(num.getId());
+		update.setTypeMoney(0);
+		update.setUpdateTime(new Date());
+		userMsgUnReadNumMapper.updateByPrimaryKeySelective(update);
 	}
 
+	@Transactional
 	@Override
 	public void readInviteMsg(Long uid) {
 		msgInviteDetailService.readMsgByUid(uid);
+		UserMsgUnReadNum num = getUserMsgUnReadNum(uid);
+		UserMsgUnReadNum update = new UserMsgUnReadNum();
+		update.setId(num.getId());
+		update.setTypeInvite(0);
+		update.setUpdateTime(new Date());
+		userMsgUnReadNumMapper.updateByPrimaryKeySelective(update);
 	}
 
+	@Transactional
 	@Override
 	public void readUserSystemMsg(Long uid) {
 		userSystemMsgService.readMsgByUid(uid);
+		UserMsgUnReadNum num = getUserMsgUnReadNum(uid);
+		UserMsgUnReadNum update = new UserMsgUnReadNum();
+		update.setId(num.getId());
+		update.setTypeSystem(0);
+		update.setUpdateTime(new Date());
+		userMsgUnReadNumMapper.updateByPrimaryKeySelective(update);
 	}
 
 	@Transactional
@@ -117,13 +192,33 @@
 		update.setTypeOrder(0);
 		update.setTypeScore(0);
 		update.setTypeSystem(0);
+		update.setTypeOrder(0);
 		update.setUpdateTime(new Date());
+		update.setGuanXuanReadTime(new Date());
 		userMsgUnReadNumMapper.updateByPrimaryKeySelective(update);
 		readAccountMsg(uid);
 		readOrderMsg(uid);
 		readMoneyMsg(uid);
 		readInviteMsg(uid);
 		readUserSystemMsg(uid);
+		readOtherMsg(uid);
+	}
+
+	@Override
+	public void readOtherMsg(Long uid) {
+		msgOtherDetailService.readMsgByUid(uid);
+		UserMsgUnReadNum num = getUserMsgUnReadNum(uid);
+		UserMsgUnReadNum update = new UserMsgUnReadNum();
+		update.setId(num.getId());
+		update.setTypeOther(0);
+		update.setUpdateTime(new Date());
+		userMsgUnReadNumMapper.updateByPrimaryKeySelective(update);
+	}
+
+	@Override
+	public void updateSelective(UserMsgUnReadNum num) {
+		if (num != null)
+			userMsgUnReadNumMapper.updateByPrimaryKeySelective(num);
 	}
 
 }

--
Gitblit v1.8.0