Skip to content

V
volunteer_service
Commit 167c5c1f authored by licc's avatar licc
Browse files
Options

修改用户登录bug

parent f2f804e3
Show whitespace changes
Inline Side-by-side
Showing with 112 additions and 117 deletions
wisenergy-mapper/src/main/java/cn/wisenergy/mapper/RefillCardMapper.java
View file @ 167c5c1f
package cn.wisenergy.mapper;
import cn.wisenergy.model.app.PayRecord;
import cn.wisenergy.model.app.RefillCard;
import cn.wisenergy.model.app.UserInfo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
......
wisenergy-mapper/src/main/java/cn/wisenergy/mapper/UsersMapper.java
View file @ 167c5c1f
package cn.wisenergy.mapper;
import cn.wisenergy.model.app.UserInfo;
import cn.wisenergy.model.dto.UserInfoDto;
import cn.wisenergy.model.app.User;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
......@@ -10,28 +9,32 @@ import java.util.List;
import java.util.Map;
/**
*@ Description:
*@ Author : 86187
*@ Date : 2021/1/6 15:32
* @ Description:
* @ Author : 86187
* @ Date : 2021/1/6 15:32
* @author 86187
*/
@Mapper
public interface UsersMapper extends BaseMapper<UserInfo> {
public interface UsersMapper extends BaseMapper<User> {
/**
* 添加
* @param userInfo 用户信息
*
* @param user 用户信息
* @return 用户信息
*/
UserInfo add(UserInfo userInfo);
int add(User user);
/**
* 编辑
* @param userInfo 用户信息
*
* @param user 用户信息
* @return 修改是否成功
*/
int edit(UserInfo userInfo);
int edit(User user);
/**
* 删除
*
* @param id 用户id
* @return 删除是否成功
*/
......@@ -39,7 +42,9 @@ public interface UsersMapper extends BaseMapper<UserInfo> {
int countByPhoneAnsUserId(@Param("phone") String phone, @Param("userId") Integer userId);
List<UserInfo> getList(Map<String,Object> map);
List<User> getList(Map<String, Object> map);
Integer getUserNumbers();
User getByPhone(@Param("phone") String phone);
}
wisenergy-mapper/src/main/resources/mapper/RefillCardMapper.xml
View file @ 167c5c1f
......@@ -50,7 +50,7 @@
<if test="updateTime != null">and #{updateTime} &gt;= update_time</if>
</sql>
<insert id="add" parameterType="cn.wisenergy.model.app.UserInfo" keyProperty="id" useGeneratedKeys="true">
<insert id="add" parameterType="cn.wisenergy.model.app.User" keyProperty="id" useGeneratedKeys="true">
insert into
<include refid="table"/>
(<include refid="cols_exclude_id"/>)
......
wisenergy-mapper/src/main/resources/mapper/UsersMapper.xml
View file @ 167c5c1f
......@@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.wisenergy.mapper.UsersMapper">
<resultMap id="userMap" type="cn.wisenergy.model.app.UserInfo">
<resultMap id="userMap" type="cn.wisenergy.model.app.User">
<id column="id" property="id"/>
<result column="user_name" property="userName"/>
<result column="password" property="password"/>
......@@ -27,7 +27,7 @@
</sql>
<sql id="cols_exclude_id">
user_name,password, phone,head_image,sex,school, exam_type,is_delete,create_time,update_time
user_name,password, phone,head_image,sex,school, exam_type,source,is_delete,create_time,update_time
</sql>
<sql id="vals">
......@@ -42,7 +42,7 @@
<if test="headImage != null">head_image =#{headImage},</if>
<if test="sex != null">sex =#{sex},</if>
<if test="school != null">school =#{school},</if>
<if test="studentType != null">inspector_name = #{studentType},</if>
<if test="examType != null">exam_type = #{examType},</if>
<if test="source != null">source = #{source},</if>
<if test="isDelete != null">is_delete = #{isDelete},</if>
update_time =now()
......@@ -56,14 +56,14 @@
<if test="headImage != null">and head_image =#{headImage}</if>
<if test="sex != null">and sex =#{sex}</if>
<if test="school != null">and school =#{school}</if>
<if test="studentType != null">and inspector_name = #{studentType}</if>
<if test="examType != null">and exam_type = #{examType}</if>
<if test="source != null">and source = #{source}</if>
<if test="isDelete != null">and is_delete = #{isDelete}</if>
<if test="createTime != null">and create_time &gt;= #{createTime}</if>
<if test="updateTime != null">and #{updateTime} &gt;= update_time</if>
</sql>
<insert id="add" parameterType="cn.wisenergy.model.app.UserInfo" keyProperty="id" useGeneratedKeys="true">
<insert id="add" parameterType="cn.wisenergy.model.app.User" keyProperty="id" useGeneratedKeys="true">
insert into
<include refid="table"/>
(<include refid="cols_exclude_id"/>)
......@@ -72,7 +72,7 @@
)
</insert>
<update id="edit" parameterType="cn.wisenergy.model.app.UserInfo">
<update id="edit" parameterType="cn.wisenergy.model.app.User">
UPDATE
<include refid="table"/>
<set>
......@@ -120,4 +120,12 @@
<include refid="table"/>
where is_delete=0
</select>
<select id="getByPhone" resultType="cn.wisenergy.model.app.User">
SELECT
<include refid="cols_all"/>
FROM
<include refid="table"/>
where is_delete=0 and phone=#{phone}
</select>
</mapper>
wisenergy-model/src/main/java/cn/wisenergy/model/app/UserInfo.java → wisenergy-model/src/main/java/cn/wisenergy/model/app/User.java
View file @ 167c5c1f
package cn.wisenergy.model.app;
import cn.wisenergy.model.common.BaseEntity;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
......@@ -16,7 +17,8 @@ import java.util.Date;
*/
@Data
@ApiModel(value = "AccountUsers")
public class UserInfo extends BaseEntity implements Serializable {
@TableName("user")
public class User extends BaseEntity implements Serializable {
private static final long serialVersionUID = 2525339404301884673L;
/**
......@@ -73,17 +75,6 @@ public class UserInfo extends BaseEntity implements Serializable {
@ApiModelProperty(name = "source",value = "来源 1：电脑端 2: 手机端")
private Integer source;
/**
* 用户剩余查询次数
*/
@ApiModelProperty(name = "queryLimit",value = "用户剩余查询次数")
private Integer queryLimit;
/**
* 用户充值总额
*/
@ApiModelProperty(name = "moneyAmount",value = "充值总额")
private String moneyAmount;
/**
* 是否删除
*/
......
wisenergy-service/src/main/java/cn/wisenergy/service/app/UserService.java
View file @ 167c5c1f
......@@ -2,7 +2,7 @@ package cn.wisenergy.service.app;
import cn.wisenergy.common.utils.R;
import cn.wisenergy.model.app.UserInfo;
import cn.wisenergy.model.app.User;
import cn.wisenergy.model.dto.UserCommitDto;
import cn.wisenergy.model.dto.UserInfoDto;
import cn.wisenergy.model.vo.UserInfoVo;
......@@ -37,10 +37,10 @@ public interface UserService {
/**
* 编辑用户信息
*
* @param userInfo 用户信息
* @param user 用户信息
* @return true 成功 false 失败
*/
R<Boolean> edit(UserInfo userInfo);
R<Boolean> edit(User user);
/**
* 删除用户
......
wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/SchemeServiceImpl.java
View file @ 167c5c1f
......@@ -11,7 +11,6 @@ import cn.wisenergy.model.vo.SchemeQueryVo;
import cn.wisenergy.model.vo.VolunteerVo;
import cn.wisenergy.service.app.SchemeService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
......@@ -68,8 +67,8 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
}
//1、根据userId获取用户信息
UserInfo userInfo = usersMapper.selectById(queryVo.getUserId());
if (null == userInfo) {
User user = usersMapper.selectById(queryVo.getUserId());
if (null == user) {
return R.error("用户信息不存在!");
}
......@@ -98,7 +97,7 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
//(1)判断考生类型 文化课考生
List<Volunteer> list = new ArrayList<>();
VolunteerVo volunteerVo = new VolunteerVo();
if (StudentType.CULTURE_STUDENT.getCode().equals(userInfo.getExamType())) {
if (StudentType.CULTURE_STUDENT.getCode().equals(user.getExamType())) {
//获取文化课本科一批规则
AdmissionRule firstRule = admissionRuleMapper.getByType(SchemeTypeEnums.UNDERGRADUATE_CULTURE.getCode());
if (null == firstRule) {
......@@ -116,7 +115,7 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
double firstCulture = firstRule.getCurrentYearCulture() - firstRule.getCultureMin() + Double.parseDouble(queryVo.getCultureGrade());
double cultureMax = Double.parseDouble(firstRule.getCultureMax().toString());
if (firstCulture >= cultureMax) {
volunteerVo.setUserId(userInfo.getId());
volunteerVo.setUserId(user.getId());
volunteerVo.setVolunteers(list);
return R.ok("恭喜您，因您的成绩突出，请联系官方免费领取VIP一对一报考方案指导！", volunteerVo);
}
......@@ -133,7 +132,7 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
}
//(2)美术考生
if (StudentType.ART_STUDENT.getCode().equals(userInfo.getExamType())) {
if (StudentType.ART_STUDENT.getCode().equals(user.getExamType())) {
//获取美术本科一批录取规则
AdmissionRule firstRule = admissionRuleMapper.getByType(SchemeTypeEnums.UNDERGRADUATE_ARTS.getCode());
if (null == firstRule) {
......@@ -156,7 +155,7 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
}
//(3)文学编导考生
if (StudentType.LITERATURE_STUDENT.getCode().equals(userInfo.getExamType())) {
if (StudentType.LITERATURE_STUDENT.getCode().equals(user.getExamType())) {
//获取文学编导本科一批录取规则
AdmissionRule firstRule = admissionRuleMapper.getByType(SchemeTypeEnums.UNDERGRADUATE_LITERATURE.getCode());
if (null == firstRule) {
......@@ -179,7 +178,7 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
}
//(4)体育考生
if (StudentType.SPORTS_STUDENT.getCode().equals(userInfo.getExamType())) {
if (StudentType.SPORTS_STUDENT.getCode().equals(user.getExamType())) {
//获取体育本科一批录取规则
AdmissionRule firstRule = admissionRuleMapper.getByType(SchemeTypeEnums.UNDERGRADUATE_SPORTS.getCode());
if (null == firstRule) {
......@@ -207,12 +206,12 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
}
//4保存用户方案记录、志愿之间的关联关系
boolean bool = saveUserVolunteer(userInfo, list, scoreInfo);
boolean bool = saveUserVolunteer(user, list, scoreInfo);
if (!bool) {
return R.error("保存方案查询记录失败!");
}
volunteerVo.setUserId(userInfo.getId());
volunteerVo.setUserId(user.getId());
volunteerVo.setVolunteers(list);
return R.ok(volunteerVo);
}
......@@ -260,17 +259,17 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
/**
* 保存方案查询记录和关联关系
*
* @param userInfo 用户信息
* @param user 用户信息
* @param list 志愿信息
* @return true 成功 false 失败
*/
@Transactional
public boolean saveUserVolunteer(UserInfo userInfo, List<Volunteer> list, ScoreInfo scoreInfo) {
public boolean saveUserVolunteer(User user, List<Volunteer> list, ScoreInfo scoreInfo) {
//1、保存方案查询记录
SchemeQueryRecord schemeQueryRecord = new SchemeQueryRecord();
schemeQueryRecord.setMajorName("");
schemeQueryRecord.setStudentType(userInfo.getExamType());
schemeQueryRecord.setUserId(userInfo.getId());
schemeQueryRecord.setStudentType(user.getExamType());
schemeQueryRecord.setUserId(user.getId());
schemeQueryRecord.setIsDelete(0);
double score = scoreInfo.getCultureGrade() + scoreInfo.getMajorGrade();
schemeQueryRecord.setScore(String.valueOf(score));
......@@ -286,7 +285,7 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
for (Integer id : ids) {
UserVolunteer userVolunteer = new UserVolunteer();
userVolunteer.setSchemeRecordId(count.getId());
userVolunteer.setUserId(userInfo.getId());
userVolunteer.setUserId(user.getId());
userVolunteer.setVolunteerId(id);
volunteerList.add(userVolunteer);
}
......
wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UserLoginServiceImpl.java
View file @ 167c5c1f
......@@ -5,9 +5,8 @@ import cn.wisenergy.common.utils.R;
import cn.wisenergy.mapper.LoginRecordMapper;
import cn.wisenergy.mapper.UsersMapper;
import cn.wisenergy.model.app.LoginRecord;
import cn.wisenergy.model.app.UserInfo;
import cn.wisenergy.model.app.User;
import cn.wisenergy.model.enums.OperationTypeEnum;
import cn.wisenergy.model.enums.SceneType;
import cn.wisenergy.model.vo.UpdatePasswordVo;
import cn.wisenergy.model.vo.UserInfoVo;
import cn.wisenergy.model.vo.UserLoginVo;
......@@ -32,7 +31,7 @@ import org.springframework.stereotype.Service;
*/
@Service
@Slf4j
public class UserLoginServiceImpl extends ServiceImpl<UsersMapper, UserInfo> implements UserLoginService {
public class UserLoginServiceImpl extends ServiceImpl<UsersMapper, User> implements UserLoginService {
@Autowired
private UsersMapper usersMapper;
......@@ -48,12 +47,7 @@ public class UserLoginServiceImpl extends ServiceImpl<UsersMapper, UserInfo> imp
@Override
public R<Boolean> register(UserRegisterVo userVo) {
log.info("volunteer-service[]UserLoginServiceImpl[]register[]input.param.userVo:" + userVo);
if (null == userVo) {
return R.error("入参为空!");
}
if (StringUtils.isBlank(userVo.getPhone()) ||
StringUtils.isBlank(userVo.getPassword())) {
if (null == userVo || StringUtils.isBlank(userVo.getPhone()) || StringUtils.isBlank(userVo.getPassword())) {
return R.error("入参为空!");
}
......@@ -71,16 +65,18 @@ public class UserLoginServiceImpl extends ServiceImpl<UsersMapper, UserInfo> imp
String secret = Md5Util.digestMD5(phone + password);
//3、添加用户信息
UserInfo userInfo = new UserInfo();
User userInfo = new User();
userInfo.setPhone(phone);
userInfo.setPassword(secret);
userInfo.setIsDelete(0);
UserInfo user = usersMapper.add(userInfo);
if (null == user) {
int count = usersMapper.add(userInfo);
if (count == 0) {
return R.ok(1, false);
}
//4、保存操作记录
User user=usersMapper.getByPhone(userVo.getPhone());
LoginRecord loginRecord = new LoginRecord();
loginRecord.setType(OperationTypeEnum.USER_REGISTER.getCode());
loginRecord.setUserId(user.getId());
......@@ -103,11 +99,11 @@ public class UserLoginServiceImpl extends ServiceImpl<UsersMapper, UserInfo> imp
}
//1、判断手机号账户是否存在
QueryWrapper<UserInfo> queryWrapper = new QueryWrapper<>();
QueryWrapper<User> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("phone", userVo.getPhone());
queryWrapper.eq("is_delete", 0);
UserInfo userInfo = usersMapper.selectOne(queryWrapper);
if (null == userInfo) {
User user = usersMapper.selectOne(queryWrapper);
if (null == user) {
return R.error("该手机号未注册,请先注册!");
}
......@@ -124,11 +120,11 @@ public class UserLoginServiceImpl extends ServiceImpl<UsersMapper, UserInfo> imp
}
//1、根据手机号，获取用户信息
QueryWrapper<UserInfo> queryWrapper = new QueryWrapper<>();
QueryWrapper<User> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("phone", userVo.getPhone());
queryWrapper.eq("is_delete", 0);
UserInfo userInfo = usersMapper.selectOne(queryWrapper);
if (null == userInfo) {
User user = usersMapper.selectOne(queryWrapper);
if (null == user) {
return R.error("该用户不存在，请您注册账号!");
}
......@@ -136,20 +132,20 @@ public class UserLoginServiceImpl extends ServiceImpl<UsersMapper, UserInfo> imp
//MD5加密
String secret = Md5Util.digestMD5(userVo.getPhone() + userVo.getPassword());
if (!userInfo.getPassword().equals(secret)) {
if (!user.getPassword().equals(secret)) {
return R.error("密码错误，请您输入正确密码!");
}
//3、构造返回参数
UserInfoVo userInfoVo = new UserInfoVo();
userInfoVo.setUserId(userInfo.getId());
userInfoVo.setUserName(userInfo.getUserName());
userInfoVo.setPhone(userInfo.getPhone());
userInfoVo.setUserId(user.getId());
userInfoVo.setUserName(user.getUserName());
userInfoVo.setPhone(user.getPhone());
//3、保存操作记录
LoginRecord loginRecord = new LoginRecord();
loginRecord.setType(OperationTypeEnum.USER_LOGIN.getCode());
loginRecord.setUserId(userInfo.getId());
loginRecord.setUserId(user.getId());
String name = OperationTypeEnum.getByCode(OperationTypeEnum.USER_LOGIN.getCode());
loginRecord.setOperationName(name);
int sum = loginRecordMapper.add(loginRecord);
......@@ -188,21 +184,21 @@ public class UserLoginServiceImpl extends ServiceImpl<UsersMapper, UserInfo> imp
}
//1、获取用户信息
UserInfo userInfo = usersMapper.selectById(updateVo.getUserId());
if (null == userInfo) {
User user = usersMapper.selectById(updateVo.getUserId());
if (null == user) {
return R.error("用户信息不存在,无法修改密码!");
}
//2、判断旧密码是否正确
String password = Md5Util.digestMD5(updateVo.getNewPassword() + userInfo.getPassword());
if (!userInfo.getPassword().equals(password)) {
String password = Md5Util.digestMD5(updateVo.getNewPassword() + user.getPassword());
if (!user.getPassword().equals(password)) {
return R.error("旧密码不正确,请从新输入!");
}
//3、修改用户密码为新密码
String newPassword = Md5Util.digestMD5(updateVo.getNewPassword() + userInfo.getPhone());
userInfo.setPassword(newPassword);
int count = usersMapper.edit(userInfo);
String newPassword = Md5Util.digestMD5(updateVo.getNewPassword() + user.getPhone());
user.setPassword(newPassword);
int count = usersMapper.edit(user);
if (count == 0) {
return R.ok(1, false);
}
......@@ -217,13 +213,13 @@ public class UserLoginServiceImpl extends ServiceImpl<UsersMapper, UserInfo> imp
}
//获取用户信息
UserInfo userInfo = usersMapper.selectById(userId);
User user = usersMapper.selectById(userId);
//加密重置密码
String password = Md5Util.digestMD5(Common.RESET_PASSWORD_VALUE + userInfo.getPhone());
userInfo.setPassword(password);
String password = Md5Util.digestMD5(Common.RESET_PASSWORD_VALUE + user.getPhone());
user.setPassword(password);
int count = usersMapper.edit(userInfo);
int count = usersMapper.edit(user);
if (count == 0) {
return R.ok(1, false);
}
......@@ -239,11 +235,11 @@ public class UserLoginServiceImpl extends ServiceImpl<UsersMapper, UserInfo> imp
}
//获取用户信息
QueryWrapper<UserInfo> queryWrapper = new QueryWrapper<>();
QueryWrapper<User> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("phone", userVo.getPhone());
queryWrapper.eq("is_delete", 0);
UserInfo userInfo = baseMapper.selectOne(queryWrapper);
if (null == userInfo) {
User user = baseMapper.selectOne(queryWrapper);
if (null == user) {
return R.error("用户信息不存在，无法重置密码!");
}
......@@ -255,8 +251,8 @@ public class UserLoginServiceImpl extends ServiceImpl<UsersMapper, UserInfo> imp
//3、设置新密码
String password = Md5Util.digestMD5(userVo.getPassword() + userVo.getPhone());
userInfo.setPassword(password);
int count = usersMapper.edit(userInfo);
user.setPassword(password);
int count = usersMapper.edit(user);
if (count == 0) {
return R.ok(1, false);
}
......@@ -268,11 +264,11 @@ public class UserLoginServiceImpl extends ServiceImpl<UsersMapper, UserInfo> imp
//1、注册-新增
if (null == userId) {
//根据电话号码查询用户
QueryWrapper<UserInfo> queryWrapper = new QueryWrapper<>();
QueryWrapper<User> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("phone", phone);
queryWrapper.eq("is_delete", 0);
UserInfo userInfo = usersMapper.selectOne(queryWrapper);
if (null != userInfo) {
User user = usersMapper.selectOne(queryWrapper);
if (null != user) {
return false;
}
}
......
wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UserServiceImpl.java
View file @ 167c5c1f
package cn.wisenergy.service.app.impl;
import cn.wisenergy.common.constant.CommonAttributes;
import cn.wisenergy.common.utils.Md5Util;
import cn.wisenergy.common.utils.R;
import cn.wisenergy.mapper.*;
import cn.wisenergy.model.app.*;
......@@ -15,7 +14,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.pagehelper.PageInfo;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......@@ -32,7 +30,7 @@ import java.util.List;
*/
@Service
@Slf4j
public class UserServiceImpl extends ServiceImpl<UsersMapper, UserInfo> implements UserService {
public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements UserService {
@Autowired
private UsersMapper usersMapper;
......@@ -63,25 +61,25 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, UserInfo> implemen
map.put("endTime",queryVo.getEndTime());
//查询用户数据
List<UserInfo> list1 = usersMapper.getList(map);
List<User> list1 = usersMapper.getList(map);
List<UserInfoDto> list = new ArrayList<>();
//将集合遍历拿出用户id查询成绩信息
for (UserInfo userInfo : list1) {
for (User user : list1) {
UserInfoDto userInfoDto = new UserInfoDto();
//查询相关信息
ScoreInfo scoreInfo = scoreInfoMapper.getById(userInfo.getId());
LoginRecord loginRecord = loginRecordMapper.getById(userInfo.getId());
UserLimit userLimit = userLimitMapper.getById(userInfo.getId());
PayRecord byId = payRecordMapper.getById(userInfo.getId());
ScoreInfo scoreInfo = scoreInfoMapper.getById(user.getId());
LoginRecord loginRecord = loginRecordMapper.getById(user.getId());
UserLimit userLimit = userLimitMapper.getById(user.getId());
PayRecord byId = payRecordMapper.getById(user.getId());
//将消息进行同步
BeanUtils.copyProperties(userInfo,userInfoDto);
userInfoDto.setUserId(userInfo.getId());
BeanUtils.copyProperties(user,userInfoDto);
userInfoDto.setUserId(user.getId());
userInfoDto.setCultureGrade(scoreInfo.getCultureGrade().toString());
userInfoDto.setMajorGrade(scoreInfo.getMajorGrade().toString());
userInfoDto.setRegisterTime(userInfo.getCreateTime());
userInfoDto.setRegisterTime(user.getCreateTime());
userInfoDto.setLastLoginTime(loginRecord.getUpdateTime());
userInfoDto.setQueryLimit(userLimit.getUsableLimit());
userInfoDto.setMoneyAmount(byId.getMoney());
......@@ -108,7 +106,7 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, UserInfo> implemen
}
//1、根据用户id,获取用户信息
UserInfo user = usersMapper.selectById(userInfo.getId());
User user = usersMapper.selectById(userInfo.getId());
if (null == user) {
return R.error("用户信息不存在!");
}
......@@ -141,7 +139,7 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, UserInfo> implemen
}
@Override
public R<Boolean> edit(UserInfo userInfo) {
public R<Boolean> edit(User user) {
return null;
}
......@@ -158,21 +156,21 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, UserInfo> implemen
}
//根据id,获取用户信息
UserInfo userInfo = usersMapper.selectById(id);
if (null == userInfo) {
User user = usersMapper.selectById(id);
if (null == user) {
return R.error("用户信息不存在!");
}
UserShowVo userShowVo = new UserShowVo();
userShowVo.setId(userInfo.getId());
userShowVo.setSchool(userInfo.getSchool());
userShowVo.setSex(userInfo.getSex());
userShowVo.setStudentType(userInfo.getExamType());
userShowVo.setUserName(userInfo.getUserName());
userShowVo.setId(user.getId());
userShowVo.setSchool(user.getSchool());
userShowVo.setSex(user.getSex());
userShowVo.setStudentType(user.getExamType());
userShowVo.setUserName(user.getUserName());
//获取成绩信息
QueryWrapper<ScoreInfo> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("user_id", userInfo.getId());
queryWrapper.eq("user_id", user.getId());
ScoreInfo scoreInfo = scoreInfoMapper.selectOne(queryWrapper);
if (null != scoreInfo) {
userShowVo.setScoreInfo(scoreInfo);
......@@ -203,9 +201,9 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, UserInfo> implemen
}
@Transactional
public boolean updateAndSaveUserInfo(UserInfo userInfo, ScoreInfo scoreInfo) {
public boolean updateAndSaveUserInfo(User user, ScoreInfo scoreInfo) {
//1、更新用户信息
int count = usersMapper.edit(userInfo);
int count = usersMapper.edit(user);
if (count == 0) {
return false;
}
......
wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/SendSmsController.java
View file @ 167c5c1f
......@@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.*;
* @ Date : 2021/1/15 15:40
*/
@RestController
@Api(tags = "用户管理")
@Api(tags = "短信管理")
@RequestMapping("/user")
@Slf4j
public class SendSmsController {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment