Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai

44323

2023-11-27 aa925d851857f50eff0556411366690d9a78a0e5

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

@@ -50,6 +50,7 @@
    private TCoursePackageService coursePackageService;
    @Resource
    private CoursePackageStudentMapper cpsMapper;

    //获取退费记录
    @RequestMapping("/getRefund")
    @ResponseBody
@@ -61,8 +62,6 @@

    @Resource
    private CoursePackageSchedulingMapper coursePackageSchedulingService;




    @RequestMapping("/getStudentTotal")
@@ -129,6 +128,7 @@

        return studentClassInfo;
    }

    //获取学员课程列表
    @RequestMapping("/getClassList")
    @ResponseBody
@@ -170,8 +170,10 @@


    }

    @Resource
    private AppUserClient appUserClient;

    //获取可转移学员
    @RequestMapping("/getSelect")
    @ResponseBody
@@ -185,16 +187,16 @@
    if (studentIds.size()>0){
        List<SelectDto> selectDtos =   appUserClient.getSelects(studentIds);

        return selectDtos;}
    else return null;
            return selectDtos;
        } else return null;
    }



    //根据payid获取对应门店的常规课程

    @Autowired
    private  TCoursePackageService packageService;

    @RequestMapping("/holiSelect")
    @ResponseBody
    public List<SelectDto> getHoliSelect(@RequestParam("courseId")Integer id){
@@ -213,8 +215,6 @@
            selectDto.setValue(t.getName());
            selectDtos.add(selectDto);
        }




        return selectDtos;
@@ -238,8 +238,6 @@
            selectDto.setValue(t.getName());
            selectDtos.add(selectDto);
        }




        return selectDtos;
@@ -271,6 +269,9 @@
    }


    @Autowired
    private ICoursePackageOrderStudentService orderStudentService;

    @RequestMapping("/insertBack")
    @ResponseBody
    public void insertBack(@RequestBody InsertBackDto insertBackDto){
@@ -282,15 +283,16 @@
        moneyBack.setIds(insertBackDto.getIds());
        moneyBackService.save(moneyBack);

        List<TCoursePackagePayment> pays = paymentService.list(new QueryWrapper<TCoursePackagePayment>().in("id", insertBackDto.getIds()));
        for (TCoursePackagePayment o :pays){
//        List<TCoursePackagePayment> pays = paymentService.list(new QueryWrapper<TCoursePackagePayment>().in("id", insertBackDto.getIds()));


        List<CoursePackageOrderStudent> pays = orderStudentService.list(new QueryWrapper<CoursePackageOrderStudent>().in("id", insertBackDto.getIds()));
        for (CoursePackageOrderStudent o : pays) {
            o.setStatus(4);
            o.setAppUserId(null);
        }



        paymentService.updateBatchById(pays);
        orderStudentService.updateBatchById(pays);
    }


@@ -320,6 +322,13 @@
        byId.setStatus(2);
        moneyBackService.updateById(byId);

        List<CoursePackageOrderStudent> pays = orderStudentService.list(new QueryWrapper<CoursePackageOrderStudent>().in("id", byId.getIds()));
        for (CoursePackageOrderStudent o : pays) {
            o.setStatus(1);
            o.setAppUserId(null);
        }
        orderStudentService.updateBatchById(pays);

    }

    @RequestMapping("/zeroClass")
@@ -344,7 +353,6 @@
            o.setAppUserId(null);



            TCoursePackage tCoursePackage = packageService.getById(o.getCoursePackageId());
            String classWeeks = tCoursePackage.getClassWeeks();
            List<Integer> week = week(classWeeks);
@@ -362,7 +370,6 @@
                coursePackageSchedulingService.delete(new QueryWrapper<CoursePackageScheduling>().in("id", collect));
                coursePackageStudentService.remove(new QueryWrapper<CoursePackageStudent>().eq("studentId", o.getStudentId()).eq("coursePackageId", o.getCoursePackageId()));
            }



        }
@@ -383,6 +390,7 @@
        }
        paymentService.updateBatchById(id1);
    }

    @RequestMapping("/cancel")
    @ResponseBody
    public void cancel(@RequestParam("ids")String ids){
@@ -399,6 +407,7 @@

    @Autowired
    private MoneyBackService moneyBackService;

    @RequestMapping("/getMoneyBack")
    @ResponseBody
    public List<MoneyBack> getMoneyBack(@RequestParam("tStudentId")Integer tStudentId){
@@ -440,7 +449,8 @@
            courseCounsum.setInsertTime(new Date());
            if (orinPay.getAppUserId()!=studentPay.getAppUserId()){
                courseCounsum.setReason("课时转移");
            }else {            courseCounsum.setReason("课时转移");
            } else {
                courseCounsum.setReason("课时转移");
            }
            courseCounsum.setNum(laveClassHours);
            courseCounsum.setChangeType(0);
@@ -461,7 +471,8 @@
            courseCounsum1.setInsertTime(new Date());
            if (orinPay.getAppUserId()!=studentPay.getAppUserId()){
                courseCounsum1.setReason("课时转移");
            }else {            courseCounsum1.setReason("课时转移");
            } else {
                courseCounsum1.setReason("课时转移");
            }
            courseCounsum1.setNum(laveClassHours);
            courseCounsum1.setChangeType(1);
@@ -491,8 +502,6 @@
            Student student = studentClient.queryStudentById(toClassDto.getToStudentId());

            Date today = new Date();




            TCoursePackagePayment pay = coursePackagePaymentService.getById(studentPay.getId());
@@ -543,7 +552,6 @@
        }else {



            Student student = studentClient.queryStudentById(toClassDto.getToStudentId());
            TCoursePackagePayment to = new TCoursePackagePayment();
            to.setStudentId(toClassDto.getToStudentId());
@@ -558,13 +566,11 @@
            paymentService.save(to);



            orinPay.setTotalClassHours(0);
            orinPay.setLaveClassHours(0);
            orinPay.setAppUserId(null);
            orinPay.setStatus(1);
            paymentService.updateById(orinPay);



            //删除orin的排课记录
@@ -586,9 +592,6 @@
            counsumService.save(courseCounsum);





            CourseCounsum courseCounsum1 = new CourseCounsum();
            courseCounsum1.setInsertTime(new Date());
            courseCounsum1.setReason("课时转移");
@@ -596,7 +599,6 @@
            courseCounsum1.setChangeType(1);
            courseCounsum1.setPaymentId(to.getId());
            counsumService.save(courseCounsum);



            TCoursePackage tCoursePackage = packageService.getById(studentPay.getCoursePackageId());
@@ -618,10 +620,7 @@
            }



            Date today = new Date();




            TCoursePackagePayment pay = coursePackagePaymentService.getById(studentPay.getId());
@@ -677,6 +676,7 @@
    private StudentClient studentClient;
    @Autowired
    private  CourseCounsumService courseCounsumService;

    @RequestMapping(value = "/toHoli",produces = MediaType.APPLICATION_JSON_UTF8_VALUE, consumes = "application/json;charset=UTF-8")
    @ResponseBody
    public String toHoli(@RequestBody ToHoliDto toHoliDto) throws ParseException {
@@ -698,7 +698,8 @@
            Student student = studentClient.queryStudentById(payment.getStudentId());

            if (laveClassHours < classNum){
                strings.add(student.getName()); continue;
                strings.add(student.getName());
                continue;
            }

            Integer laveClassHoursnew = laveClassHours - classNum;
@@ -797,10 +798,7 @@
            }




            System.out.println("保存成功=============》="+holi);



        }
@@ -811,12 +809,12 @@
        return join;



    }


    @Autowired
    private TCoursePackagePaymentService coursePackagePaymentService;

    public static Date[] generateDateArray(int numDays,Date date) {
//        LocalDate tomorrow = LocalDate.now().plusDays(1);
        LocalDate tomorrow = date.toInstant().atZone(ZoneId.systemDefault()).toLocalDate().plusDays(1);
@@ -830,6 +828,7 @@

        return dates;
    }

    private List<Integer> week(String week){
        String[] split = week.split(";");
        ArrayList<Integer> integers = new ArrayList<>();
@@ -864,6 +863,7 @@

    @Autowired
    private CoursePackageStudentService coursePackageStudentService;

    @RequestMapping(value = "/toTrans",produces = MediaType.APPLICATION_JSON_UTF8_VALUE, consumes = "application/json;charset=UTF-8")
    @ResponseBody
    public String toTrans(@RequestBody ToHoliDto toHoliDto) throws ParseException {
@@ -934,7 +934,6 @@
            courseCounsumService.save(courseCounsum);



            TCoursePackage tCoursePackage = packageService.getById(toHoliDto.getClassId());
            String classWeeks = tCoursePackage.getClassWeeks();
            List<Integer> week = week(classWeeks);
@@ -955,8 +954,6 @@


            Date today = new Date();




            TCoursePackagePayment pay = coursePackagePaymentService.getById(holi.getId());
@@ -1007,7 +1004,6 @@
            }



        }
        String[] stringArray = strings.toArray(new String[strings.size()]);

@@ -1015,7 +1011,6 @@
        System.out.println("==========join========"+join);
        return "转课成功";
    }



}