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/user/AccountMessageServiceImpl.java | 34 +++++++++-------------------------
1 files changed, 9 insertions(+), 25 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/AccountMessageServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/AccountMessageServiceImpl.java
index 635dc79..c605420 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/AccountMessageServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/AccountMessageServiceImpl.java
@@ -4,18 +4,15 @@
import javax.annotation.Resource;
-import org.hibernate.HibernateException;
-import org.hibernate.Session;
-import org.springframework.orm.hibernate4.HibernateCallback;
import org.springframework.stereotype.Service;
-import com.yeshi.fanli.dao.config.SystemZnxDao;
import com.yeshi.fanli.dao.mybatis.AccountMessageMapper;
-import com.yeshi.fanli.dao.user.UserInfoDao;
import com.yeshi.fanli.entity.bus.user.AccountMessage;
import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.entity.system.SystemZnx;
import com.yeshi.fanli.service.inter.user.AccountMessageService;
+import com.yeshi.fanli.service.inter.user.SystemZnxService;
+import com.yeshi.fanli.service.inter.user.UserInfoService;
import com.yeshi.fanli.util.Constant;
@Service
@@ -24,9 +21,10 @@
@Resource
private AccountMessageMapper accountMessageMapper;
@Resource
- private UserInfoDao userInfoDao;
+ private UserInfoService userInfoService;
+
@Resource
- private SystemZnxDao systemZnxDao;
+ private SystemZnxService systemZnxService;
@Override
public List<AccountMessage> findAccountMessageList(long uid, int page) {
@@ -61,28 +59,14 @@
accountMessageMapper.insertSelective(accountMessage);
}
- @SuppressWarnings("unchecked")
@Override
public void syncSystemZnx(long uid) {
- UserInfo userInfo = userInfoDao.find(UserInfo.class, uid);
+ UserInfo userInfo = userInfoService.selectByPKey(uid);
if (userInfo == null)
return;
- List<SystemZnx> list = (List<SystemZnx>) systemZnxDao.excute(new HibernateCallback<List<SystemZnx>>() {
- @SuppressWarnings("unchecked")
- @Override
- public List<SystemZnx> doInHibernate(Session session) throws HibernateException {
- List result = session
- .createSQLQuery(
- "SELECT sm.* FROM `yeshi_ec_system_msg` sm LEFT JOIN (SELECT * FROM `yeshi_ec_account_message` a WHERE a.`uid`=? AND a.`system_msg_id` IS NOT NULL) s ON s.`system_msg_id`=sm.`id` WHERE s.`system_msg_id` IS NULL and sm.createTime>="
- + userInfo.getCreatetime())
- .addEntity(SystemZnx.class).setParameter(0, uid).list();
- if (result != null) {
- List<SystemZnx> list = (List<SystemZnx>) result;
- return list;
- }
- return null;
- }
- });
+
+ List<SystemZnx> list = systemZnxService.listbyUidAndCreateTime(uid, userInfo.getCreatetime());
+
if (list != null)
for (SystemZnx systemZnx : list) {
AccountMessage accountMessage = new AccountMessage();
--
Gitblit v1.8.0