|
@ -267,6 +267,11 @@ public class AdminPrizeServiceImpl extends ServiceImpl<AdminPrizeMapper, Prize> |
|
|
// 1. 检查用户是否存在,不存在则创建 |
|
|
// 1. 检查用户是否存在,不存在则创建 |
|
|
Long userId = adminUserMapper.selectByJwcode(fixUserDto.getJwcode()); |
|
|
Long userId = adminUserMapper.selectByJwcode(fixUserDto.getJwcode()); |
|
|
String s = fundingMapper.updateLocMarketToCn(locMarket); |
|
|
String s = fundingMapper.updateLocMarketToCn(locMarket); |
|
|
|
|
|
if (adminUserMapper.selectById(userId) != null && adminUserMapper.selectById(userId).getIsDel() == 1) { |
|
|
|
|
|
LambdaUpdateWrapper<User> userLambdaUpdateWrapper = new LambdaUpdateWrapper<>(); |
|
|
|
|
|
userLambdaUpdateWrapper.eq(User::getId, userId).set(User::getIsDel, 0); |
|
|
|
|
|
adminUserMapper.update(null, userLambdaUpdateWrapper); |
|
|
|
|
|
} |
|
|
if (userId == null) { |
|
|
if (userId == null) { |
|
|
User user = User.builder() |
|
|
User user = User.builder() |
|
|
.username(fixUserDto.getUsername()) |
|
|
.username(fixUserDto.getUsername()) |
|
@ -282,6 +287,8 @@ public class AdminPrizeServiceImpl extends ServiceImpl<AdminPrizeMapper, Prize> |
|
|
userId = user.getId(); |
|
|
userId = user.getId(); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Long gradeId = fixUserDto.getGradeId(); |
|
|
Long gradeId = fixUserDto.getGradeId(); |
|
|
|
|
|
|
|
|
// 2. 检查该等级下是否已存在未删除的内定用户 |
|
|
// 2. 检查该等级下是否已存在未删除的内定用户 |
|
|