From 24a8d17e007545f7426c48352109aa1a9c6587ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 06 五月 2020 12:02:09 +0800
Subject: [PATCH] IOS上线隐藏我的界面的banner与超级会员升级信息
---
fanli/src/main/java/com/yeshi/fanli/service/impl/msg/UserSystemMsgServiceImpl.java | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/msg/UserSystemMsgServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/msg/UserSystemMsgServiceImpl.java
index 0745cb3..74348fa 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/msg/UserSystemMsgServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/msg/UserSystemMsgServiceImpl.java
@@ -6,8 +6,8 @@
import javax.annotation.Resource;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
-import com.yeshi.fanli.dao.config.SystemZnxDao;
import com.yeshi.fanli.dao.mybatis.UserInfoMapper;
import com.yeshi.fanli.dao.mybatis.msg.UserSystemMsgMapper;
import com.yeshi.fanli.entity.bus.msg.UserSystemMsg;
@@ -17,6 +17,7 @@
import com.yeshi.fanli.exception.msg.UserSystemMsgException;
import com.yeshi.fanli.service.inter.msg.UserMsgReadStateService;
import com.yeshi.fanli.service.inter.msg.UserSystemMsgService;
+import com.yeshi.fanli.service.inter.user.SystemZnxService;
import com.yeshi.fanli.util.StringUtil;
@Service
@@ -32,8 +33,9 @@
private UserInfoMapper userInfoMapper;
@Resource
- private SystemZnxDao systemZnxDao;
+ private SystemZnxService systemZnxService;
+ @Transactional(rollbackFor=Exception.class)
@Override
public void addUserSystemMsg(Long uid, UserSystemMsgTypeEnum type, String title, String content, int timeTag,
SystemZnx sz) throws UserSystemMsgException {
@@ -41,7 +43,7 @@
throw new UserSystemMsgException(1, "淇℃伅涓嶅畬鏁�");
UserSystemMsg msg = new UserSystemMsg();
if (sz != null) {
- if (userSystemMsgMapper.selectBySystemZNXId(sz.getId()) == null) {
+ if (userSystemMsgMapper.selectBySystemZNXId(sz.getId(), uid) == null) {
msg.setCreateTime(new Date(sz.getCreateTime()));
msg.setRead(false);
msg.setSolved(false);
@@ -49,6 +51,8 @@
msg.setUser(new UserInfo(uid));
msg.setType(type);
msg.setTimeTag(timeTag);
+ msg.setTitle(sz.getTitle());
+ msg.setContent(sz.getContent());
} else
throw new UserSystemMsgException(1, "娑堟伅宸插瓨鍦�");
} else {
@@ -114,17 +118,18 @@
@Override
public void syncSystemZNX(Long uid) {
- UserInfo user = userInfoMapper.selectByPrimaryKey(uid);
+ UserInfo user = userInfoMapper.selectAvailableByPrimaryKey(uid);
if (user == null)
return;
- long createtTime = user.getCreatetime();
- List<SystemZnx> list = systemZnxDao.list("from SystemZnx s where s.createTime>=" + createtTime);
+ long createTime = user.getCreatetime();
+ List<SystemZnx> list = systemZnxService.listbyCreateTime(createTime);
if (list != null && list.size() > 0) {
for (SystemZnx znx : list) {
- UserSystemMsg msg = userSystemMsgMapper.selectBySystemZNXId(znx.getId());
+ UserSystemMsg msg = userSystemMsgMapper.selectBySystemZNXId(znx.getId(), uid);
if (msg == null)
try {
- addUserSystemMsg(uid, UserSystemMsgTypeEnum.common, null, null, UserSystemMsg.TIME_TAG_COMMON, znx);
+ addUserSystemMsg(uid, UserSystemMsgTypeEnum.common, null, null, UserSystemMsg.TIME_TAG_COMMON,
+ znx);
} catch (UserSystemMsgException e) {
e.printStackTrace();
}
--
Gitblit v1.8.0