From e421b95541e2796a7c7b2cee7930fe27f9a33d1d Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 21 三月 2025 15:38:17 +0800
Subject: [PATCH] 冥想
---
xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/service/impl/AppUserServiceImpl.java | 24 ++++++++++++++++++++++++
1 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/service/impl/AppUserServiceImpl.java b/xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/service/impl/AppUserServiceImpl.java
index 13e3a58..34dc49e 100644
--- a/xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/service/impl/AppUserServiceImpl.java
+++ b/xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/service/impl/AppUserServiceImpl.java
@@ -18,6 +18,7 @@
import com.xinquan.common.core.utils.page.CollUtils;
import com.xinquan.common.security.service.TokenService;
import com.xinquan.common.security.utils.SecurityUtils;
+import com.xinquan.meditation.api.feign.RemoteMeditationService;
import com.xinquan.system.api.RemoteUserService;
import com.xinquan.system.api.domain.SysUser;
import com.xinquan.system.api.feignClient.SysUserClient;
@@ -46,6 +47,8 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.StringUtils;
+import javax.annotation.Resource;
+
/**
* <p>
* 用户信息表 服务实现类
@@ -63,6 +66,8 @@
private final AppUserTreeService appUserTreeService;
private final AppUserQuestionService appUserQuestionService;
private final TagService tagService;
+ @Resource
+ private RemoteMeditationService remoteMeditationService;
/**
* 获取用户信息
*
@@ -74,9 +79,11 @@
String device = dto.getDevice();
if (StringUtils.hasLength(dto.getDevice())) {
Optional<AppUser> one = this.lambdaQuery()
+ .ne(AppUser::getUserStatus,3)
.eq(AppUser::getDevice, device)
.isNull(AppUser::getCellPhone).oneOpt();
Optional<AppUser> appUser = this.lambdaQuery()
+ .ne(AppUser::getUserStatus,3)
.eq(Objects.nonNull(dto.getId()), AppUser::getId, dto.getId())
.eq(com.alibaba.nacos.common.utils.StringUtils.isNotBlank(dto.getAppleId()), AppUser::getAppleId, dto.getAppleId())
.eq(com.alibaba.nacos.common.utils.StringUtils.isNotBlank(dto.getCellPhone()), AppUser::getCellPhone,
@@ -119,6 +126,7 @@
.ne(AppUser::getUserStatus,3).oneOpt();
}
+
/**
* app用户注册
* @param appUserDTO
@@ -137,6 +145,7 @@
String randomCode = String.valueOf((int) ((Math.random() * 9 + 1) * 1000));
appUser.setCode("YH"+format+randomCode);
this.save(appUser);
+ remoteMeditationService.addHomeBackgroundMusicDefault(appUser.getId());
initUserTree(appUser.getId());
return appUser;
}else{
@@ -157,6 +166,8 @@
String randomCode = String.valueOf((int) ((Math.random() * 9 + 1) * 1000));
appUser.setCode("YH"+format+randomCode);
this.save(appUser);
+ remoteMeditationService.addHomeBackgroundMusicDefault(appUser.getId());
+
initUserTree(appUser.getId());
return appUser;
}
@@ -186,6 +197,8 @@
if (appUser.getCellPhone()!=null){
appLoginUser.setBindStatus(DisabledEnum.NO.getCode());
appLoginUser.setCellPhone(appUser.getCellPhone());
+ }else{
+ appLoginUser.setBindStatus(DisabledEnum.YES.getCode());
}
} else {
if (org.springframework.util.StringUtils.hasLength(body.getDevice())){
@@ -233,6 +246,8 @@
appUser.setLevelSettingId(TreeLevelEnum.SEED.getCode());
appLoginUser.setBindStatus(DisabledEnum.YES.getCode());
this.save(appUser);
+ remoteMeditationService.addHomeBackgroundMusicDefault(appUser.getId());
+
// 初始化用户树苗
initUserTree(appUser.getId());
}
@@ -274,6 +289,8 @@
appUser.setLevelSettingId(TreeLevelEnum.SEED.getCode());
appLoginUser.setBindStatus(DisabledEnum.YES.getCode());
this.save(appUser);
+ remoteMeditationService.addHomeBackgroundMusicDefault(appUser.getId());
+
// 初始化用户树苗
initUserTree(appUser.getId());
}
@@ -352,6 +369,8 @@
String randomCode = String.valueOf((int) ((Math.random() * 9 + 1) * 1000));
appUser.setCode("YH" + format + randomCode);
this.save(appUser);
+ remoteMeditationService.addHomeBackgroundMusicDefault(appUser.getId());
+
// 初始化用户树苗
initUserTree(appUser.getId());
}
@@ -391,6 +410,8 @@
String randomCode = String.valueOf((int) ((Math.random() * 9 + 1) * 1000));
appUser.setCode("YH" + format + randomCode);
this.save(appUser);
+ remoteMeditationService.addHomeBackgroundMusicDefault(appUser.getId());
+
// 初始化用户树苗
initUserTree(appUser.getId());
}
@@ -462,6 +483,7 @@
String randomCode = String.valueOf((int) ((Math.random() * 9 + 1) * 1000));
appUser.setCode("YH" + format + randomCode);
this.save(appUser);
+ remoteMeditationService.addHomeBackgroundMusicDefault(appUser.getId());
// 初始化用户树苗
initUserTree(appUser.getId());
}
@@ -500,6 +522,8 @@
String randomCode = String.valueOf((int) ((Math.random() * 9 + 1) * 1000));
appUser.setCode("YH" + format + randomCode);
this.save(appUser);
+ remoteMeditationService.addHomeBackgroundMusicDefault(appUser.getId());
+
// 初始化用户树苗
initUserTree(appUser.getId());
}
--
Gitblit v1.7.1