Merge remote-tracking branch 'origin/master'

puzhibing

2023-08-04 624c9eec90d59297800f03276f8518daa1bd9f94

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

@@ -46,6 +46,7 @@
                .between("insertTime", sessionList.getStartTime(),sessionList.getEndTime())
                .eq("appUserId",sessionList.getAppUserId())
                .eq("studentId",sessionList.getStuId()));
        if (tCoursePackagePayments.size() > 0){
        List<Long> coursePackageIds = tCoursePackagePayments.stream().map(TCoursePackagePayment::getId).collect(Collectors.toList());

        List<CancelledClasses> list = caceService.list(new QueryWrapper<CancelledClasses>()
@@ -60,6 +61,7 @@
                purchaseRecordVos.add(purchaseRecordVo);
            });
        }
        }
        return purchaseRecordVos;
    }