From 9baa55cf4292ad0fe80547f9c840e917775411f4 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期日, 05 十一月 2023 09:45:48 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-account/src/main/java/com/dsh/account/controller/AppUserController.java | 45 +++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 43 insertions(+), 2 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/controller/AppUserController.java b/cloud-server-account/src/main/java/com/dsh/account/controller/AppUserController.java
index c0bbfe8..c7c5ef7 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/controller/AppUserController.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/controller/AppUserController.java
@@ -3,7 +3,9 @@
import com.alibaba.nacos.common.utils.Md5Utils;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.dsh.account.dto.BindDto;
import com.dsh.account.dto.SelectDto;
+import com.dsh.account.dto.UpdateInfoDto;
import com.dsh.account.entity.Coach;
import com.dsh.account.entity.TAppUser;
import com.dsh.account.entity.TCourseInfoRecord;
@@ -28,6 +30,7 @@
import java.io.PrintWriter;
import java.util.*;
import java.util.List;
+import java.util.stream.Collectors;
/**
* @author zhibing.pu
@@ -114,8 +117,12 @@
@ResponseBody
@RequestMapping("/base/appUser/listAll")
public List<QueryAppUserVO> listAll(@RequestBody QueryAppUser query){
-
- return appUserService.listAll(query);
+ List<QueryAppUserVO> queryAppUserVOS = appUserService.listAll(query);
+ if (query.getUserIds()!=null && query.getUserIds().size()!=0){
+ List<QueryAppUserVO> queryAppUserVOS1 = appUserService.listAll1(query);
+ queryAppUserVOS.addAll(queryAppUserVOS1);
+ }
+ return queryAppUserVOS.stream().distinct().collect(Collectors.toList());
}
/**
@@ -204,6 +211,19 @@
return ResultUtil.runErr();
}
}
+ @ResponseBody
+ @PostMapping("/base/appUser/bind")
+ @ApiOperation(value = "微信登录绑定手机号", tags = {"APP-登录注册"})
+ @ApiImplicitParams({
+ })
+ public ResultUtil bind(BindDto dto){
+ try {
+ return appUserService.bind(dto);
+ }catch (Exception e){
+ e.printStackTrace();
+ return ResultUtil.runErr();
+ }
+ }
@ResponseBody
@@ -222,6 +242,27 @@
+ @ResponseBody
+ @PostMapping("/api/appUser/updateInfo")
+ @ApiOperation(value = "修改个人信息", tags = {"APP-登录注册"})
+ @ApiImplicitParams({
+ })
+ public ResultUtil<String> updateInfo(UpdateInfoDto dto){
+ try {
+ Integer uid = tokenUtil.getUserIdFormRedis();
+ if(null == uid){
+ return ResultUtil.tokenErr();
+ }
+ return appUserService.updateInfo(dto,uid);
+ }catch (Exception e){
+ e.printStackTrace();
+ return ResultUtil.runErr();
+ }
+ }
+
+
+
+
@ResponseBody
--
Gitblit v1.7.1