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

44323

2023-11-21 b4c77c0839258280044cf65a15471fa3c20d465f

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

@@ -551,11 +551,13 @@
                    .in("id", collect));
            list.forEach(vo -> {
                StuSessionDetailsVo detVo = new StuSessionDetailsVo();
                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;
@@ -927,7 +929,7 @@
            Collections.sort(payCourseInfoReq.getDay(), Comparator.comparing(String::toString));


            return ResultUtil.success(packagePaymentService.payCourseInfo(courseId));
            return ResultUtil.success(payCourseInfoReq);
        }catch (Exception e){
            return ResultUtil.runErr();
        }