From 1e12b2abcaa1bdbdb57d3694446337126168bef1 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 28 三月 2025 19:15:08 +0800
Subject: [PATCH] bug修改
---
xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/service/impl/AppUserServiceImpl.java | 309 ++++++++++++++++++++++++++++++++++++--------------
1 files changed, 220 insertions(+), 89 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 b80cdde..0e8dbff 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
@@ -1,50 +1,53 @@
package com.xinquan.user.service.impl;
+
+
import cn.hutool.core.util.IdUtil;
-import cn.hutool.crypto.SecureUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.xinquan.common.core.constant.Constants;
import com.xinquan.common.core.constant.SecurityConstants;
import com.xinquan.common.core.domain.R;
-import com.xinquan.common.core.enums.AnswerTagEnum;
import com.xinquan.common.core.enums.AppUserStatusEnum;
import com.xinquan.common.core.enums.DisabledEnum;
import com.xinquan.common.core.enums.TreeLevelEnum;
import com.xinquan.common.core.exception.ServiceException;
import com.xinquan.common.core.utils.page.BeanUtils;
import com.xinquan.common.core.utils.page.CollUtils;
+import com.xinquan.common.core.web.page.PageInfo;
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.domain.*;
+import com.xinquan.system.api.domain.vo.AppUserVO;
+import com.xinquan.system.api.domain.vo.InviteRankListVO;
import com.xinquan.system.api.feignClient.SysUserClient;
import com.xinquan.system.api.model.*;
-import com.xinquan.system.api.domain.AppUser;
import com.xinquan.user.api.domain.dto.AppUserDTO;
-import com.xinquan.system.api.domain.AppUserQuestion;
-import com.xinquan.system.api.domain.AppUserTree;
-import com.xinquan.system.api.domain.Tag;
import com.xinquan.user.domain.dto.UserAnswerDTO;
-import com.xinquan.system.api.domain.vo.AppUserVO;
import com.xinquan.user.domain.vo.TagVO;
import com.xinquan.user.mapper.AppUserMapper;
import com.xinquan.user.service.AppUserQuestionService;
import com.xinquan.user.service.AppUserService;
import com.xinquan.user.service.AppUserTreeService;
import com.xinquan.user.service.TagService;
-import java.math.BigDecimal;
-import java.text.SimpleDateFormat;
-import java.time.LocalDateTime;
-import java.util.*;
-import java.util.stream.Collectors;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.StringUtils;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.util.Date;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.stream.Collectors;
/**
* <p>
@@ -63,6 +66,8 @@
private final AppUserTreeService appUserTreeService;
private final AppUserQuestionService appUserQuestionService;
private final TagService tagService;
+ @Resource
+ private RemoteMeditationService remoteMeditationService;
/**
* 获取用户信息
*
@@ -74,23 +79,38 @@
String device = dto.getDevice();
if (StringUtils.hasLength(dto.getDevice())) {
Optional<AppUser> one = this.lambdaQuery()
+ .ne(AppUser::getUserStatus,3)
.eq(AppUser::getDevice, device)
+ .isNull(AppUser::getWxOpenId)
+ .isNull(AppUser::getAppleId)
.isNull(AppUser::getCellPhone).oneOpt();
- if (one.isPresent()) {
- initUserTree(one.get().getId());
- this.updateById(one.get());
- return one;
- } else {
-
- return this.lambdaQuery()
- .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,
- dto.getCellPhone())
- .eq(com.alibaba.nacos.common.utils.StringUtils.isNotBlank(dto.getWxOpenId()), AppUser::getWxOpenId,
- dto.getWxOpenId())
- .ne(AppUser::getUserStatus, AppUserStatusEnum.LOGOUT.getCode()).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,
+ dto.getCellPhone())
+ .eq(com.alibaba.nacos.common.utils.StringUtils.isNotBlank(dto.getWxOpenId()), AppUser::getWxOpenId,
+ dto.getWxOpenId())
+ .ne(AppUser::getUserStatus, AppUserStatusEnum.LOGOUT.getCode()).oneOpt();
+ // 如果不存在
+ if (!appUser.isPresent()){
+ if (one.isPresent()) {
+ initUserTree(one.get().getId());
+ this.updateById(one.get());
+ return one;
+ } else {
+ return this.lambdaQuery()
+ .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,
+ dto.getCellPhone())
+ .eq(com.alibaba.nacos.common.utils.StringUtils.isNotBlank(dto.getWxOpenId()), AppUser::getWxOpenId,
+ dto.getWxOpenId())
+ .ne(AppUser::getUserStatus, AppUserStatusEnum.LOGOUT.getCode()).oneOpt();
+ }
}
+
}
return this.lambdaQuery()
.eq(Objects.nonNull(dto.getId()), AppUser::getId, dto.getId())
@@ -108,6 +128,7 @@
.ne(AppUser::getUserStatus,3).oneOpt();
}
+
/**
* app用户注册
* @param appUserDTO
@@ -115,6 +136,31 @@
*/
@Override
public AppUser registerAppUser(AppUserDTO appUserDTO) {
+ if (StringUtils.hasLength(appUserDTO.getDevice())){
+ AppUser one = this.lambdaQuery().eq(AppUser::getDevice, appUserDTO.getDevice())
+ .isNull(AppUser::getCellPhone).one();
+ if (one == null){
+ AppUser appUser = BeanUtils.copyBean(appUserDTO, AppUser.class);
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddHHmmss");
+ String format = simpleDateFormat.format(new Date());
+ // 生成四位随机数字
+ 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{
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddHHmmss");
+ String format = simpleDateFormat.format(new Date());
+ // 生成四位随机数字
+ String randomCode = String.valueOf((int) ((Math.random() * 9 + 1) * 1000));
+ one.setCode("YH"+format+randomCode);
+ this.updateById(one);
+ initUserTree(one.getId());
+ return one;
+ }
+ }
AppUser appUser = BeanUtils.copyBean(appUserDTO, AppUser.class);
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddHHmmss");
String format = simpleDateFormat.format(new Date());
@@ -122,6 +168,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;
}
@@ -136,7 +184,7 @@
public AppLoginUser wxLogin(AppWXLoginBody body) {
AppLoginUser appLoginUser = new AppLoginUser();
Optional<AppUser> optionalAppUser = this.getUserByCondition(
- AppUserDTO.builder().wxOpenId(body.getWxOpenId()).build());
+ AppUserDTO.builder().wxOpenId(body.getWxOpenId()).device(body.getDevice()).build());
AppUser appUser = new AppUser();
SysUser sysUser = new SysUser();
// 存在账户，查询关联系统用户
@@ -151,6 +199,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())){
@@ -185,6 +235,7 @@
String nickname = "用户" + IdUtil.fastSimpleUUID().substring(0, 6);
sysUser.setNickName(nickname);
appUser.setNickname(nickname);
+ appUser.setDevice(body.getDevice());
appUser.setWxName(body.getNickname());
appUser.setAvatar(body.getHeadImgUrl());
appUser.setGender(3);
@@ -197,6 +248,8 @@
appUser.setLevelSettingId(TreeLevelEnum.SEED.getCode());
appLoginUser.setBindStatus(DisabledEnum.YES.getCode());
this.save(appUser);
+ remoteMeditationService.addHomeBackgroundMusicDefault(appUser.getId());
+
// 初始化用户树苗
initUserTree(appUser.getId());
}
@@ -227,6 +280,7 @@
appUser.setNickname(nickname);
appUser.setWxName(body.getNickname());
appUser.setAvatar(body.getHeadImgUrl());
+ appUser.setDevice(body.getDevice());
appUser.setGender(3);
appUser.setBalance(BigDecimal.ZERO);
appUser.setSanskritFlag(DisabledEnum.NO.getCode());
@@ -237,6 +291,8 @@
appUser.setLevelSettingId(TreeLevelEnum.SEED.getCode());
appLoginUser.setBindStatus(DisabledEnum.YES.getCode());
this.save(appUser);
+ remoteMeditationService.addHomeBackgroundMusicDefault(appUser.getId());
+
// 初始化用户树苗
initUserTree(appUser.getId());
}
@@ -256,7 +312,7 @@
public AppLoginUser appleLogin(String appleId,String device) {
AppLoginUser appLoginUser = new AppLoginUser();
Optional<AppUser> optionalAppUser = this.getUserByCondition(
- AppUserDTO.builder().appleId(appleId).build());
+ AppUserDTO.builder().appleId(appleId).device(device).build());
SysUser sysUser = new SysUser();
AppUser appUser = new AppUser();
// 存在账户，查询关联系统用户
@@ -305,17 +361,61 @@
appUser.setBalance(BigDecimal.ZERO);
appUser.setIncome(BigDecimal.ZERO);
appUser.setTotalEnergyValue(0);
+ appUser.setDevice(device);
appUser.setRegisterTime(LocalDateTime.now());
appUser.setLevelSettingId(TreeLevelEnum.SEED.getCode());
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddHHmmss");
String format = simpleDateFormat.format(new Date());
+ appLoginUser.setBindStatus(DisabledEnum.YES.getCode());
// 生成四位随机数字
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());
}
+ }else{
+ // 不存在账户，创建账户
+ // 注册用户信息
+ sysUser = new SysUser();
+ String nickname = "用户" + IdUtil.fastSimpleUUID().substring(0, 6);
+ sysUser.setNickName(nickname);
+ sysUser.setAvatar("https://xqgwzh.obs.cn-south-1.myhuaweicloud.com/Logo%E7%A1%AE%E8%AE%A4%E7%89%88%281%29.jpg");
+ sysUser.setUserName(nickname);
+ sysUser.setUserType("01"); // app用户
+ R<SysUser> registerResult = remoteUserService.registerAppUserInfo(sysUser,
+ SecurityConstants.INNER);
+ if (registerResult.getCode() == Constants.FAIL) {
+ throw new ServiceException(registerResult.getMsg());
+ }
+ SysUser sysUserRes = registerResult.getData();
+ appUser = new AppUser();
+ appUser.setAppleId(appleId);
+ appUser.setUserId(sysUserRes.getUserId());
+ appUser.setNickname(nickname);
+ appUser.setAvatar("https://xqgwzh.obs.cn-south-1.myhuaweicloud.com/Logo%E7%A1%AE%E8%AE%A4%E7%89%88%281%29.jpg"); // TODO 待完善默认头像
+ appUser.setBalance(BigDecimal.ZERO);
+ appUser.setSanskritFlag(DisabledEnum.NO.getCode());
+ appUser.setBalance(BigDecimal.ZERO);
+ appUser.setIncome(BigDecimal.ZERO);
+ appUser.setTotalEnergyValue(0);
+ appUser.setDevice(device);
+
+ appUser.setRegisterTime(LocalDateTime.now());
+ appUser.setLevelSettingId(TreeLevelEnum.SEED.getCode());
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddHHmmss");
+ String format = simpleDateFormat.format(new Date());
+ appLoginUser.setBindStatus(DisabledEnum.YES.getCode());
+ // 生成四位随机数字
+ 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());
}
}
appLoginUser.setUserid(sysUser.getUserId());
@@ -336,7 +436,7 @@
public AppLoginUser appCaptchaLogin (AppCaptchaBody body){
AppLoginUser appLoginUser = new AppLoginUser();
Optional<AppUser> optionalAppUser = this.getUserByCondition(
- AppUserDTO.builder().cellPhone(body.getCellPhone()).build());
+ AppUserDTO.builder().device(body.getDevice()).cellPhone(body.getCellPhone()).build());
AppUser appUser = new AppUser();
SysUser sysUser = new SysUser();
if (optionalAppUser.isPresent()) {
@@ -385,6 +485,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());
}
@@ -423,6 +524,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());
}
@@ -441,6 +544,9 @@
* @param appUserId 用户id
*/
private void initUserTree(Long appUserId) {
+ if (appUserTreeService.lambdaQuery().eq(AppUserTree::getSowAgain,2).eq(AppUserTree::getAppUserId,appUserId).one()!=null){
+ return;
+ }
AppUserTree appUserTree = new AppUserTree();
appUserTree.setAppUserId(appUserId);
appUserTree.setTreeLevelType(TreeLevelEnum.SEED.getCode());
@@ -501,12 +607,14 @@
}
} else {
Optional<AppUser> userOptional = getAppUserByThirdId(loginType, wxOrAppleId);
- if (loginType.equals(1)) {
- // 微信登录
- handleUserNotPresent(userOptional, "该用户不存在，请重新进行微信授权登录");
- } else {
- // 苹果登录
- handleUserNotPresent(userOptional, "该用户不存在，请重新进行苹果授权登录");
+ if (!userOptional.isPresent()) {
+ if (loginType.equals(1)) {
+ // 微信登录
+ handleUserNotPresent(userOptional, "该用户不存在，请重新进行微信授权登录");
+ } else {
+ // 苹果登录
+ handleUserNotPresent(userOptional, "该用户不存在，请重新进行苹果授权登录");
+ }
}
appUser = userOptional.get();
appUser.setCellPhone(body.getCellPhone());
@@ -527,6 +635,7 @@
// 更新用户信息
this.updateById(appUser);
AppLoginUser appLoginUser = new AppLoginUser();
+ appLoginUser.setAppUserId(appUser.getId());
appLoginUser.setBindStatus(1);
appLoginUser.setCellPhone(body.getCellPhone());
appLoginUser.setSysUser(sysUser);
@@ -564,41 +673,45 @@
if (tokenService.getLoginUser()==null){
// 获取当前登录用户
if (org.springframework.util.StringUtils.hasLength(dto.getDevice())){
- SysUser sysUser = new SysUser();
- AppUser appUser = new AppUser();
- // 注册用户信息
- sysUser = new SysUser();
- String nickname = "用户" + IdUtil.fastSimpleUUID().substring(0, 6);
- sysUser.setNickName(nickname);
- sysUser.setAvatar("https://xqgwzh.obs.cn-south-1.myhuaweicloud.com/Logo%E7%A1%AE%E8%AE%A4%E7%89%88%281%29.jpg");
- sysUser.setUserName(dto.getDevice());
- sysUser.setUserType("01"); // app用户
- // 设置默认密码123456
- sysUser.setPassword(SecurityUtils.encryptPassword(Constants.DEFAULT_PASSWORD));
+ AppUser one = this.lambdaQuery().eq(AppUser::getDevice, dto.getDevice())
+ .isNull(AppUser::getCellPhone).one();
+ if (one==null){
+ SysUser sysUser = new SysUser();
+ AppUser appUser = new AppUser();
+ // 注册用户信息
+ sysUser = new SysUser();
+ String nickname = "用户" + IdUtil.fastSimpleUUID().substring(0, 6);
+ sysUser.setNickName(nickname);
+ sysUser.setAvatar("https://xqgwzh.obs.cn-south-1.myhuaweicloud.com/Logo%E7%A1%AE%E8%AE%A4%E7%89%88%281%29.jpg");
+ sysUser.setUserName(nickname);
+ sysUser.setUserType("01"); // app用户
+ // 设置默认密码123456
+ sysUser.setPassword(SecurityUtils.encryptPassword(Constants.DEFAULT_PASSWORD));
- R<SysUser> registerResult = remoteUserService.registerAppUserInfo(sysUser,
- SecurityConstants.INNER);
- if (registerResult.getCode() == Constants.FAIL) {
- throw new ServiceException(registerResult.getMsg());
- }
- SysUser sysUserRes = registerResult.getData();
- appUser = new AppUser();
- appUser.setUserId(sysUserRes.getUserId());
- appUser.setNickname(nickname);
- appUser.setAvatar("https://xqgwzh.obs.cn-south-1.myhuaweicloud.com/Logo%E7%A1%AE%E8%AE%A4%E7%89%88%281%29.jpg"); // TODO 待完善默认头像
- appUser.setBalance(BigDecimal.ZERO);
- appUser.setSanskritFlag(DisabledEnum.NO.getCode());
- appUser.setBalance(BigDecimal.ZERO);
- appUser.setIncome(BigDecimal.ZERO);
- appUser.setTotalEnergyValue(0);
- appUser.setRegisterTime(LocalDateTime.now());
- appUser.setLevelSettingId(TreeLevelEnum.SEED.getCode());
- SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddHHmmss");
- String format = simpleDateFormat.format(new Date());
- // 生成四位随机数字
- String randomCode = String.valueOf((int) ((Math.random() * 9 + 1) * 1000));
- appUser.setCode("YH"+format+randomCode);
- this.save(appUser);
+ R<SysUser> registerResult = remoteUserService.registerAppUserInfo(sysUser,
+ SecurityConstants.INNER);
+ if (registerResult.getCode() == Constants.FAIL) {
+ throw new ServiceException(registerResult.getMsg());
+ }
+ SysUser sysUserRes = registerResult.getData();
+ appUser = new AppUser();
+ appUser.setUserId(sysUserRes.getUserId());
+ appUser.setNickname(nickname);
+ appUser.setAvatar("https://xqgwzh.obs.cn-south-1.myhuaweicloud.com/Logo%E7%A1%AE%E8%AE%A4%E7%89%88%281%29.jpg"); // TODO 待完善默认头像
+ appUser.setBalance(BigDecimal.ZERO);
+ appUser.setSanskritFlag(DisabledEnum.NO.getCode());
+ appUser.setBalance(BigDecimal.ZERO);
+ appUser.setIncome(BigDecimal.ZERO);
+ appUser.setTotalEnergyValue(0);
+ appUser.setRegisterTime(LocalDateTime.now());
+ appUser.setLevelSettingId(TreeLevelEnum.SEED.getCode());
+ appUser.setDevice(dto.getDevice());
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddHHmmss");
+ String format = simpleDateFormat.format(new Date());
+ // 生成四位随机数字
+ String randomCode = String.valueOf((int) ((Math.random() * 9 + 1) * 1000));
+ appUser.setCode("YH"+format+randomCode);
+ this.save(appUser);
Long userId = appUser.getId();
List<AppUserQuestion> appUserQuestionList = BeanUtils.copyList(
dto.getUserAnswerOneDTOList(), AppUserQuestion.class);
@@ -628,6 +741,26 @@
|| appUserQuestion.getAnswer().equals("3")).collect(Collectors.toList());
appUser.setTagId(dto.getTagIds());
this.updateById(appUser);
+ }else{
+ List<AppUserQuestion> appUserQuestionList = BeanUtils.copyList(
+ dto.getUserAnswerOneDTOList(), AppUserQuestion.class);
+ // 查询用户已填写的答案
+ // 删除之前答案
+ appUserQuestionService.lambdaUpdate().eq(AppUserQuestion::getAppUserId,one.getId()).remove();
+
+ // 根据类型更新答案
+ for (AppUserQuestion appUserQuestion : appUserQuestionList) {
+ appUserQuestion.setAppUserId(one.getId());
+ }
+ appUserQuestionService.saveBatch(appUserQuestionList);
+ // 筛选答案为是和偶尔有的问题，为用户设置对应的标签
+ List<AppUserQuestion> appUserQuestionYesList = appUserQuestionList.stream()
+ .filter(appUserQuestion -> appUserQuestion.getAnswer().equals("1")
+ || appUserQuestion.getAnswer().equals("3")).collect(Collectors.toList());
+ one.setTagId(dto.getTagIds());
+ this.updateById(one);
+ }
+
}
}else{
Long userId = tokenService.getLoginUser().getUserid();
@@ -635,25 +768,14 @@
List<AppUserQuestion> appUserQuestionList = BeanUtils.copyList(
dto.getUserAnswerOneDTOList(), AppUserQuestion.class);
// 查询用户已填写的答案
- List<AppUserQuestion> baseAppUserQuestionList = appUserQuestionService.lambdaQuery()
- .eq(AppUserQuestion::getAppUserId, appUser.getUserId())
- .list();
- if (CollUtils.isNotEmpty(baseAppUserQuestionList)) {
- // 根据类型更新答案
- for (AppUserQuestion appUserQuestion : appUserQuestionList) {
+ // 删除之前答案
+ appUserQuestionService.lambdaUpdate().eq(AppUserQuestion::getAppUserId,userId).remove();
- Optional<AppUserQuestion> baseAppUserQuestionOptional = baseAppUserQuestionList.stream()
- .filter(baseAppUserQuestion -> baseAppUserQuestion.getType()
- .equals(appUserQuestion.getType())).findFirst();
- baseAppUserQuestionOptional.ifPresent(
- userQuestion -> appUserQuestion.setId(userQuestion.getId()));
- appUserQuestion.setAppUserId(userId);
- }
- }
+ // 根据类型更新答案
for (AppUserQuestion appUserQuestion : appUserQuestionList) {
- appUserQuestion.setAppUserId(userId);
+ appUserQuestion.setAppUserId(userId);
}
- appUserQuestionService.saveOrUpdateBatch(appUserQuestionList);
+ appUserQuestionService.saveBatch(appUserQuestionList);
// 筛选答案为是和偶尔有的问题，为用户设置对应的标签
List<AppUserQuestion> appUserQuestionYesList = appUserQuestionList.stream()
.filter(appUserQuestion -> appUserQuestion.getAnswer().equals("1")
@@ -661,8 +783,6 @@
appUser.setTagId(dto.getTagIds());
this.updateById(appUser);
}
-
-
}
/**
@@ -719,4 +839,15 @@
AppUser appUser = this.getById(userId);
return BeanUtils.copyBean(appUser, AppUserVO.class);
}
+
+ @Override
+ public List<InviteRankListVO> inviteRankList(Integer pageCurr,Integer pageSize) {
+ List<InviteRankListVO> list = this.baseMapper.inviteRankList(pageCurr,pageSize);
+ return list;
+ }
+ @Override
+ public List<InviteRankListVO> inviteRankListNolimit() {
+ List<InviteRankListVO> list = this.baseMapper.inviteRankListNolimit();
+ return list;
+ }
}
--
Gitblit v1.7.1