Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai

44323

2023-11-05 9baa55cf4292ad0fe80547f9c840e917775411f4

 cloud-server-account/src/main/java/com/dsh/account/controller/AppUserController.java

@@ -1,8 +1,11 @@
package com.dsh.account.controller;

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;
@@ -27,6 +30,7 @@
import java.io.PrintWriter;
import java.util.*;
import java.util.List;
import java.util.stream.Collectors;

/**
 * @author zhibing.pu
@@ -96,9 +100,13 @@
            if (null != phone){
                return 5001;
            }
        }else {
            TAppUser phone = appUserService.getOne(new QueryWrapper<TAppUser>().eq("phone", query.getPhone()));
            if (null != phone){
                return 5001;
            }
        }
        query.setIsVip(0);
        query.setPassword("111111");
        query.setInsertTime(new Date());
        return appUserService.saveOrUpdate(query);
    }
@@ -106,10 +114,15 @@
    /**
     * 获取用户信息列表数据
     */
    @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());
    }

    /**
@@ -198,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
@@ -213,6 +239,27 @@
            return ResultUtil.runErr();
        }
    }



    @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();
        }
    }




@@ -282,6 +329,7 @@
            @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
    })
    public ResultUtil<JoinPlayPaiVo> queryJoinPlayPai(String lon, String lat){
        
        try {
            Integer uid = tokenUtil.getUserIdFormRedis();
            if(null == uid){