|
@@ -516,7 +516,14 @@ public class CourseScheduleStudentPaymentServiceImpl extends BaseServiceImpl<Lon
|
|
|
detail.setSubCourseOriginalPrice(detail.getSubCourseCurrentPrice().subtract(expectPrice));
|
|
|
courseMinutes = 0;
|
|
|
}
|
|
|
- if(MusicGroupPaymentCalender.PayUserType.SCHOOL.equals(calenderMap.get(detail.getMusicGroupPaymentCalenderId()).get(0).getPayUserType())){
|
|
|
+ MusicGroupPaymentCalender calender = calenderMap.get(detail.getMusicGroupPaymentCalenderId()).get(0);
|
|
|
+ if(StringUtils.isEmpty(studentPayment.getBatchNo())){
|
|
|
+ studentPayment.setBatchNo(calender.getBatchNo());
|
|
|
+ }else {
|
|
|
+ studentPayment.setBatchNo(studentPayment.getBatchNo() + "," + calender.getBatchNo());
|
|
|
+ }
|
|
|
+
|
|
|
+ if(MusicGroupPaymentCalender.PayUserType.SCHOOL.equals(calender.getPayUserType())){
|
|
|
studentPayment.setExpectPrice(BigDecimal.ZERO);
|
|
|
}
|
|
|
if(courseMinutes == 0){
|