liujie
2023-08-08 fece6af66e0cfaf95896227a791810c79bafd2e8
cloud-server-account/src/main/java/com/dsh/account/service/impl/TStudentServiceImpl.java
@@ -33,6 +33,7 @@
import com.dsh.account.model.vo.exploreDetail.LonLatRequest;
import com.dsh.account.model.vo.exploreDetail.QuestionIns;
import com.dsh.account.model.vo.exploreDetail.StoreDetailsVo;
import com.dsh.account.model.vo.exploreDetail.StoreOfCourseVo;
import com.dsh.account.model.vo.sourceDetail.CouponStuAvailableVo;
import com.dsh.account.model.vo.sourceDetail.CourseDetailsOfContinuationResp;
import com.dsh.account.model.vo.sourceDetail.RecordTimeRequest;
@@ -599,43 +600,38 @@
        return ResultUtil.success();
    }
    /**
     *
     * @param stuId 学员id
     * @param appUserId 用户id
     * @param appointStatus  预约状态 0=全部 1=待上课 2=已完成 3=已取消
     * @param timeType 时间类型 0=全部 1=近一周 2=近一个月 3=近一年
     * @param search 课程名称
     * @return
     */
    @Override
    public AppointmentRecordVo getAppointmentRecords(Integer stuId, Integer appUserId,Integer appointStatus,Integer timeType,String search) {
        AppointmentRecordVo recordVo = new AppointmentRecordVo();
        TStudent tStudent = this.baseMapper.selectOne(new QueryWrapper<TStudent>()
                .eq("id",stuId )
                .eq("appUserId",appUserId));
        if (ToolUtil.isNotEmpty(tStudent)){
            recordVo.setStuId(tStudent.getId());
            recordVo.setStuName(tStudent.getName());
            WeeksOfCourseRest courseRest = new WeeksOfCourseRest();
            courseRest.setAppUserId(appUserId);
            courseRest.setStuId(stuId);
            List<RecordAppoint> recordAppoints = couPayClient.obtainStudentClassDetailsData(courseRest);
            if (ToolUtil.isEmpty(appointStatus)){
                recordVo.setAppointStatus(0);
            }else {
                recordVo.setAppointStatus(appointStatus);
                if (recordAppoints.size() > 0 ){
    public List<RecordAppoint> getAppointmentRecords(Integer stuId, Integer appUserId,Integer appointStatus,Integer timeType,String search) {
        WeeksOfCourseRest courseRest = new WeeksOfCourseRest();
        courseRest.setAppUserId(appUserId);
        courseRest.setStuId(stuId);
        List<RecordAppoint> recordAppoints = couPayClient.obtainStudentClassDetailsData(courseRest);
        if (recordAppoints.size() > 0) {
            if (ToolUtil.isNotEmpty(appointStatus) && appointStatus != 0) {
                    recordAppoints = recordAppoints.stream()
                            .filter(record -> record.getStatus().equals(appointStatus))
                            .collect(Collectors.toList());
                }
            }
            if (ToolUtil.isNotEmpty(search)){
                recordVo.setAppointStatus(appointStatus);
                if (recordAppoints.size() > 0 ){
            if (ToolUtil.isNotEmpty(search)) {
                    recordAppoints = recordAppoints.stream()
                            .filter(record -> record.getCoursePackageName().contains(search))
                            .collect(Collectors.toList());
                }
            }
            if (ToolUtil.isNotEmpty(timeType)){
            if (ToolUtil.isNotEmpty(timeType) && timeType != 0) {
                Date lastOfDate = DateUtil.getLastOfDate();
                switch (timeType){
                switch (timeType) {
                    case 1:
                        Date lastWeekStartDate = DateUtil.getLastWeekStartDate();
                        if (recordAppoints.size() > 0 ){
                            recordAppoints = recordAppoints.stream()
                                    .filter(record -> {
                                        try {
@@ -647,11 +643,9 @@
                                        }
                                    })
                                    .collect(Collectors.toList());
                        }
                        break;
                    case 2:
                        Date lastMonthStartDate = DateUtil.getLastMonthStartDate();
                        if (recordAppoints.size() > 0 ){
                            recordAppoints = recordAppoints.stream()
                                    .filter(record -> {
                                        try {
@@ -663,11 +657,9 @@
                                        }
                                    })
                                    .collect(Collectors.toList());
                        }
                        break;
                    case 3:
                        Date lastYearStartDate = DateUtil.getLastYearStartDate();
                        if (recordAppoints.size() > 0 ){
                            recordAppoints = recordAppoints.stream()
                                    .filter(record -> {
                                        try {
@@ -679,17 +671,14 @@
                                        }
                                    })
                                    .collect(Collectors.toList());
                        }
                        break;
                    default:
                        break;
                }
            }
            recordVo.setAppointList(recordAppoints);
        }
        return recordVo;
        return recordAppoints;
    }
    @Override
@@ -745,8 +734,10 @@
        Store store = storeClient.queryStoreById(storeId);
        StoreDetailsVo detailsVo = new StoreDetailsVo();
        String realPicture = store.getRealPicture();
        String[] split = realPicture.split(",");
        detailsVo.setImages(Arrays.asList(split));
        if (ToolUtil.isNotEmpty(realPicture)){
            String[] split = realPicture.split(",");
            detailsVo.setImages(Arrays.asList(split));
        }
        detailsVo.setStoreId(store.getId());
        detailsVo.setStoreName(store.getName());
        detailsVo.setStoreAddress(store.getAddress());
@@ -756,7 +747,9 @@
        detailsVo.setLat(store.getLat());
        detailsVo.setPhone(store.getPhone());
        detailsVo.setVenueList(steClient.getAppUserSiteList());
        detailsVo.setCourseVoList(culisClient.getStoreOfCourseList(storeId));
        List<StoreOfCourseVo> storeOfCourseList = culisClient.getStoreOfCourseList(storeId);
        System.out.println(storeOfCourseList);
        detailsVo.setCourseVoList(storeOfCourseList);
        return detailsVo;
    }