|
@@ -136,13 +136,12 @@ public class UserServiceImpl extends MPJBaseServiceImpl<UserMapper, User> implem
|
|
|
// todo 用户归属 扫设备二维码以外注册的用户,统一归属平台自己的商户,初始化系统时创建对应的商户
|
|
// todo 用户归属 扫设备二维码以外注册的用户,统一归属平台自己的商户,初始化系统时创建对应的商户
|
|
|
newUser.setStationId("000");
|
|
newUser.setStationId("000");
|
|
|
}
|
|
}
|
|
|
- long userId = IDGenerator.INS().nextId();
|
|
|
|
|
baseMapper.insert(newUser);
|
|
baseMapper.insert(newUser);
|
|
|
- newUser.setId(userId);
|
|
|
|
|
- KymCache.INSTANCE.putUserId2StationId(Map.of(newUser.getId(), newUser.getStationId()));
|
|
|
|
|
|
|
+ long userId = newUser.getId();
|
|
|
|
|
+ KymCache.INSTANCE.putUserId2StationId(Map.of(userId, newUser.getStationId()));
|
|
|
// 创建用户账户
|
|
// 创建用户账户
|
|
|
var account = new Account();
|
|
var account = new Account();
|
|
|
- account.setUserId(newUser.getId());
|
|
|
|
|
|
|
+ account.setUserId(userId);
|
|
|
accountService.save(account);
|
|
accountService.save(account);
|
|
|
// 登录逻辑
|
|
// 登录逻辑
|
|
|
return handleLogin(newUser);
|
|
return handleLogin(newUser);
|