|
|
@@ -53,6 +53,8 @@ public class LifeUserService extends ServiceImpl<LifeUserMapper, LifeUser> {
|
|
|
|
|
|
private final WebSocketProcess webSocketProcess;
|
|
|
|
|
|
+ private final ActivityInviteConfigService activityInviteConfigService;
|
|
|
+
|
|
|
@Value("${jwt.expiration-time}")
|
|
|
private String effectiveTime;
|
|
|
|
|
|
@@ -136,7 +138,7 @@ public class LifeUserService extends ServiceImpl<LifeUserMapper, LifeUser> {
|
|
|
return voList;
|
|
|
}
|
|
|
|
|
|
- public LifeUserVo userLogin(String phoneNum) {
|
|
|
+ public LifeUserVo userLogin(String phoneNum, String inviteCode) {
|
|
|
LifeUser user = getUserByPhone(phoneNum);
|
|
|
if (user == null) {
|
|
|
LifeUser lifeUser = new LifeUser();
|
|
|
@@ -158,6 +160,11 @@ public class LifeUserService extends ServiceImpl<LifeUserMapper, LifeUser> {
|
|
|
String token = getToken(phoneNum, userVo.getUserName(), tokenMap);
|
|
|
userVo.setToken(token);
|
|
|
baseRedisService.setString("user_" + phoneNum, token);
|
|
|
+
|
|
|
+ // 生成邀请记录
|
|
|
+ if(StringUtils.isNotEmpty(inviteCode)){
|
|
|
+ activityInviteConfigService.bindInviteCode(lifeUser.getId(), inviteCode);
|
|
|
+ }
|
|
|
return userVo;
|
|
|
} else {
|
|
|
return null;
|
|
|
@@ -173,6 +180,11 @@ public class LifeUserService extends ServiceImpl<LifeUserMapper, LifeUser> {
|
|
|
String token = getToken(phoneNum, user.getUserName(), tokenMap);
|
|
|
userVo.setToken(token);
|
|
|
baseRedisService.setString("user_" + phoneNum, token);
|
|
|
+ if(StringUtils.isNotEmpty(inviteCode)){
|
|
|
+ // 生成邀请记录
|
|
|
+ activityInviteConfigService.bindInviteCode(user.getId(), inviteCode);
|
|
|
+ }
|
|
|
+
|
|
|
return userVo;
|
|
|
}
|
|
|
}
|