|
@@ -83,6 +83,9 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
|
|
|
@Autowired
|
|
|
private IGameAuthService gameAuthService;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private IUserAgentLogService userAgentLogService;
|
|
|
+
|
|
|
@Override
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
public Boolean appletToH5(Long userId, String mobile, Integer type) {
|
|
@@ -179,10 +182,12 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
|
|
|
).collect(Collectors.toList());
|
|
|
gameUserRoleService.saveBatch(h5GameUserRoleList);
|
|
|
//用户更新
|
|
|
- return super.update(new LambdaUpdateWrapper<User>()
|
|
|
+ super.update(new LambdaUpdateWrapper<User>()
|
|
|
.set(User::getRelationUserId, h5User.getId())
|
|
|
.set(User::getRelationCreateTime, LocalDateTime.now())
|
|
|
.eq(User::getId, userId));
|
|
|
+ //添加导量用户的渠道变更记录
|
|
|
+ return userAgentLogService.regAgentLog(h5User);
|
|
|
}
|
|
|
|
|
|
@Override
|
|
@@ -304,6 +309,16 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
|
|
|
@Override
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
public Boolean userUpdate(UserUpdateParam param) {
|
|
|
+ if (Strings.isNotBlank(param.getMobile()) && !param.getMobile().contains("*")) {
|
|
|
+ User user = super.getById(param.getUserId());
|
|
|
+ //判断手机号是否被该游戏其他用户绑定
|
|
|
+ if (super.count(new LambdaQueryWrapper<User>()
|
|
|
+ .eq(User::getGameId, user.getGameId())
|
|
|
+ .eq(User::getMobile, param.getMobile())
|
|
|
+ ) > 0) {
|
|
|
+ throw new BaseException("手机号已被同游戏其他玩家绑定, 禁止修改");
|
|
|
+ }
|
|
|
+ }
|
|
|
//用户信息更新
|
|
|
if (Strings.isNotBlank(param.getMobile()) || Strings.isNotBlank(param.getAliPay()) || Strings.isNotBlank(param.getPassword())) {
|
|
|
super.update(new LambdaUpdateWrapper<User>()
|