Merge remote-tracking branch 'origin/master'

liujie

2023-09-20 d09828cdec78a160f4530a8ab245216ed8671c27

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

@@ -1,10 +1,14 @@
package com.dsh.account.controller;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.dsh.account.dto.SelectDto;
import com.dsh.account.entity.TAppUser;
import com.dsh.account.entity.TCourseInfoRecord;
import com.dsh.account.model.*;
import com.dsh.account.service.IVipPaymentService;
import com.dsh.account.service.TAppUserService;
import com.dsh.account.service.TCourseInfoRecordService;
import com.dsh.account.util.PayMoneyUtil;
import com.dsh.account.util.ResultUtil;
import com.dsh.account.util.TokenUtil;
@@ -19,6 +23,7 @@
import javax.servlet.http.HttpServletResponse;
import java.io.PrintWriter;
import java.util.ArrayList;
import java.util.List;
import java.util.List;
import java.util.Map;

@@ -41,6 +46,9 @@

    @Autowired
    private TokenUtil tokenUtil;

    @Autowired
    private TCourseInfoRecordService courseInfoRecordService;



@@ -351,7 +359,7 @@


    @PostMapping("/base/appUser/queryByNamePhone")
    List<TAppUser> queryByNamePhone(@RequestBody QueryByNamePhone queryByNamePhone){
    public List<TAppUser> queryByNamePhone(@RequestBody QueryByNamePhone queryByNamePhone){
        try {
            LambdaQueryWrapper<TAppUser> tAppUserLambdaQueryWrapper = new LambdaQueryWrapper<>();
            if(ToolUtil.isNotEmpty(queryByNamePhone.getName())){
@@ -367,4 +375,41 @@
            return new ArrayList<>();
        }
    }

    @PostMapping("/base/appUser/queryById")
    public TAppUser queryById(@RequestBody Integer appUserId){
        try {
            return appUserService.getById(appUserId);
        }catch (Exception e){
            e.printStackTrace();
            return new TAppUser();
        }
    }


    /**
     * 根据名称模糊搜索用户
     * @param name
     * @return
     */
    @ResponseBody
    @PostMapping("/appUser/queryAppUserListByName")
    public List<TAppUser> queryAppUserListByName(@RequestBody String name){
        return appUserService.list(new QueryWrapper<TAppUser>().eq("state", 1).like("name", name));
    }



    @PostMapping("/appUser/addCourseInfoRecord")
    public Boolean addCourseInfoRecord(@RequestBody TCourseInfoRecord tCourseInfoRecord){
        boolean save = courseInfoRecordService.save(tCourseInfoRecord);
        return save;
    }

    @PostMapping("/appUser/getSelects")
    public List<SelectDto> getSelects(@RequestBody List<Integer> studentIds){
        List<SelectDto> selectDtos =    appUserService.getSelects(studentIds);
        System.out.println("=======selectDtos======>"+selectDtos);
        return selectDtos;
    }
}