11.21

nickchange

2023-11-21 41b60f3df5f3054aad44307c13a26b14f3b32ac0

 cloud-server-account/src/main/java/com/dsh/account/service/impl/TStudentServiceImpl.java

@@ -677,9 +677,21 @@
        List<RecordAppoint> recordAppoints = couPayClient.obtainStudentClassDetailsData(courseRest);
        if (recordAppoints.size() > 0) {
            if (ToolUtil.isNotEmpty(appointStatus) && appointStatus != 0) {
                if (appointStatus ==2){
                    recordAppoints = recordAppoints.stream()
                            .filter(record -> record.getStatus().equals(3))
                            .collect(Collectors.toList());
                }else if (appointStatus ==3){
                    recordAppoints = recordAppoints.stream()
                            .filter(record -> record.getStatus().equals(4))
                            .collect(Collectors.toList());
                }
                else {

                    recordAppoints = recordAppoints.stream()
                            .filter(record -> record.getStatus().equals(appointStatus))
                            .collect(Collectors.toList());
                }
            }
            if (ToolUtil.isNotEmpty(search)) {
                    recordAppoints = recordAppoints.stream()
@@ -688,7 +700,8 @@
            }

            if (ToolUtil.isNotEmpty(timeType) && timeType != 0) {
                Date lastOfDate = DateUtil.getLastOfDate();
//                Date lastOfDate = DateUtil.getLastOfDate();
                Date lastOfDate = DateUtil.getDate();
                switch (timeType) {
                    case 1:
                        Date lastWeekStartDate = DateUtil.getLastWeekStartDate();
@@ -696,7 +709,8 @@
                                    .filter(record -> {
                                        try {
                                            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
                                            Date time = sdf.parse(record.getTimeFrame().substring(11));
                                            String substring = record.getTimeFrame().substring(11);
                                            Date time = sdf.parse(substring);
                                            return !time.before(lastWeekStartDate) && !time.after(lastOfDate);
                                        } catch (ParseException e) {
                                            return false;
@@ -809,6 +823,14 @@
        detailsVo.setVenueList(steClient.getAppUserSiteList(storeId));
        List<StoreOfCourseVo> storeOfCourseList = culisClient.getStoreOfCourseList(storeId);
        System.out.println(storeOfCourseList);
        for (StoreOfCourseVo storeOfCourseVo : storeOfCourseList) {
            if (storeOfCourseVo.getClassHours().equals("0")){
                storeOfCourseVo.setClassHours(null);
            }
            if (storeOfCourseVo.getClassStartTime().equals("-")){
                storeOfCourseVo.setClassStartTime(null);
            }
        }
        detailsVo.setCourseVoList(storeOfCourseList);
        return detailsVo;
    }