From eec7e789a87863c25d92c10ad5dfc22ad80c448d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 14 七月 2020 12:36:48 +0800
Subject: [PATCH] 系统区分BUG修复
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoServiceImpl.java | 38 +++++++++++++++++++++++++-------------
1 files changed, 25 insertions(+), 13 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoServiceImpl.java
index 8c50b72..2f67d5d 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoServiceImpl.java
@@ -11,6 +11,7 @@
import javax.annotation.Resource;
import com.yeshi.fanli.entity.SystemEnum;
+import com.yeshi.fanli.util.*;
import org.springframework.context.annotation.Lazy;
import org.springframework.core.task.TaskExecutor;
import org.springframework.stereotype.Service;
@@ -43,10 +44,6 @@
import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;
import com.yeshi.fanli.service.inter.user.tb.TaoBaoUnionAuthRecordService;
import com.yeshi.fanli.service.inter.user.tb.UserExtraTaoBaoInfoService;
-import com.yeshi.fanli.util.Constant;
-import com.yeshi.fanli.util.FilePathEnum;
-import com.yeshi.fanli.util.StringUtil;
-import com.yeshi.fanli.util.ThreadUtil;
import com.yeshi.fanli.util.account.UserUtil;
import com.yeshi.fanli.util.user.UserLevelUtil;
import com.yeshi.fanli.vo.user.UserInfoVO;
@@ -100,6 +97,9 @@
@Lazy
@Resource
private UserInfoModifyRecordService userInfoModifyRecordService;
+
+ @Resource
+ private RedisManager redisManager;
public UserInfo getUserByLoginTypeAndOpenId(int loginType, String openid, SystemEnum sysetm) {
@@ -265,16 +265,16 @@
@Override
public long countInfo(Integer userState, String key, Integer keyType, String userRank, Integer days,
- String startTime, String endTime, Integer userType, String level, Integer activeCode) {
- return userInfoMapper.countInfo(userState, key, keyType, userRank, days, startTime, endTime, userType, level, activeCode);
+ String startTime, String endTime, Integer userType, String level, Integer activeCode,SystemEnum system) {
+ return userInfoMapper.countInfo(userState, key, keyType, userRank, days, startTime, endTime, userType, level, activeCode,system);
}
@Override
public List<UserInfoVO> queryInfo(long start, int count, Integer userState, String key, Integer keyType,
- String userRank, Integer days, String startTime, String endTime, Integer userType, String level, Integer activeCode) {
+ String userRank, Integer days, String startTime, String endTime, Integer userType, String level, Integer activeCode,SystemEnum system) {
List<UserInfoVO> userList = userInfoMapper.queryInfo(start, count, userState, key, keyType, userRank, days,
- startTime, endTime, userType, level, activeCode);
+ startTime, endTime, userType, level, activeCode,system);
if (userList == null || userList.size() == 0) {
return null;
@@ -338,26 +338,33 @@
@Override
public SystemEnum getUserSystem(Long uid) {
+ String value = redisManager.getCommonString(RedisKeyEnum.getRedisKey(RedisKeyEnum.userSystem, uid + ""));
+ if (!StringUtil.isNullOrEmpty(value)) {
+ return SystemEnum.valueOf(value);
+ }
UserInfo user = selectByPKey(uid);
- if (user != null)
+ if (user != null) {
+ //淇濆瓨1澶�
+ redisManager.cacheCommonString(RedisKeyEnum.getRedisKey(RedisKeyEnum.userSystem, uid + ""), user.getSystem().name(), 60 * 60 * 24);
return user.getSystem();
+ }
return null;
}
@Override
public long queryCount(Integer userState, String key, Integer keyType, String userRank, Integer days,
- String startTime, String endTime, Integer userType, String level, Integer activeCode) {
- return userInfoMapper.queryCount(userState, key, keyType, userRank, days, startTime, endTime, userType, level, activeCode);
+ String startTime, String endTime, Integer userType, String level, Integer activeCode,SystemEnum system) {
+ return userInfoMapper.queryCount(userState, key, keyType, userRank, days, startTime, endTime, userType, level, activeCode,system);
}
@Override
public List<UserInfoVO> query(long start, int count, Integer userState, String key, Integer keyType,
String userRank, Integer days, String startTime, String endTime, Integer orderField, Integer orderMode,
- Integer userType, String level, Integer activeCode) {
+ Integer userType, String level, Integer activeCode,SystemEnum system) {
List<UserInfoVO> userList = userInfoMapper.query(start, count, userState, key, keyType, userRank, days,
- startTime, endTime, orderField, orderMode, userType, level, activeCode);
+ startTime, endTime, orderField, orderMode, userType, level, activeCode,system);
if (userList == null || userList.size() == 0) {
return null;
@@ -571,6 +578,11 @@
}
@Override
+ public UserInfo getEffectiveUserInfoByOpenId(String openId, SystemEnum sysetm) {
+ return userInfoMapper.getEffectiveUserInfoByOpenId(openId,sysetm);
+ }
+
+ @Override
public UserInfo getUserInfo(Long uid) throws UserInfoException {
if (uid == null) {
throw new UserInfoException(1, "璇锋眰鍙傛暟涓虹┖");
--
Gitblit v1.8.0