From 512f368d7d8e71ee72a8f71dd7d2146f4c64f774 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 02 六月 2021 18:54:58 +0800
Subject: [PATCH] 特价相关bug修改
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoServiceImpl.java | 111 +++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 95 insertions(+), 16 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 452a038..0d3a1dd 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,8 @@
import javax.annotation.Resource;
import com.yeshi.fanli.entity.SystemEnum;
+import com.yeshi.fanli.entity.config.SystemConfigKeyEnum;
+import com.yeshi.fanli.service.inter.config.SystemConfigService;
import com.yeshi.fanli.util.*;
import org.springframework.context.annotation.Lazy;
import org.springframework.core.task.TaskExecutor;
@@ -101,14 +103,22 @@
@Resource
private RedisManager redisManager;
+ @Resource
+ private SystemConfigService systemConfigService;
+
public UserInfo getUserByLoginTypeAndOpenId(int loginType, String openid, SystemEnum sysetm) {
List<UserInfo> list = null;
+ UserInfoMapper.DaoQuery daoQuery = new UserInfoMapper.DaoQuery();
+ daoQuery.system = sysetm;
+ daoQuery.count = 1000;
if (loginType == 1) {
- list = userInfoMapper.listBySystemAndTaoBaoOpenId(sysetm, openid);
+ daoQuery.openId = openid;
} else {
- list = userInfoMapper.listBySystemAndWXUnionId(sysetm, openid);
+ daoQuery.wxUnionId = openid;
}
+ list = userInfoMapper.list(daoQuery);
+
if (list != null)
for (int i = 0; i < list.size(); i++) {
@@ -265,16 +275,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,SystemEnum system) {
- return userInfoMapper.countInfo(userState, key, keyType, userRank, days, startTime, endTime, userType, level, activeCode,system);
+ 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,SystemEnum system) {
+ 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,system);
+ startTime, endTime, userType, level, activeCode, system);
if (userList == null || userList.size() == 0) {
return null;
@@ -323,17 +333,30 @@
@Override
public List<UserInfo> listBySystemAndWXUnionId(SystemEnum system, String unionId) {
- return userInfoMapper.listBySystemAndWXUnionId(system, unionId);
+ UserInfoMapper.DaoQuery daoQuery = new UserInfoMapper.DaoQuery();
+ daoQuery.system = system;
+ daoQuery.count = 1000;
+ daoQuery.wxUnionId = unionId;
+
+ return userInfoMapper.list(daoQuery);
}
@Override
public List<UserInfo> listBySystemAndTaoBaoOpenId(SystemEnum system, String openId) {
- return userInfoMapper.listBySystemAndTaoBaoOpenId(system, openId);
+ UserInfoMapper.DaoQuery daoQuery = new UserInfoMapper.DaoQuery();
+ daoQuery.system = system;
+ daoQuery.count = 1000;
+ daoQuery.openId = openId;
+ return userInfoMapper.list(daoQuery);
}
@Override
public List<UserInfo> listBySystemAndPhone(SystemEnum system, String phone) {
- return userInfoMapper.listBySystemAndPhone(system, phone);
+ UserInfoMapper.DaoQuery daoQuery = new UserInfoMapper.DaoQuery();
+ daoQuery.system = system;
+ daoQuery.count = 1000;
+ daoQuery.phone = phone;
+ return userInfoMapper.list(daoQuery);
}
@Override
@@ -354,17 +377,17 @@
@Override
public long queryCount(Integer userState, String key, Integer keyType, String userRank, Integer days,
- 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);
+ 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,SystemEnum system) {
+ 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,system);
+ startTime, endTime, orderField, orderMode, userType, level, activeCode, system);
if (userList == null || userList.size() == 0) {
return null;
@@ -569,17 +592,50 @@
@Override
public UserInfo getEffectiveUserInfoByPhone(String phone, SystemEnum system) {
- return userInfoMapper.getEffectiveUserInfoByPhone(phone, system);
+
+ UserInfoMapper.DaoQuery daoQuery = new UserInfoMapper.DaoQuery();
+ daoQuery.system = system;
+ daoQuery.count = 1000;
+ daoQuery.phone = phone;
+ daoQuery.state = UserInfo.STATE_NORMAL;
+ List<UserInfo> userInfoList = userInfoMapper.list(daoQuery);
+
+ return userInfoList != null && userInfoList.size() > 0 ? userInfoList.get(0) : null;
}
@Override
public UserInfo getEffectiveUserInfoByWXUnionId(String unionId, SystemEnum system) {
- return userInfoMapper.getEffectiveUserInfoByWXUnionId(unionId, system);
+ UserInfoMapper.DaoQuery daoQuery = new UserInfoMapper.DaoQuery();
+ daoQuery.system = system;
+ daoQuery.count = 1000;
+ daoQuery.wxUnionId = unionId;
+ daoQuery.state = UserInfo.STATE_NORMAL;
+ List<UserInfo> userInfoList = userInfoMapper.list(daoQuery);
+
+ return userInfoList != null && userInfoList.size() > 0 ? userInfoList.get(0) : null;
+
+ }
+
+ @Override
+ public UserInfo getEffectiveUserInfoByQQOpenId(String opneId, SystemEnum sysetm) {
+ UserInfoMapper.DaoQuery daoQuery = new UserInfoMapper.DaoQuery();
+ daoQuery.system = sysetm;
+ daoQuery.count = 1000;
+ daoQuery.qqOpenId = opneId;
+ daoQuery.state = UserInfo.STATE_NORMAL;
+ List<UserInfo> userInfoList = userInfoMapper.list(daoQuery);
+ return userInfoList != null && userInfoList.size() > 0 ? userInfoList.get(0) : null;
}
@Override
public UserInfo getEffectiveUserInfoByOpenId(String openId, SystemEnum sysetm) {
- return userInfoMapper.getEffectiveUserInfoByOpenId(openId,sysetm);
+ UserInfoMapper.DaoQuery daoQuery = new UserInfoMapper.DaoQuery();
+ daoQuery.system = sysetm;
+ daoQuery.count = 1000;
+ daoQuery.openId = openId;
+ daoQuery.state = UserInfo.STATE_NORMAL;
+ List<UserInfo> userInfoList = userInfoMapper.list(daoQuery);
+ return userInfoList != null && userInfoList.size() > 0 ? userInfoList.get(0) : null;
}
@Override
@@ -730,4 +786,27 @@
}
+ @Override
+ public String getDefaultNickName(SystemEnum system, Long uid) {
+ return systemConfigService.getValueCache(SystemConfigKeyEnum.defaultNickNamePrefix, system) + uid;
+ }
+
+ @Override
+ public String getDefaultNickName(Long uid) {
+ SystemEnum system = getUserSystem(uid);
+ return getDefaultNickName(system, uid);
+ }
+
+ @Override
+ public String getDefaultPortrait(SystemEnum system) {
+ return systemConfigService.getValueCache(SystemConfigKeyEnum.defaultPortrait, system);
+ }
+
+ @Override
+ public String getDefaultPortrait(Long uid) {
+ SystemEnum system = getUserSystem(uid);
+ return getDefaultPortrait(system);
+ }
+
+
}
--
Gitblit v1.8.0