Merge remote-tracking branch 'origin/master'

puzhibing

2023-12-14 d20dbd5d97b3f418533d5d23fd337cdec9f95939

 cloud-server-course/src/main/java/com/dsh/course/controller/CourseStudentController.java

@@ -67,10 +67,7 @@
    @RequestMapping("/getStudentTotal")
    @ResponseBody
    public List<Map<String, Object>> get(@RequestBody StudentQeryDto studentQeryDto) {
        System.out.println("-====studentQeryDto=========" + studentQeryDto);
        List<Map<String, Object>> pays = paymentService.getStudentTotal(studentQeryDto);
        System.out.println("=========pays======" + pays);

        return pays;

    }
@@ -79,18 +76,7 @@
    @RequestMapping("/bypac")
    @ResponseBody
    public List<Map<String, Object>> bypac(@RequestBody PacQueryDto pacQueryDto) {
        System.out.println("-====studentQeryDto=========" + pacQueryDto);
        if (pacQueryDto.getStoreIds() != null && pacQueryDto.getStoreIds().size() != 0) {
            // 根据门店id 查询课包ids
            List<Integer> coursePackageIds = coursePackageService.list(new QueryWrapper<TCoursePackage>()
                    .in("storeId", pacQueryDto.getStoreIds())).stream()
                    .map(TCoursePackage::getId).collect(Collectors.toList());
            pacQueryDto.setStoreIds(coursePackageIds);
        }
        List<Map<String, Object>> pays = paymentService.bypac(pacQueryDto);

        System.out.println("=========pays======" + pays);

        return pays;

    }