修改bug

puzhibing

2023-12-11 daecfaafcad59e676622d1dc224880039d4a0df3

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

@@ -53,13 +53,13 @@
     */
    @ResponseBody
    @PostMapping("/cancelledClasses/listAll")
    public List<CancelClassesVO> listAll(@RequestBody CancelClassesQuery query){
    public List<CancelClassesVO> listAll(@RequestBody CancelClassesQuery query) {
        List<CancelClassesVO> res = new ArrayList<>();
        if (query.getStudentName()!=null){
            if (!query.getStudentName().equals("")){
        if (query.getStudentName() != null) {
            if (!query.getStudentName().equals("")) {
                List<Integer> s = new ArrayList<>();
                List<Student> students = studentClient.queryStudentListByName(query.getStudentName());
                if (students.size()==0){
                if (students.size() == 0) {
                    return new ArrayList<>();
                }
                for (Student coach : students) {
@@ -68,11 +68,11 @@
                query.setStudentIds(s);
            }
        }
        if (query.getCoachName()!=null){
            if (!query.getCoachName().equals("")){
        if (query.getCoachName() != null) {
            if (!query.getCoachName().equals("")) {
                List<Integer> c = new ArrayList<>();
                List<Coach> coaches = coachClient.queryCoachListByName(query.getCoachName());
                if (coaches.size()==0){
                if (coaches.size() == 0) {
                    return new ArrayList<>();
                }
                for (Coach coach : coaches) {
@@ -81,27 +81,27 @@
                query.setCoachIds(c);
            }
        }
        List<Integer> collect =new ArrayList<>();
        if(query.getStoreId()!=null){
        List<Integer> collect = new ArrayList<>();
        if (query.getStoreId() != null) {
            List<TCoursePackage> list = coursePackageService.list(new LambdaQueryWrapper<TCoursePackage>().eq(TCoursePackage::getStoreId, query.getStoreId()));
             collect = list.stream().map(TCoursePackage::getId).collect(Collectors.toList());
            if(collect.size()==0){
            collect = list.stream().map(TCoursePackage::getId).collect(Collectors.toList());
            if (collect.size() == 0) {
                collect.add(-1);
            }
        }
        if(query.getStoreIds()!=null && query.getStoreIds().size()!=0){
        if (query.getStoreIds() != null && query.getStoreIds().size() != 0) {
            List<TCoursePackage> list = coursePackageService
                    .list(new LambdaQueryWrapper<TCoursePackage>()
                            .in(TCoursePackage::getStoreId, query.getStoreIds()));
            collect = list.stream().map(TCoursePackage::getId).collect(Collectors.toList());
            if(collect.size()==0){
            if (collect.size() == 0) {
                collect.add(-1);
            }
        }
        List<CancelClassesVO> result = cancelledClassesService.listAll(query,collect);
        List<CancelClassesVO> result = cancelledClassesService.listAll(query, collect);
        for (CancelClassesVO cancelClassesVO : result) {
            CoursePackageScheduling byId1 = coursePackageSchedulingService.getById(cancelClassesVO.getCoursePackageSchedulingId());
            if (byId1==null){
            if (byId1 == null) {
                continue;
            }
            SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -111,11 +111,13 @@
            String minute = string1.substring(14, 16);
            // 去除后三位
            String s = string.substring(0, string.length() - 3);
            String temp = s+"-"+hour+":"+ minute;
            String temp = s + "-" + hour + ":" + minute;
            cancelClassesVO.setStartAndEnd(temp);
            TCoursePackagePayment byId = coursePackagePaymentService.getById(cancelClassesVO.getCoursePackagePaymentId());
            cancelClassesVO.setStoreName(storeClient.queryStoreById(cancelClassesVO.getStoreId()).getName());
            cancelClassesVO.setStudentName(studentClient.queryStudentById(byId.getStudentId()).getName());
            if(null != byId){
                cancelClassesVO.setStudentName(studentClient.queryStudentById(byId.getStudentId()).getName());
            }
            cancelClassesVO.setCoachName(coachClient.queryCoachById(cancelClassesVO.getCoachId()).getName());

        }
@@ -125,18 +127,24 @@

    @Autowired
    private CourseCounsumService courseCounsumService;


    @Autowired
    private ICoursePackageOrderStudentService orderStudentService;
    /**
     * 添加数据
     *
     * @param cancelledClasses
     */
    @ResponseBody
    @PostMapping("/cancelledClasses/addCancelledClasses")
    public void addCancelledClasses(@RequestBody CancelledClasses cancelledClasses){
    public void addCancelledClasses(@RequestBody CancelledClasses cancelledClasses) {
        cancelledClassesService.save(cancelledClasses);

        TCoursePackagePayment byId = coursePackagePaymentService.getById(cancelledClasses.getCoursePackagePaymentId());
//        TCoursePackagePayment byId = coursePackagePaymentService.getById(cancelledClasses.getCoursePackagePaymentId());
        orderStudentService.getById(cancelledClasses.getCoursePackagePaymentId());
        CourseCounsum courseCounsum = new CourseCounsum();
        courseCounsum.setPaymentId(byId.getId());
        courseCounsum.setPaymentId(cancelledClasses.getCoursePackagePaymentId());
        courseCounsum.setChangeType(0);
        courseCounsum.setNum(cancelledClasses.getCancelledClassesNumber());
        courseCounsum.setInsertTime(new Date());