玩湃
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
nickchange
2023-11-21 41b60f3df5f3054aad44307c13a26b14f3b32ac0 
 cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java


@@ -436,7 +436,7 @@


        Student student = studentClient.queryStudentById(stuId);


        List<TCoursePackagePayment> byUserId = packagePaymentService.list(new QueryWrapper<TCoursePackagePayment>()


                .eq("appUserId",student.getAppUserId())


                .eq("studentId",stuId));


                .eq("studentId",stuId).eq("payStatus",2));




        if (byUserId.size() > 0 ){


            for (TCoursePackagePayment tCoursePackagePayment : byUserId) {


@@ -451,10 +451,24 @@


                resp.setTotalCourseNums(tCoursePackagePayment.getTotalClassHours());


                resp.setResidueNums(tCoursePackagePayment.getLaveClassHours());


                resp.setDeductionNums(tCoursePackagePayment.getTotalClassHours()-tCoursePackagePayment.getLaveClassHours());


                if (tCoursePackage.getValidDays()!=null){


                String afterDayDate = DateUtil.getAfterDayDate2(tCoursePackage.getInsertTime(),tCoursePackage.getValidDays() + "");


                resp.setPeriodOfValidity(afterDayDate);


                resp.setCourseType(tCoursePackage.getType());


                if (tCoursePackage.getType()!=1||tCoursePackage.getState()==2||tCoursePackagePayment.getPayStatus()==1){


                    resp.setIsAble(0);


                }else {


                    resp.setIsAble(1);


                }


                if (tCoursePackagePayment.getUseTime()!=null){


//                String afterDayDate = DateUtil.getAfterDayDate2(tCoursePackage.getInsertTime(),tCoursePackage.getValidDays() + "");


//                resp.setPeriodOfValidity(afterDayDate);






                    SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");


                    String str = sdf.format(tCoursePackagePayment.getUseTime());


                    resp.setPeriodOfValidity(str);


                }








                resps.add(resp);


            }


        }


@@ -545,11 +559,13 @@


                    .in("id", collect));


            list.forEach(vo -> {


                StuSessionDetailsVo detVo = new StuSessionDetailsVo();


                detVo.setSessionid(vo.getId());


                detVo.setSessionName(vo.getName());


                String afterDayDate = DateUtil.getAfterDayDate2(vo.getInsertTime(),vo.getValidDays() + "");


                detVo.setPeriodOfValidity(afterDayDate);


                detailsVos.add(detVo);


                if (vo.getType()!=2) {


                    detVo.setSessionid(vo.getId());


                    detVo.setSessionName(vo.getName());


                    String afterDayDate = DateUtil.getAfterDayDate2(vo.getInsertTime(), vo.getValidDays() + "");


                    detVo.setPeriodOfValidity(afterDayDate);


                    detailsVos.add(detVo);


                }


            });


        }


        return detailsVos;


@@ -573,6 +589,62 @@


            });


        }


        return purchaseRecordVos;


    }






    @Autowired


    private CourseCounsumService courseCounsumService;




    @Autowired


    private TCoursePackagePaymentService coursePackagePaymentService;




    @PostMapping("/base/coursePack/getRecord")


    public List<PurchaseRecordVo> getRecord(@RequestBody RecordTimeRequest recordTimeRequest) {


        List<TCoursePackagePayment> list = new ArrayList<>();


        Integer [] changes = {1,0};


        if (recordTimeRequest.getType()==null) {


          list = coursePackagePaymentService.list(new QueryWrapper<TCoursePackagePayment>().eq("studentId", recordTimeRequest.getStuId()).eq("coursePackageId", recordTimeRequest.getLessionId()).orderByDesc("insertTime"));


        }else {




            list = coursePackagePaymentService.list(new QueryWrapper<TCoursePackagePayment>().eq("studentId", recordTimeRequest.getStuId()).eq("coursePackageId", recordTimeRequest.getLessionId()).orderByDesc("insertTime"));




        }


        List<Long> ids = new ArrayList<>();


        for (TCoursePackagePayment coursePackagePayment : list) {


            ids.add(coursePackagePayment.getId());


        }








        QueryWrapper<CourseCounsum> in = new QueryWrapper<CourseCounsum>().in("paymentId", ids).in("changeType", changes);




        if (recordTimeRequest.getType()!=null){


            if (recordTimeRequest.getType()==2){


                recordTimeRequest.setType(0);


            }


            in.eq("changeType",recordTimeRequest.getType());


        }


        List<CourseCounsum> paymentId = courseCounsumService.list(in);


        List<PurchaseRecordVo> recordVos =new ArrayList<>();


        for (CourseCounsum courseCounsum : paymentId) {


            PurchaseRecordVo purchaseRecordVo = new PurchaseRecordVo();


            if (courseCounsum.getChangeType() == 0) {


                purchaseRecordVo.setPurchaseAmount("-" + courseCounsum.getNum());


                purchaseRecordVo.setPurchaseType(courseCounsum.getReason());


                SimpleDateFormat sdf = new SimpleDateFormat("MM-dd HH:mm");


                String formattedDate = sdf.format(courseCounsum.getInsertTime());


                purchaseRecordVo.setPurchaseTime(formattedDate);


            } else {


                purchaseRecordVo.setPurchaseAmount("+" + courseCounsum.getNum());


                purchaseRecordVo.setPurchaseType(courseCounsum.getReason());


                SimpleDateFormat sdf = new SimpleDateFormat("MM-dd HH:mm");


                String formattedDate = sdf.format(courseCounsum.getInsertTime());


                purchaseRecordVo.setPurchaseTime(formattedDate);


            }


            recordVos.add(purchaseRecordVo);


        }




        return recordVos;


    }






@@ -701,7 +773,7 @@


    @ResponseBody


    public List<CouponPaymentVo> getAppuserCourseList(@RequestBody Integer appUserId){


        List<CouponPaymentVo> paymentVos = new ArrayList<>();


        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("MM-dd HH:mm");


        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm");


        List<TCoursePackagePayment> list = packagePaymentService.list(new QueryWrapper<TCoursePackagePayment>()


                .eq("appUserId", appUserId)


                .eq("payType", 3)


@@ -752,7 +824,11 @@


                baseVo.setName(coursePackage.getName());


                list.add(baseVo);


            });


            return ResultUtil.success(list);




            Set<BaseVo> set = new HashSet<>(list);


            List<BaseVo> back = new ArrayList<>(set);




            return ResultUtil.success(back);


        }catch (Exception e){


            e.printStackTrace();


            return ResultUtil.runErr();


@@ -788,7 +864,7 @@


//            }






            QueryWrapper<CoursePackageStudent> queryWrapper1 = new QueryWrapper<CoursePackageStudent>().eq("appUserId", appUserId);


            QueryWrapper<CoursePackageStudent> queryWrapper1 = new QueryWrapper<CoursePackageStudent>().eq("studentId", search.getStuId());


            if (ToolUtil.isNotEmpty(search.getCourseTypeId())){


                queryWrapper1.eq("coursePackageId",search.getCourseTypeId());


            }


@@ -800,11 +876,19 @@


            }




            System.out.println("======longs========"+longs);


           List<CoursePackageScheduling> coursePackageSchedulings = coursePackageSchedulingService.list(new QueryWrapper<CoursePackageScheduling>().in("id",longs).isNotNull("courseId"));


//           List<CoursePackageScheduling> coursePackageSchedulings = coursePackageSchedulingService.list(new QueryWrapper<CoursePackageScheduling>().in("id",longs).isNotNull("courseId"));


           List<AppUserVideoResponse> coursePackageSchedulings1 = coursePackageSchedulingService.queryAll(longs);




           if (search.getSearch()!=null) {


               List<AppUserVideoResponse> filteredList = new ArrayList<>();


               for (AppUserVideoResponse response : coursePackageSchedulings1) {


                   if (response.getVideoName().contains(search.getSearch())) {


                       filteredList.add(response);


                   }


               }


               return ResultUtil.success(filteredList);






           }




            return ResultUtil.success(coursePackageSchedulings1);




@@ -846,7 +930,14 @@


    })


    public ResultUtil<PayCourseInfoReq> payCourseInfo(Integer courseId){


        try {


            return ResultUtil.success(packagePaymentService.payCourseInfo(courseId));


            PayCourseInfoReq payCourseInfoReq = packagePaymentService.payCourseInfo(courseId);




//            Arrays.sort(payCourseInfoReq.getDay(), (a, b) -> a.compareTo(b));




            Collections.sort(payCourseInfoReq.getDay(), Comparator.comparing(String::toString));






            return ResultUtil.success(payCourseInfoReq);


        }catch (Exception e){


            return ResultUtil.runErr();


        }


@@ -1133,8 +1224,17 @@


                    coursePackagePayment.setAppUserId(null);


                    packagePaymentService.updateById(coursePackagePayment);




                    CourseCounsum courseCounsum = new CourseCounsum();


                    courseCounsum.setPaymentId(coursePackagePayment.getId());


                    courseCounsum.setChangeType(0);


                    courseCounsum.setNum(classHour);


                    courseCounsum.setInsertTime(new Date());


                    courseCounsum.setReason("报名赛事");


                    courseCounsumService.save(courseCounsum);




//                    coursePackageSchedulingService.remove(new QueryWrapper<CoursePackageScheduling>().eq("courseId", coursePackagePayment.getCoursePackageId()));












                    List<CoursePackageStudent> studentCourse = coursePackageStudentService.list(new QueryWrapper<CoursePackageStudent>().eq("studentId", coursePackagePayment.getStudentId()).eq("coursePackageId", coursePackagePayment.getCoursePackageId()));


@@ -1145,47 +1245,24 @@








                    Student student = studentClient.queryStudentById(coursePackagePayment.getStudentId());




                    TCoursePackage tCoursePackage = packageService.getById(coursePackagePayment.getCoursePackageId());


                    String classWeeks = tCoursePackage.getClassWeeks();


                    List<Integer> week = week(classWeeks);




                    List<TCoursePackagePayment> pays = packagePaymentService.list(new QueryWrapper<TCoursePackagePayment>().eq("coursePackageId", coursePackagePayment.getCoursePackageId()).eq("studentId", coursePackagePayment.getStudentId()));


                    TCoursePackagePayment pay = packagePaymentService.getOne(new QueryWrapper<TCoursePackagePayment>().eq("coursePackageId", coursePackagePayment.getCoursePackageId()).eq("studentId", coursePackagePayment.getStudentId()));






                    for (TCoursePackagePayment pay : pays) {






                        List<CoursePackageStudent> studentCourse1 = coursePackageStudentService.list(new QueryWrapper<CoursePackageStudent>().eq("studentId", pay.getStudentId()).eq("coursePackageId", pay.getCoursePackageId()));


                        List<Long> collect1 = studentCourse1.stream().map(CoursePackageStudent::getCoursePackageSchedulingId).collect(Collectors.toList());


                        //拿到最后一天的排课记录




                        CoursePackageScheduling cs = null;


                        if (collect1.size()>0) {


                            cs = coursePackageSchedulingService.getOne(new QueryWrapper<CoursePackageScheduling>().in("id", collect1).orderByDesc("classDate").last("limit 1"));




                        }


//


//                        Calendar calendar = Calendar.getInstance();


//                        Date currentDate = calendar.getTime();


//                        calendar.add(Calendar.DAY_OF_MONTH, -1);


//                        Date today = calendar.getTime();


                        Date today = new Date();


                    Calendar calendar = Calendar.getInstance();


                    calendar.add(Calendar.DATE, -1);


                    today = calendar.getTime();




                        //判断最后一天是否超过当前日期


                        if (cs==null||cs.getClassDate().before(new Date())){


                        }else {


                            today = cs.getClassDate();


                        }




                    Integer laveClassHours = pay.getLaveClassHours();


                    Integer codeTime = tCoursePackage.getCodeTime();


                    Integer can = laveClassHours/codeTime;




                    int count = 0;






                    String[] split = tCoursePackage.getClassStartTime().split(",");


                    String[] split1 = tCoursePackage.getClassEndTime().split(",");


                    SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");


@@ -1225,105 +1302,7 @@


                        }


                    }




                    }












//                    // 本周周几


//                    int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date()) - 1;


//                    for (Integer integer : week) {


//                        if (integer < i) {


//                            // 找下一周的时间


//                            Calendar instance = Calendar.getInstance();


//                            instance.add(Calendar.DATE, 7 - (i - integer));


//                            Date time = instance.getTime();


//


//                            for (int i1 = 0; i1 < split.length; i1++) {


//


//                                CoursePackageScheduling coursePackageScheduling = new CoursePackageScheduling();


//                                coursePackageScheduling.setCoursePackageId(tCoursePackage.getId());


//                                Date parse = format1.parse(format.format(time) + " " + split[i1]);


//                                Date parse1 = format1.parse(format.format(time) + " " + split1[i1]);


//                                coursePackageScheduling.setClassDate(parse);


//                                coursePackageScheduling.setEndDate(parse1);


//                                coursePackageScheduling.setStatus(1);


//                                coursePackageSchedulingService.save(coursePackageScheduling);


//                                CoursePackageStudent student1 = new CoursePackageStudent();


//                                student1.setAppUserId(student.getAppUserId());


//                                student1.setStudentId(student.getId());


//                                student1.setCoursePackageId(tCoursePackage.getId());


//                                student1.setCoursePackagePaymentId(coursePackagePayment.getId());


//                                student1.setCoursePackageSchedulingId(coursePackageScheduling.getId());


//                                student1.setSignInOrNot(1);


//                                student1.setReservationStatus(1);


//                                student1.setInsertTime(new Date());


//                                studentService.save(student1);


//


//                            }


//


//                        } else if (integer > i) {


//                            Calendar instance = Calendar.getInstance();


//                            instance.add(Calendar.DATE, integer - i);


//                            Date time1 = instance.getTime();


//                            List<Date> list6 = new ArrayList<>();


//                            list6.add(time1);


//                            instance.add(Calendar.DATE, 7);


//                            Date time2 = instance.getTime();


//                            list6.add(time2);


//                            for (Date time : list6) {


//                                for (int i1 = 0; i1 < split.length; i1++) {


//                                    CoursePackageScheduling coursePackageScheduling = new CoursePackageScheduling();


//                                    coursePackageScheduling.setCoursePackageId(tCoursePackage.getId());


//                                    Date parse = format1.parse(format.format(time) + " " + split[i1]);


//                                    Date parse1 = format1.parse(format.format(time) + " " + split1[i1]);


//                                    coursePackageScheduling.setClassDate(parse);


//                                    coursePackageScheduling.setEndDate(parse1);


//                                    coursePackageScheduling.setStatus(1);


//                                    coursePackageSchedulingService.save(coursePackageScheduling);


//


//                                    CoursePackageStudent student1 = new CoursePackageStudent();


//                                    student1.setAppUserId(student.getAppUserId());


//                                    student1.setStudentId(student.getId());


//                                    student1.setCoursePackageId(tCoursePackage.getId());


//                                    student1.setCoursePackagePaymentId(coursePackagePayment.getId());


//                                    student1.setCoursePackageSchedulingId(coursePackageScheduling.getId());


//                                    student1.setSignInOrNot(1);


//                                    student1.setReservationStatus(1);


//                                    student1.setInsertTime(new Date());


//                                    studentService.save(student1);


//                                }


//                            }


//


//                        } else {


//                            Calendar instance = Calendar.getInstance();


//                            instance.add(Calendar.DATE, 7);


//                            Date time = instance.getTime();


//


//                            for (int i1 = 0; i1 < split.length; i1++) {


//                                CoursePackageScheduling coursePackageScheduling = new CoursePackageScheduling();


//                                coursePackageScheduling.setCoursePackageId(tCoursePackage.getId());


//                                Date parse = format1.parse(format.format(time) + " " + split[i1]);


//                                Date parse1 = format1.parse(format.format(time) + " " + split1[i1]);


//                                coursePackageScheduling.setClassDate(parse);


//                                coursePackageScheduling.setEndDate(parse1);


//                                coursePackageScheduling.setStatus(1);


//                                coursePackageSchedulingService.save(coursePackageScheduling);


//


//                                CoursePackageStudent student1 = new CoursePackageStudent();


//                                student1.setAppUserId(student.getAppUserId());


//                                student1.setStudentId(student.getId());


//                                student1.setCoursePackageId(tCoursePackage.getId());


//                                student1.setCoursePackagePaymentId(coursePackagePayment.getId());


//                                student1.setCoursePackageSchedulingId(coursePackageScheduling.getId());


//                                student1.setSignInOrNot(1);


//                                student1.setReservationStatus(1);


//                                student1.setInsertTime(new Date());


//                                studentService.save(student1);


//                            }


//                        }


//                    }






                        // 2.0 少于3课时 推送


@@ -1451,6 +1430,9 @@


        for (TCoursePackagePayment tCoursePackagePayment : list) {


            Integer coursePackageId = tCoursePackagePayment.getCoursePackageId();


            TCoursePackage byId = tcpService.getById(coursePackageId);


            if (byId.getType()==3){


                continue;


            }


            if(storeIds.contains(byId.getStoreId())){


                PayCourseRes payCourseRes = new PayCourseRes();


                payCourseRes.setCourseNum(tCoursePackagePayment.getLaveClassHours());


@@ -1460,6 +1442,14 @@


            }


        }


        return objects;


    }




    @ResponseBody


    @PostMapping("/coursePackagePayment/isHave")


    public Integer isHave(@RequestBody String ids){


        String[] split = ids.split(",");


       return coursePackagePaymentService.count(new QueryWrapper<TCoursePackagePayment>().in("studentId",split));




    }






@@ -1501,6 +1491,15 @@


            tCourseInfoRecord.setType(1);


            tCourseInfoRecord.setNum(paymentConfig.getClassHours());


            auClitn.addCourseInfoRecord(tCourseInfoRecord);




            CourseCounsum courseCounsum = new CourseCounsum();


            courseCounsum.setPaymentId(packagePayment.getId());


            courseCounsum.setChangeType(1);


            courseCounsum.setNum(packagePayment.getClassHours());


            courseCounsum.setInsertTime(new Date());


            courseCounsum.setReason("购买课包");


            courseCounsumService.save(courseCounsum);




        } catch (Exception e) {


            return 4;


        }


@@ -1540,6 +1539,16 @@


            tCourseInfoRecord.setType(1);


            tCourseInfoRecord.setTime(new Date());


            id = appUserClient.addCourseInfoRecord(tCourseInfoRecord);






            CourseCounsum courseCounsum = new CourseCounsum();


            courseCounsum.setPaymentId(packagePayment.getId());


            courseCounsum.setChangeType(1);


            courseCounsum.setNum(packagePayment.getClassHours());


            courseCounsum.setInsertTime(new Date());


            courseCounsum.setReason("续课");


            courseCounsumService.save(courseCounsum);




        }


        return id;


    }


@@ -1548,6 +1557,248 @@


    public boolean savePaymentCoursePackage(@RequestBody TCoursePackagePayment packagePayment){




        return packagePaymentService.save(packagePayment);


    }






    @PostMapping("/base/coursePack/orderClass")


    public void orderClass(@RequestBody OrderDto orderDto) throws ParseException {


        SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");


        String code = sdf.format(new Date()) + UUIDUtil.getNumberRandom(5);


        String[] split = orderDto.getStuIds().split(",");


        for (String s : split) {


            TCoursePackagePayment coursePackagePaymentServiceOne = coursePackagePaymentService.getOne(new QueryWrapper<TCoursePackagePayment>().eq("studentId", s).eq("coursePackageId",orderDto.getClassId()));








            if (coursePackagePaymentServiceOne==null) {


                TCoursePackagePayment coursePackagePayment = new TCoursePackagePayment();


                coursePackagePayment.setCode(code);


                coursePackagePayment.setAppUserId(orderDto.getAppUserId());


                coursePackagePayment.setStudentId(Integer.valueOf(s));


                coursePackagePayment.setCoursePackageId(orderDto.getClassId());


                coursePackagePayment.setPayType(4);


                coursePackagePayment.setClassHours(orderDto.getClassHours());


                coursePackagePayment.setTotalClassHours(orderDto.getClassHours());


                coursePackagePayment.setLaveClassHours(orderDto.getClassHours());


                coursePackagePayment.setAbsencesNumber(0);


                coursePackagePayment.setPayUserType(1);


                coursePackagePayment.setPayStatus(2);


                coursePackagePayment.setPayUserId(orderDto.getAppUserId());


                coursePackagePayment.setStatus(1);


                coursePackagePayment.setState(1);


                coursePackagePayment.setInsertTime(new Date());


                coursePackagePaymentService.save(coursePackagePayment);


                Integer sId = null;


                Student student = studentClient.queryDefaultStudent(orderDto.getAppUserId());


                if (student != null) {


                    sId = student.getId();


                }


                addPackageStudent(orderDto.getClassId(), orderDto.getAppUserId(), Integer.valueOf(s), coursePackagePayment.getId());






                CourseCounsum courseCounsum = new CourseCounsum();


                courseCounsum.setPaymentId(coursePackagePayment.getId());


                courseCounsum.setChangeType(1);


                courseCounsum.setNum(orderDto.getClassHours());


                courseCounsum.setInsertTime(new Date());


                courseCounsum.setReason("积分兑换");


                courseCounsumService.save(courseCounsum);




            }else {


                coursePackagePaymentServiceOne.setClassHours(coursePackagePaymentServiceOne.getClassHours()+orderDto.getClassHours());


                coursePackagePaymentServiceOne.setTotalClassHours(coursePackagePaymentServiceOne.getTotalClassHours()+orderDto.getClassHours());


                coursePackagePaymentServiceOne.setLaveClassHours(coursePackagePaymentServiceOne.getLaveClassHours()+orderDto.getClassHours());


                coursePackagePaymentServiceOne.setAppUserId(null);


                coursePackagePaymentService.updateById(coursePackagePaymentServiceOne);




                Integer sId = null;


                Student student = studentClient.queryDefaultStudent(orderDto.getAppUserId());


                if (student != null) {


                    sId = student.getId();


                }


                addPackageStudent(orderDto.getClassId(), orderDto.getAppUserId(), Integer.valueOf(s), coursePackagePaymentServiceOne.getId());






                CourseCounsum courseCounsum = new CourseCounsum();


                courseCounsum.setPaymentId(coursePackagePaymentServiceOne.getId());


                courseCounsum.setChangeType(1);


                courseCounsum.setNum(orderDto.getClassHours());


                courseCounsum.setInsertTime(new Date());


                courseCounsum.setReason("积分兑换");


                courseCounsumService.save(courseCounsum);






            }




        }




    }






    public static Date[] generateDateArray1(Date startDate, Date endDate) {


        List<Date> dateList = new ArrayList<>();


        Calendar calendar = Calendar.getInstance();


        calendar.setTime(startDate);




        while (!calendar.getTime().after(endDate)) {


            Date currentDate = calendar.getTime();


            dateList.add(currentDate);


            calendar.add(Calendar.DAY_OF_MONTH, 1);


        }




        return dateList.toArray(new Date[0]);


    }




    @Autowired


    private TCoursePackageService coursePackageService;


    private void addPackageStudent(Integer courseId, Integer userId, Integer sId,Long paymentId) throws ParseException {


        // 课包


        TCoursePackage tCoursePackage = coursePackageService.getById(courseId);




        if (tCoursePackage.getType()==1) {


            String classWeeks = tCoursePackage.getClassWeeks();




            List<Integer> week = week(classWeeks);




            String[] split = tCoursePackage.getClassStartTime().split(",");


            String[] split1 = tCoursePackage.getClassEndTime().split(",");


            SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");


            SimpleDateFormat format1 = new SimpleDateFormat("yyyy-MM-dd HH:mm");




            //查出当前用户当前学员当前课包最后一天的排课数据


            List<CoursePackageStudent> studentCourse = coursePackageStudentService.list(new QueryWrapper<CoursePackageStudent>().eq("studentId", sId).eq("coursePackageId", courseId));


            List<Long> collect = studentCourse.stream().map(CoursePackageStudent::getCoursePackageSchedulingId).collect(Collectors.toList());


            //拿到最后一天的排课记录


            if (collect.size() > 0) {


                coursePackageSchedulingService.remove(new QueryWrapper<CoursePackageScheduling>().in("id", collect));


                coursePackageStudentService.remove(new QueryWrapper<CoursePackageStudent>().eq("studentId", sId).eq("coursePackageId", courseId));


            }


            Date today = new Date();


            TCoursePackagePayment pay = coursePackagePaymentService.getById(paymentId);


            Integer laveClassHours = pay.getLaveClassHours();


            Integer codeTime = tCoursePackage.getCodeTime();


            Integer can = 0;


            int count = 0;


            // 本周周几


            Date[] dates = generateDateArray(14, today);


            if (tCoursePackage.getType() == 1) {


                can = laveClassHours / codeTime;


            }


            if (tCoursePackage.getType() == 2) {


                Date startDate = tCoursePackage.getStartTime();


                Date endDate = tCoursePackage.getEndTime();


                dates = generateDateArray1(startDate, endDate);


                can = 999;


            }


            for (Date date : dates) {


                if (count == can) {


                    break;


                }


                int wei = cn.hutool.core.date.DateUtil.dayOfWeek(date);


                if (week.contains(wei)) {


                    for (int i1 = 0; i1 < split.length; i1++) {


                        if (count == can) {


                            break;


                        }


                        CoursePackageScheduling coursePackageScheduling = new CoursePackageScheduling();


                        coursePackageScheduling.setCoursePackageId(tCoursePackage.getId());


                        Date parse = format1.parse(format.format(date) + " " + split[i1]);


                        Date parse1 = format1.parse(format.format(date) + " " + split1[i1]);


                        coursePackageScheduling.setClassDate(parse);


                        coursePackageScheduling.setEndDate(parse1);


                        coursePackageScheduling.setStatus(1);


                        coursePackageSchedulingService.save(coursePackageScheduling);


                        CoursePackageStudent student1 = new CoursePackageStudent();


                        student1.setAppUserId(userId);


                        student1.setStudentId(sId);


                        student1.setCoursePackageId(tCoursePackage.getId());


                        student1.setCoursePackagePaymentId(paymentId);


                        student1.setCoursePackageSchedulingId(coursePackageScheduling.getId());


                        student1.setSignInOrNot(1);


                        student1.setReservationStatus(1);


                        student1.setInsertTime(new Date());


                        coursePackageStudentService.save(student1);


                        count++;


                    }


                }


            }




        }else if (tCoursePackage.getType()==2){


            String classWeeks = tCoursePackage.getClassWeeks();


            List<Integer> week = week(classWeeks);




            Date today = new Date();




            Date startTime = tCoursePackage.getStartTime();


            Date endTime = tCoursePackage.getEndTime();


            LocalDate startDate = startTime.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();


            LocalDate endDate = endTime.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();


            Period period = Period.between(startDate, endDate);


            int days = period.getDays() + 1;


            Integer can =999;


            int count = 0;


            String[] split = tCoursePackage.getClassStartTime().split(",");


            String[] split1 = tCoursePackage.getClassEndTime().split(",");


            SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");


            SimpleDateFormat format1 = new SimpleDateFormat("yyyy-MM-dd HH:mm");




            Calendar calendar = Calendar.getInstance();


            calendar.setTime(startTime);


            calendar.add(Calendar.DAY_OF_MONTH, -1);




            TCoursePackagePayment pay = coursePackagePaymentService.getById(paymentId);






            Date[] dates = generateDateArray(days,calendar.getTime());


            for (Date date : dates) {


                if (count==can){


                    break;


                }


                int wei =  cn.hutool.core.date.DateUtil.dayOfWeek(date)-1;


                if (wei == 0){


                    wei =7;


                }


                if (week.contains(wei)){


                    for (int i1 = 0; i1 < split.length; i1++) {


                        if (count==can){


                            break;


                        }


                        CoursePackageScheduling coursePackageScheduling = new CoursePackageScheduling();


                        coursePackageScheduling.setCoursePackageId(tCoursePackage.getId());


                        Date parse = format1.parse(format.format(date) + " " + split[i1]);


                        Date parse1 = format1.parse(format.format(date) + " " + split1[i1]);


                        coursePackageScheduling.setClassDate(parse);


                        coursePackageScheduling.setEndDate(parse1);


                        coursePackageScheduling.setStatus(1);


                        coursePackageSchedulingService.save(coursePackageScheduling);


                        CoursePackageStudent student1 = new CoursePackageStudent();


                        student1.setAppUserId(userId);


                        student1.setStudentId(sId);


                        student1.setCoursePackageId(tCoursePackage.getId());


                        student1.setCoursePackagePaymentId(pay.getId());


                        student1.setCoursePackageSchedulingId(coursePackageScheduling.getId());


                        student1.setSignInOrNot(1);


                        student1.setReservationStatus(1);


                        student1.setInsertTime(new Date());


                        coursePackageStudentService.save(student1);


                        count++;


                    }


                }


            }


        }






        // 2.0


        TCourseInfoRecord tCourseInfoRecord = new TCourseInfoRecord();


        tCourseInfoRecord.setUserId(userId);


        tCourseInfoRecord.setCourseId(courseId);


        tCourseInfoRecord.setName("报名运动营");


        tCourseInfoRecord.setNum(tCoursePackage.getNeedNum());


        tCourseInfoRecord.setTime(new Date());


        tCourseInfoRecord.setType(2);


        appUserClient.addCourseInfoRecord(tCourseInfoRecord);






    }




    @ResponseBody


@@ -1579,11 +1830,90 @@




    // 2.0 送课时


    @PostMapping("/base/coursePack/sendHours")


    public Integer sendHours(@RequestBody  String s){


        String[] split = s.split("_");


        TCoursePackagePayment byId = packagePaymentService.getById(Long.valueOf(split[0]));


        byId.setTotalClassHours(byId.getTotalClassHours()+Integer.valueOf(split[2]));


        boolean b = packagePaymentService.updateHoursById(byId,Integer.valueOf(split[2]));


    public Integer sendHours(@RequestBody  String s) throws ParseException {


        String[] split2 = s.split("_");


        TCoursePackagePayment byId = packagePaymentService.getById(Long.valueOf(split2[0]));


        byId.setTotalClassHours(byId.getTotalClassHours()+Integer.valueOf(split2[2]));


        boolean b = packagePaymentService.updateHoursById(byId,Integer.valueOf(split2[2]));




        CourseCounsum courseCounsum = new CourseCounsum();


        courseCounsum.setPaymentId(byId.getId());


        courseCounsum.setChangeType(1);


        courseCounsum.setNum(Integer.valueOf(split2[2]));


        courseCounsum.setInsertTime(new Date());


        courseCounsum.setReason("介绍有礼");


        courseCounsumService.save(courseCounsum);






        List<CoursePackageStudent> studentCourse = coursePackageStudentService.list(new QueryWrapper<CoursePackageStudent>().eq("studentId", byId.getStudentId()).eq("coursePackageId", byId.getCoursePackageId()));


        List<Long> collect = studentCourse.stream().map(CoursePackageStudent::getCoursePackageSchedulingId).collect(Collectors.toList());


        coursePackageSchedulingService.remove(new QueryWrapper<CoursePackageScheduling>().in("id",collect));


        coursePackageStudentService.remove(new QueryWrapper<CoursePackageStudent>().eq("studentId", byId.getStudentId()).eq("coursePackageId", byId.getCoursePackageId()));












        TCoursePackage tCoursePackage = packageService.getById(byId.getCoursePackageId());


        String classWeeks = tCoursePackage.getClassWeeks();


        List<Integer> week = week(classWeeks);




        TCoursePackagePayment pay = packagePaymentService.getOne(new QueryWrapper<TCoursePackagePayment>().eq("coursePackageId", byId.getCoursePackageId()).eq("studentId", byId.getStudentId()));




        Date today = new Date();




        Integer laveClassHours = pay.getLaveClassHours();


        Integer codeTime = tCoursePackage.getCodeTime();


        Integer can = laveClassHours/codeTime;




        int count = 0;


        String[] split = tCoursePackage.getClassStartTime().split(",");


        String[] split1 = tCoursePackage.getClassEndTime().split(",");


        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");


        SimpleDateFormat format1 = new SimpleDateFormat("yyyy-MM-dd HH:mm");




        Date[] dates = generateDateArray(14,today);


        for (Date date : dates) {


            if (count==can){


                break;


            }


            int wei =  cn.hutool.core.date.DateUtil.dayOfWeek(date);


            if (week.contains(wei)){


                for (int i1 = 0; i1 < split.length; i1++) {


                    if (count==can){


                        break;


                    }


                    CoursePackageScheduling coursePackageScheduling = new CoursePackageScheduling();


                    coursePackageScheduling.setCoursePackageId(tCoursePackage.getId());


                    Date parse = format1.parse(format.format(date) + " " + split[i1]);


                    Date parse1 = format1.parse(format.format(date) + " " + split1[i1]);


                    coursePackageScheduling.setClassDate(parse);


                    coursePackageScheduling.setEndDate(parse1);


                    coursePackageScheduling.setStatus(1);


                    coursePackageSchedulingService.save(coursePackageScheduling);


                    CoursePackageStudent student1 = new CoursePackageStudent();


                    student1.setAppUserId(pay.getAppUserId());


                    student1.setStudentId(pay.getStudentId());


                    student1.setCoursePackageId(pay.getCoursePackageId());


                    student1.setCoursePackagePaymentId(pay.getId());


                    student1.setCoursePackageSchedulingId(coursePackageScheduling.getId());


                    student1.setSignInOrNot(1);


                    student1.setReservationStatus(1);


                    student1.setInsertTime(new Date());


                    studentService.save(student1);


                    count++;


                }


            }


        }




















        if(b){


            return 1;


        }else {


@@ -1738,6 +2068,21 @@


        }


    }








    @ResponseBody


    @PostMapping("/base/coursePack/getConsumes")


    List<CourseCounsum> getConsumes(@RequestBody BillingDataRequestVo requestVo) {


        Integer[] integers = {2,3};


        QueryWrapper<CourseCounsum> courseCounsumQueryWrapper = new QueryWrapper<CourseCounsum>().in("changeType",integers).eq("appUserId",requestVo.getAppUserId());


        if (requestVo.getMonthEnd()!=null){


            courseCounsumQueryWrapper.ge("insertTime",requestVo.getMonthStart());


            courseCounsumQueryWrapper.le("insertTime",requestVo.getMonthEnd());


        }


    return     courseCounsumService.list(courseCounsumQueryWrapper);




    }




    @ResponseBody


    @PostMapping("/base/coursePack/weeksOfCourseDetailsList")


    HashMap<String, Object> weeksOfCourseDetailsList(@RequestBody CourseDetailReq courseDetailReq){


@@ -1771,10 +2116,13 @@


            List<TCoursePackagePayment> list1 = packagePaymentService.list(new LambdaQueryWrapper<TCoursePackagePayment>().eq(TCoursePackagePayment::getAppUserId, courseDetailReq.getAppUserId()).eq(TCoursePackagePayment::getStudentId, courseDetailReq.getStuId()).in(TCoursePackagePayment::getCoursePackageId, collect));


            List<Integer> collect1 = list1.stream().map(TCoursePackagePayment::getCoursePackageId).collect(Collectors.toList());


            List<Long> ids = list1.stream().map(TCoursePackagePayment::getId).collect(Collectors.toList());






            for (TCoursePackage tCoursePackage : list) {


                DetailsListVo detailsListVo = new DetailsListVo();


                detailsListVo.setId(tCoursePackage.getId());


                detailsListVo.setName(tCoursePackage.getName());


                detailsListVo.setCourseType(tCoursePackage.getType());


                String classStartTime = tCoursePackage.getClassStartTime();


                String[] split = classStartTime.split(",");


                String classEndTime = tCoursePackage.getClassEndTime();


@@ -1786,8 +2134,22 @@


                        strings.add(s);


                    }


                }


                if (detailsListVo.getCourseType()==1) {


                    detailsListVo.setTime(strings);


                }else {


                    Date startTime = tCoursePackage.getStartTime();


                    Date endTime = tCoursePackage.getEndTime();


                    SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");


                    String formattedStartTime = sdf.format(startTime);


                    String formattedEndTime = sdf.format(endTime);




                detailsListVo.setTime(strings);


                    String result = formattedStartTime + "至" + formattedEndTime;


                    List<String> stringLists = new ArrayList<>();


                    stringLists.add(result);


                    detailsListVo.setTime(stringLists);




                }


                //价格


                List<CoursePackagePaymentConfig> list2 = icppcService.list(new LambdaQueryWrapper<CoursePackagePaymentConfig>().eq(CoursePackagePaymentConfig::getCoursePackageId, tCoursePackage.getId()).orderByAsc(CoursePackagePaymentConfig::getCashPayment));


                if (list2.size() > 0) {


                    Double cashPayment = list2.get(0).getCashPayment();


@@ -1801,12 +2163,17 @@


                            .like(CoursePackageScheduling::getClassDate, courseDetailReq.getTime())


                    );


                    if(list3.size()==0){


                        break;


                        detailsListVo.setType(2);


                        objects.add(detailsListVo);


                        continue;


                    }


                    //排课的ids


                    List<Long> collect2 = list3.stream().map(CoursePackageScheduling::getId).collect(Collectors.toList());


                    if(collect2.size()==0){


                        collect2.add(-1l);


                    }






                    List<CoursePackageStudent> list4 = cspsService.list(new LambdaQueryWrapper<CoursePackageStudent>()


                            .eq(CoursePackageStudent::getAppUserId, courseDetailReq.getAppUserId())


                            .eq(CoursePackageStudent::getCoursePackageId, tCoursePackage.getId())


@@ -1814,7 +2181,9 @@


                                    in(CoursePackageStudent::getCoursePackagePaymentId, ids)


                    );




                    if(list4.size()>0){


                    List<CoursePackageStudent> list5 = cspsService.list(new QueryWrapper<CoursePackageStudent>().eq("studentId", courseDetailReq.getStuId()).eq("coursePackageId",tCoursePackage.getId()));




                    if(list5.size()>0){


                        Integer signInOrNot = list4.get(0).getSignInOrNot();


                        detailsListVo.setType(1);




@@ -1823,15 +2192,48 @@


                        }


                        detailsListVo.setIsType(list4.get(0).getType());




                        for (CoursePackageStudent coursePackageStudent : list4) {


                            Integer signInOrNot1 = coursePackageStudent.getSignInOrNot();


                            detailsListVo.setType(1);




                            if(signInOrNot1==2){


                                detailsListVo.setType(3);


                            }


                            detailsListVo.setIsType(coursePackageStudent.getType());


                            CoursePackageScheduling coursePackageScheduling = coursePackageSchedulingMapper.selectById(coursePackageStudent.getCoursePackageSchedulingId());


                            Date classDate = coursePackageScheduling.getClassDate();


                            Date endDate = coursePackageScheduling.getEndDate();


                            SimpleDateFormat sdf = new SimpleDateFormat("HH:mm");


                            String formattedClassDate = sdf.format(classDate);


                            String formattedEndDate = sdf.format(endDate);




                            String result = formattedClassDate + "-" + formattedEndDate;


                            List<String> strings1 =new ArrayList<>();


                            strings1.add(result);


                            detailsListVo.setTime(strings1);


                            DetailsListVo detailsListVo1 = new DetailsListVo();




//                            detailsListVo1.setId(coursePackageStudent.getId());


                            BeanUtils.copyProperties(detailsListVo,detailsListVo1);


                            objects.add(detailsListVo1);


                        }












                    }else {


                        detailsListVo.setType(2);


                        objects.add(detailsListVo);




                    }




                } else {


                    detailsListVo.setType(2);


                    objects.add(detailsListVo);




                }


                objects.add(detailsListVo);


//                objects.add(detailsListVo);


            }


            map.put("data",objects);