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 |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 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 19e67b8..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
@@ -35,10 +35,10 @@
 
 	@Resource
 	private MsgMoneyDetailService msgMoneyDetailService;
-	
+
 	@Resource
 	private MsgOtherDetailService msgOtherDetailService;
-	
+
 	@Resource
 	private UserSystemMsgService userSystemMsgService;
 
@@ -103,7 +103,7 @@
 		update.setUpdateTime(new Date());
 		userMsgUnReadNumMapper.updateByPrimaryKeySelective(update);
 	}
-	
+
 	@Override
 	public void addOtherMsgUnReadCount(Long uid, int count) {
 		UserMsgUnReadNum num = getUserMsgUnReadNum(uid);
@@ -192,13 +192,16 @@
 		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
@@ -212,6 +215,10 @@
 		userMsgUnReadNumMapper.updateByPrimaryKeySelective(update);
 	}
 
-
+	@Override
+	public void updateSelective(UserMsgUnReadNum num) {
+		if (num != null)
+			userMsgUnReadNumMapper.updateByPrimaryKeySelective(num);
+	}
 
 }

--
Gitblit v1.8.0