|
|
@@ -331,6 +331,7 @@ public class CourseScheduleStudentPaymentServiceImpl extends BaseServiceImpl<Lon
|
|
|
for (Integer studentId : studentIds) {
|
|
|
List<MusicGroupPaymentStudentCourseDetail> musicGroupPaymentStudentCourseDetails = null;
|
|
|
BigDecimal typeCourseTotalOriginalPrice = new BigDecimal("0"), typeCourseTotalCurrentPrice = new BigDecimal("0");
|
|
|
+ int index = courseScheduleStudentPayments.size()==0?0:(courseScheduleStudentPayments.size() - 1);
|
|
|
for (int i = 0; i < courseSchedules.size(); i++) {
|
|
|
CourseSchedule courseSchedule = courseSchedules.get(i);
|
|
|
//优先处理之前的剩余课程
|
|
|
@@ -352,6 +353,7 @@ public class CourseScheduleStudentPaymentServiceImpl extends BaseServiceImpl<Lon
|
|
|
studentPayment.setExamSongDownloadJson(null);
|
|
|
studentPayment.setId(null);
|
|
|
courseScheduleStudentPayments.add(studentPayment);
|
|
|
+ index++;
|
|
|
continue ;
|
|
|
}
|
|
|
}
|
|
|
@@ -392,7 +394,7 @@ public class CourseScheduleStudentPaymentServiceImpl extends BaseServiceImpl<Lon
|
|
|
cssp.setActualPrice(BigDecimal.ZERO);
|
|
|
courseScheduleStudentPayments.add(cssp);
|
|
|
if(courseSchedules.size() - 1 == i){
|
|
|
- CourseScheduleStudentPayment scheduleStudentPayment = courseScheduleStudentPayments.get(0);
|
|
|
+ CourseScheduleStudentPayment scheduleStudentPayment = courseScheduleStudentPayments.get(index);
|
|
|
scheduleStudentPayment.setOriginalPrice(scheduleStudentPayment.getOriginalPrice().add(courseSetting.getCourseOriginalPrice().subtract(typeCourseTotalOriginalPrice)));
|
|
|
scheduleStudentPayment.setExpectPrice(scheduleStudentPayment.getExpectPrice().add(courseSetting.getCourseCurrentPrice().subtract(typeCourseTotalCurrentPrice)));
|
|
|
}
|
