|
@@ -1187,8 +1187,6 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
|
|
|
}
|
|
|
|
|
|
Date date = new Date();
|
|
|
- List<CourseScheduleStudentPayment> courseScheduleStudentPayments = new ArrayList<CourseScheduleStudentPayment>();
|
|
|
- List<CourseScheduleStudentPayment> totalCourseScheduleStudentPayments = new ArrayList<CourseScheduleStudentPayment>();
|
|
|
|
|
|
// 计算单价
|
|
|
Map<CourseScheduleType, BigDecimal> unitPriceMap = new HashMap<CourseSchedule.CourseScheduleType, BigDecimal>();
|
|
@@ -1230,6 +1228,9 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
|
|
|
BigDecimal originUnitPrice = new BigDecimal(0);
|
|
|
CourseScheduleType courseType = null;
|
|
|
for (ClassGroup classGroup : classGroupList) {
|
|
|
+ List<CourseScheduleStudentPayment> courseScheduleStudentPayments = new ArrayList<CourseScheduleStudentPayment>();
|
|
|
+ List<CourseScheduleStudentPayment> totalCourseScheduleStudentPayments = new ArrayList<CourseScheduleStudentPayment>();
|
|
|
+
|
|
|
if(HIGH_ONLINE.equals(classGroup.getType())){
|
|
|
Integer studentNum = classGroupStudentMapperDao.countClassGroupStudentNum(classGroup.getId());
|
|
|
if(Objects.nonNull(studentNum)&&studentNum>=6){
|
|
@@ -1315,6 +1316,9 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
|
|
|
List<CourseScheduleType> list = new ArrayList<CourseSchedule.CourseScheduleType>();
|
|
|
for (CourseScheduleStudentPayment courseScheduleStudentPayment : courseScheduleStudentPayments) {
|
|
|
courseType = courseScheduleStudentPayment.getCourseSchedule().getType();
|
|
|
+ if(totalCurrentPriceMap.get(courseType) == null){
|
|
|
+ throw new BizException("该缴费项目有新增课时:请重新编辑");
|
|
|
+ }
|
|
|
if (!list.contains(courseType)) {
|
|
|
list.add(courseType);
|
|
|
|