From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/service/impl/msg/UserMsgReadStateServiceImpl.java | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 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..a723677 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
@@ -10,13 +10,13 @@
import com.yeshi.fanli.dao.mybatis.msg.UserMsgUnReadNumMapper;
import com.yeshi.fanli.entity.bus.msg.UserMsgUnReadNum;
import com.yeshi.fanli.entity.bus.user.UserInfo;
-import com.yeshi.fanli.service.inter.msg.MsgAccountDetailService;
-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.money.msg.MsgMoneyDetailService;
import com.yeshi.fanli.service.inter.msg.MsgOtherDetailService;
import com.yeshi.fanli.service.inter.msg.UserMsgReadStateService;
import com.yeshi.fanli.service.inter.msg.UserSystemMsgService;
+import com.yeshi.fanli.service.inter.order.msg.MsgOrderDetailService;
+import com.yeshi.fanli.service.inter.user.invite.MsgInviteDetailService;
+import com.yeshi.fanli.service.inter.user.msg.MsgAccountDetailService;
@Service
public class UserMsgReadStateServiceImpl implements UserMsgReadStateService {
@@ -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