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

44323

2023-11-27 aa925d851857f50eff0556411366690d9a78a0e5

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

@@ -54,6 +54,7 @@

    /**
     * 添加学员
     *
     * @return
     */
    @RequestMapping("/base/student/addStudent")
@@ -62,8 +63,10 @@
        student.setIsDefault(1);
       return studentService.save(student);
    }

    /**
     * 获取有学员的用户ids
     *
     * @return
     */
    @ResponseBody
@@ -71,8 +74,10 @@
    public List<Integer> getHasStudentUser(){
       return studentService.list(new QueryWrapper<TStudent>()).stream().map(TStudent::getAppUserId).distinct().collect(Collectors.toList());
    }

    /**
     * 获取用户学员列表
     *
     * @param appUserId
     * @return
     */
@@ -117,8 +122,6 @@
            studentService.updateById(student);

    }




    @ResponseBody
@@ -167,6 +170,7 @@

    /**
     * 根据电话号码学员信息
     *
     * @param phone
     * @return
     */
@@ -201,6 +205,7 @@

    /**
     * 根据id获取数据
     *
     * @param id
     * @return
     */
@@ -212,10 +217,9 @@
    }




    /**
     * 根据名称模糊搜索学员
     *
     * @param name
     * @return
     */
@@ -224,8 +228,10 @@
    public List<TStudent> queryStudentListByName(@RequestBody String name){
        return studentService.list(new QueryWrapper<TStudent>().eq("state", 1).like("name", name));
    }

    /**
     * 根据名称模糊搜索学员
     *
     * @param name
     * @return
     */
@@ -277,6 +283,7 @@

    @Resource
    private CoursePaymentClient paymentClient;

    @ResponseBody
    @PostMapping("/student/giftSelect")
    public  List<SelectDto> giftSelect(@RequestBody GiftSearchDto giftSearchDto){
@@ -312,32 +319,34 @@
        List<TAppUser> list = appUserService.list(new LambdaQueryWrapper<TAppUser>().eq(TAppUser::getInsertType, 1));
        return list.stream().map(TAppUser::getId).collect(Collectors.toList());
    }

    @PostMapping("/student/getUserYYs")
    @ResponseBody
   public  List<Integer> getUserYYs(@RequestBody Integer id){
        List<TAppUser> list = appUserService.list(new LambdaQueryWrapper<TAppUser>().eq(TAppUser::getInsertType, 2).eq(TAppUser::getAddUserId,id));
        return list.stream().map(TAppUser::getId).collect(Collectors.toList());
    }

    @PostMapping("/student/getUserStore")
    @ResponseBody
    public  List<Integer> getUserStore(@RequestBody Integer id){
        List<TAppUser> list = appUserService.list(new LambdaQueryWrapper<TAppUser>().eq(TAppUser::getInsertType, 3).eq(TAppUser::getAddUserId,id));
        return list.stream().map(TAppUser::getId).collect(Collectors.toList());
    }

    @PostMapping("/student/getUserYys")
    @ResponseBody
    public  List<Integer> getUserYys(@RequestBody Integer id){
        List<TAppUser> list = appUserService.list(new LambdaQueryWrapper<TAppUser>().eq(TAppUser::getInsertType, 2).eq(TAppUser::getAddUserId,id));
        return list.stream().map(TAppUser::getId).collect(Collectors.toList());
    }

    @ResponseBody
    @PostMapping("/student/getUserPtVip")
    public List<Integer> getUserPtVip(){
        List<TAppUser> list = appUserService.list(new LambdaQueryWrapper<TAppUser>().eq(TAppUser::getInsertType, 1).eq(TAppUser::getIsVip,1));
        return list.stream().map(TAppUser::getId).collect(Collectors.toList());
    }




    @ResponseBody
@@ -448,6 +457,7 @@
        return map;

    }

    @ResponseBody
    @PostMapping("/student/stuPt")
    public HashMap<String, Object>  stuPt(){
@@ -541,6 +551,7 @@


    }

    @ResponseBody
    @PostMapping("/student/stuYys")
    public HashMap<String, Object>  stuYys(@RequestBody Integer id){
@@ -738,10 +749,9 @@
    }




    @Autowired
    private EvaluateStudentService evaluateStudentService;

    @ResponseBody
    @PostMapping("/student/save")
    public void   save(@RequestBody EvaluateStudent evaluateStudent) {
@@ -749,7 +759,6 @@
        evaluateStudentService.saveOrUpdate(evaluateStudent);

    }



    @ResponseBody
@@ -859,6 +868,7 @@
        return map;

    }

    @ResponseBody
    @PostMapping("/student/userAndVipStore")
    public HashMap<String, Object>  userAndVipStore(@RequestBody Integer id){
@@ -969,10 +979,6 @@
    }






    @PostMapping("/student/queryFee")
    public HashMap<String, Object> queryFee(@RequestBody QueryDataFee queryDataFee){
        HashMap<String, Object> map = new HashMap<>();
@@ -1008,13 +1014,10 @@
        map.put("fee2",sum1);




        return map;


    }



    @PostMapping("/student/queryUserAge")
@@ -1059,8 +1062,8 @@
        return map;



    }

    @PostMapping("/student/queryUserAge1")
    public HashMap<String, Object> queryUserAge1(){
        HashMap<String, Object> map = new HashMap<>();
@@ -1133,8 +1136,8 @@
        return map;



    }

    @PostMapping("/student/queryUserAgeYys")
    public HashMap<String, Object> queryUserAgeYys(@RequestBody Integer id){
        HashMap<String, Object> map = new HashMap<>();
@@ -1207,6 +1210,7 @@
        return map;

    }

    @PostMapping("/student/queryUserAgeStore")
    public HashMap<String, Object> queryUserAgeStore(Integer id){
        HashMap<String, Object> map = new HashMap<>();
@@ -1279,6 +1283,7 @@
        return map;

    }

    @PostMapping("/student/queryUserAgeYys1")
    public HashMap<String, Object> queryUserAgeYys1(@RequestBody Integer id){
        HashMap<String, Object> map = new HashMap<>();
@@ -1322,6 +1327,7 @@


    }

    @PostMapping("/student/queryUserAgeStore1")
    public HashMap<String, Object> queryUserAgeStore1(@RequestBody Integer id){
        HashMap<String, Object> map = new HashMap<>();