From 12e9e6b431d821ebeb91b4ddeaecfc5198deb523 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期一, 20 十一月 2023 18:17:31 +0800
Subject: [PATCH] 11.11
---
cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java b/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java
index 85654ee..1bc790a 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java
+++ b/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();
- 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;
@@ -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();
}
--
Gitblit v1.7.1