|
@@ -218,16 +218,24 @@ public class UserServiceImpl extends MPJBaseServiceImpl<UserMapper, User> implem
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
@Override
|
|
@Override
|
|
|
public void updateUser(UserVo userVo) {
|
|
public void updateUser(UserVo userVo) {
|
|
|
- userVo.setId(StpUtil.getSession().getLong("userId"));
|
|
|
|
|
|
|
+ var userId = StpUtil.getLoginIdAsLong();
|
|
|
|
|
+ userVo.setId(userId);
|
|
|
var user = new User();
|
|
var user = new User();
|
|
|
BeanUtils.copyProperties(userVo, user);
|
|
BeanUtils.copyProperties(userVo, user);
|
|
|
|
|
+ // 手机号不允许通过该接口修改,只能通过微信手机号授权渠道更新
|
|
|
|
|
+ if (!CommUtil.isEmptyOrNull(user.getMobilePhone())) {
|
|
|
|
|
+ var dbUser = getById(userId);
|
|
|
|
|
+ if (dbUser == null || !user.getMobilePhone().equals(dbUser.getMobilePhone())) {
|
|
|
|
|
+ throw new BusinessException("请通过微信手机号授权更新手机号");
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
if (!CommUtil.isEmptyOrNull(user.getAvatar()) || !CommUtil.isEmptyOrNull(user.getMobilePhone()) || !CommUtil.isEmptyOrNull(user.getNickname())) {
|
|
if (!CommUtil.isEmptyOrNull(user.getAvatar()) || !CommUtil.isEmptyOrNull(user.getMobilePhone()) || !CommUtil.isEmptyOrNull(user.getNickname())) {
|
|
|
baseMapper.updateById(user);
|
|
baseMapper.updateById(user);
|
|
|
}
|
|
}
|
|
|
// 更新车牌信息
|
|
// 更新车牌信息
|
|
|
if (userVo.getDefaultPlateNo() != null) {
|
|
if (userVo.getDefaultPlateNo() != null) {
|
|
|
var car = new Cars();
|
|
var car = new Cars();
|
|
|
- car.setUserId(userVo.getId());
|
|
|
|
|
|
|
+ car.setUserId(userId);
|
|
|
car.setPlateNo(userVo.defaultPlateNo);
|
|
car.setPlateNo(userVo.defaultPlateNo);
|
|
|
// 设置为默认
|
|
// 设置为默认
|
|
|
car.setIsDefault(true);
|
|
car.setIsDefault(true);
|
|
@@ -235,11 +243,13 @@ public class UserServiceImpl extends MPJBaseServiceImpl<UserMapper, User> implem
|
|
|
car.setVin(userVo.getVin());
|
|
car.setVin(userVo.getVin());
|
|
|
}
|
|
}
|
|
|
// 将用户名下其他车辆设为非默认
|
|
// 将用户名下其他车辆设为非默认
|
|
|
- var cars = carsService.listByMap(Map.of("user_id", userVo.getId()));
|
|
|
|
|
|
|
+ var cars = carsService.lambdaQuery().eq(Cars::getUserId, userId).list();
|
|
|
cars.stream().filter(c -> !userVo.getDefaultPlateNo().equals(c.getEngineNo())).peek(s -> s.setIsDefault(false)).collect(Collectors.toList());
|
|
cars.stream().filter(c -> !userVo.getDefaultPlateNo().equals(c.getEngineNo())).peek(s -> s.setIsDefault(false)).collect(Collectors.toList());
|
|
|
carsService.updateBatchById(cars);
|
|
carsService.updateBatchById(cars);
|
|
|
var wrapper = new QueryWrapper<Cars>();
|
|
var wrapper = new QueryWrapper<Cars>();
|
|
|
wrapper.eq("plate_no", userVo.getDefaultPlateNo());
|
|
wrapper.eq("plate_no", userVo.getDefaultPlateNo());
|
|
|
|
|
+ // 只允许操作自己名下的车辆,防止改绑他人车辆
|
|
|
|
|
+ wrapper.eq("user_id", userId);
|
|
|
// MyBatis-Plus 3.5.9+ saveOrUpdate(T, Wrapper) 方法已移除,改为先查询再保存或更新
|
|
// MyBatis-Plus 3.5.9+ saveOrUpdate(T, Wrapper) 方法已移除,改为先查询再保存或更新
|
|
|
var existCar = carsService.getOne(wrapper);
|
|
var existCar = carsService.getOne(wrapper);
|
|
|
if (existCar != null) {
|
|
if (existCar != null) {
|
|
@@ -251,18 +261,6 @@ public class UserServiceImpl extends MPJBaseServiceImpl<UserMapper, User> implem
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- @Override
|
|
|
|
|
- public PageBean<UserVo> listUserVo(Integer pageNum, Integer pageSize) {
|
|
|
|
|
- PageHelper.startPage(pageNum, pageSize);
|
|
|
|
|
- var userVoList = list().stream().map(user -> {
|
|
|
|
|
- var userVo = new UserVo();
|
|
|
|
|
- BeanUtils.copyProperties(user, userVo);
|
|
|
|
|
- return userVo;
|
|
|
|
|
- }).collect(Collectors.toList());
|
|
|
|
|
- return new PageBean<>(userVoList);
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
/**
|
|
/**
|
|
|
* 分页查询用户列表
|
|
* 分页查询用户列表
|
|
|
*
|
|
*
|