Merge remote-tracking branch 'origin/master'

puzhibing

2023-08-04 624c9eec90d59297800f03276f8518daa1bd9f94

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

@@ -42,21 +42,25 @@
    @PostMapping("/base/cancelSource/cancelList")
    public List<PurchaseRecordVo> getCancelCourseList(@RequestBody GetStuSessionList sessionList){
        List<PurchaseRecordVo> purchaseRecordVos = new ArrayList<>();
        List<TCoursePackagePayment> tCoursePackagePayments = tcppService.list(new QueryWrapper<TCoursePackagePayment>()
                .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<TCoursePackagePayment> tCoursePackagePayments = tcppService.queryAllCoursePackage(sessionList.getStartTime(),sessionList.getEndTime(),null,sessionList.getStuId(), sessionList.getAppUserId());
        List<Long> coursePackageIds = tCoursePackagePayments.stream().map(TCoursePackagePayment::getId).collect(Collectors.toList());

        List<CancelledClasses> list = caceService.list(new QueryWrapper<CancelledClasses>()
                .in("coursePackageId", coursePackageIds)
                .between("insertTime",sessionList.getStartTime(),sessionList.getEndTime()));
        if (list.size() > 0){
            list.forEach( canse -> {
                PurchaseRecordVo purchaseRecordVo = new PurchaseRecordVo();
                purchaseRecordVo.setPurchaseTime(format.format(canse.getInsertTime()));
                purchaseRecordVo.setPurchaseType("");
                purchaseRecordVo.setPurchaseAmount("-"+canse.getCancelledClassesNumber());
                purchaseRecordVos.add(purchaseRecordVo);
            });
            List<CancelledClasses> list = caceService.list(new QueryWrapper<CancelledClasses>()
                    .in("coursePackageId", coursePackageIds)
                    .between("insertTime",sessionList.getStartTime(),sessionList.getEndTime()));
            if (list.size() > 0){
                list.forEach( canse -> {
                    PurchaseRecordVo purchaseRecordVo = new PurchaseRecordVo();
                    purchaseRecordVo.setPurchaseTime(format.format(canse.getInsertTime()));
                    purchaseRecordVo.setPurchaseType("");
                    purchaseRecordVo.setPurchaseAmount("-"+canse.getCancelledClassesNumber());
                    purchaseRecordVos.add(purchaseRecordVo);
                });
            }
        }
        return purchaseRecordVos;
    }