From 3818974122e7b80e0fe04fd5709a853bac831caa Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 12 十一月 2024 20:18:01 +0800
Subject: [PATCH] 代码提交
---
xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/controller/client/ClientAppUserController.java | 97 ++++++++++++++++++++++--------------------------
1 files changed, 45 insertions(+), 52 deletions(-)
diff --git a/xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/controller/client/ClientAppUserController.java b/xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/controller/client/ClientAppUserController.java
index 611c8fe..fc05cb5 100644
--- a/xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/controller/client/ClientAppUserController.java
+++ b/xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/controller/client/ClientAppUserController.java
@@ -62,6 +62,7 @@
import java.time.temporal.TemporalAdjusters;
import java.util.*;
import java.util.stream.Collectors;
+import java.util.stream.Stream;
import io.swagger.models.auth.In;
import lombok.RequiredArgsConstructor;
@@ -429,7 +430,9 @@
byId.setFreezingTime(LocalDateTime.now());
byId.setFreezingReason(dto.getFreezingReason());
byId.setUserStatus(2);
- byId.setFreezingOperator(tokenService.getLoginUser().getUserid()+"");
+ Long userid = tokenService.getLoginUser().getUserid();
+ SysUser data = remoteUserService.getSysUserById(userid + "").getData();
+ byId.setFreezingOperator(data.getNickName()+"("+data.getUserName()+")");
appUserService.updateById(byId);
return R.ok();
}
@@ -608,8 +611,8 @@
String endTime = null;
if (org.springframework.util.StringUtils.hasLength(dto.getTime())){
String[] split = dto.getTime().split(" - ");
- startTime = split[0]+"00:00:00";
- endTime = split[1]+"23:59:59";
+ startTime = split[0]+" 00:00:00";
+ endTime = split[1]+" 23:59:59";
}
String userId = dto.getUid();
LambdaQueryWrapper<AppUser> appUserWalletRecordLambdaQueryWrapper = new LambdaQueryWrapper<>();
@@ -675,15 +678,15 @@
String endTime = null;
if (org.springframework.util.StringUtils.hasLength(courseDTO.getVipExpireTime())){
String[] split = courseDTO.getVipExpireTime().split(" - ");
- startTime = split[0]+"00:00:00";
- endTime = split[1]+"23:59:59";
+ startTime = split[0]+" 00:00:00";
+ endTime = split[1]+" 23:59:59";
}
String startTime1 = null;
String endTime1 = null;
if (org.springframework.util.StringUtils.hasLength(courseDTO.getRegisterTime())){
String[] split = courseDTO.getRegisterTime().split(" - ");
- startTime1 = split[0]+"00:00:00";
- endTime1 = split[1]+"23:59:59";
+ startTime1 = split[0]+" 00:00:00";
+ endTime1 = split[1]+" 23:59:59";
}
List<Long> longs = new ArrayList<>();
LambdaQueryWrapper<AppUser> courseLambdaQueryWrapper = new LambdaQueryWrapper<>();
@@ -718,23 +721,11 @@
List<AppUser> list = appUserService.lambdaQuery().list();
List<AppUser> appUsers = new ArrayList<>();
for (AppUser appUser : list) {
- List<AppUserTree> list1 = appUserTreeService.lambdaQuery().eq(AppUserTree::getAppUserId, appUser.getId())
- .list();
- // 查询用户等级最高的那颗树苗
- AppUserTree tree = list1.stream().max((o1, o2) -> {
- if (o1.getTreeLevelType() > o2.getTreeLevelType()) {
- return 1;
- } else if (o1.getTreeLevelType() < o2.getTreeLevelType()) {
- return -1;
- } else {
- return 0;
- }
- }).orElse(null);
+ AppUserTree list1 = appUserTreeService.lambdaQuery().eq(AppUserTree::getAppUserId, appUser.getId())
+ .eq(AppUserTree::getSowAgain,2)
+ .one();
// 查询疗愈等级 名称 图标
- int level = 1;
- if (tree != null){
- level = tree.getTreeLevelType();
- }
+ int level = list1.getTreeLevelType();
if (list2.contains(level+"")){
appUsers.add(appUser);
}
@@ -745,6 +736,7 @@
}
courseLambdaQueryWrapper.in(AppUser::getId, collect);
}
+ courseLambdaQueryWrapper.isNotNull(AppUser::getCellPhone);
List<AppUser> page = appUserService.list(courseLambdaQueryWrapper);
List<UserExport> userExports = new ArrayList<>();
for (AppUser record : page) {
@@ -757,23 +749,11 @@
}else{
record.setIsVip(1);
}
- List<AppUserTree> list1 = appUserTreeService.lambdaQuery().eq(AppUserTree::getAppUserId, record.getId())
- .list();
- // 查询用户等级最高的那颗树苗
- AppUserTree tree = list1.stream().max((o1, o2) -> {
- if (o1.getTreeLevelType() > o2.getTreeLevelType()) {
- return 1;
- } else if (o1.getTreeLevelType() < o2.getTreeLevelType()) {
- return -1;
- } else {
- return 0;
- }
- }).orElse(null);
+ AppUserTree list1 = appUserTreeService.lambdaQuery().eq(AppUserTree::getAppUserId, record.getId())
+ .eq(AppUserTree::getSowAgain,2)
+ .one();
// 查询疗愈等级 名称 图标
- int level = 1;
- if (tree != null){
- level = tree.getTreeLevelType();
- }
+ int level = list1.getTreeLevelType();
// 根据等级查询疗愈名称和图标
UserLevelSetting data = remoteBannerService.getIconNameByLevel(level).getData();
record.setLevel(level);
@@ -813,6 +793,13 @@
userExport.setUserStatus(record.getUserStatus()+"");
List<AppUserQuestion> list = appUserQuestionService.lambdaQuery()
.eq(AppUserQuestion::getAppUserId, record.getId()).list();
+ userExport.setType1("");
+ userExport.setType2("");
+ userExport.setType3("");
+ userExport.setType4("");
+ userExport.setType5("");
+ userExport.setType6("");
+ userExport.setType6("");
for (AppUserQuestion appUserQuestion : list) {
switch (appUserQuestion.getType()){
case 1:
@@ -835,17 +822,15 @@
break;
}
}
- List<Integer> collect = appUserTagService.lambdaQuery()
- .eq(AppUserTag::getAppUserId, record.getId()).list().stream()
- .map(AppUserTag::getTagId)
- .collect(Collectors.toList());
- if (collect.isEmpty()){
- collect.add(-1);
+ List<String> collect = new ArrayList<>();
+ if (org.springframework.util.StringUtils.hasLength(record.getTagId())) {
+ collect = tagService.lambdaQuery()
+ .in(Tag::getId, Arrays.stream(record.getTagId().split(",")).map(Long::parseLong).collect(Collectors.toList())).list().stream()
+ .map(Tag::getTagName).collect(Collectors.toList());
}
- List<Tag> list2 = tagService.lambdaQuery().in(Tag::getId, collect).list();
StringBuilder stringBuilder = new StringBuilder();
- for (Tag tag : list2) {
- stringBuilder.append(tag.getTagName()).append(";");
+ for (String tag : collect) {
+ stringBuilder.append(tag).append(";");
}
userExport.setType7(stringBuilder+"");
userExport.setSanskritFlag(record.getSanskritFlag()+"");
@@ -884,15 +869,15 @@
String endTime = null;
if (org.springframework.util.StringUtils.hasLength(courseDTO.getVipExpireTime())){
String[] split = courseDTO.getVipExpireTime().split(" - ");
- startTime = split[0]+"00:00:00";
- endTime = split[1]+"23:59:59";
+ startTime = split[0]+" 00:00:00";
+ endTime = split[1]+" 23:59:59";
}
String startTime1 = null;
String endTime1 = null;
if (org.springframework.util.StringUtils.hasLength(courseDTO.getRegisterTime())){
String[] split = courseDTO.getRegisterTime().split(" - ");
- startTime1 = split[0]+"00:00:00";
- endTime1 = split[1]+"23:59:59";
+ startTime1 = split[0]+" 00:00:00";
+ endTime1 = split[1]+" 23:59:59";
}
List<Long> longs = new ArrayList<>();
LambdaQueryWrapper<AppUser> courseLambdaQueryWrapper = new LambdaQueryWrapper<>();
@@ -1579,9 +1564,17 @@
@PostMapping("/getUserByPhone")
@ApiOperation(value = "根据用户手机号查询用户信息")
public R<AppUserDetailVO> getCurrentUser(String phone) {
+ LoginUser loginUser = tokenService.getLoginUser();
+ if (loginUser==null){
+ return R.tokenError("登录失效");
+ }
+
AppUser one = appUserService.lambdaQuery().eq(AppUser::getCellPhone, phone)
.ne(AppUser::getUserStatus,3).one();
if (one!=null){
+ if (one.getId().equals(loginUser.getUserid())){
+ return R.fail("不可赠送给自己");
+ }
AppUserDetailVO appUserDetailVO = new AppUserDetailVO();
appUserDetailVO.setId(one.getId());
appUserDetailVO.setCellPhone(one.getCellPhone());
--
Gitblit v1.7.1