Merge branch 'online1'

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentRegistrationServiceImpl.java

@@ -430,7 +430,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
                 if (courseRemitFee.compareTo(BigDecimal.ZERO) > 0 && !newCourse.getIsStudentOptional()) {
                     studentPaymentOrderDetailCourse.setPrice(BigDecimal.ZERO);
                     studentPaymentOrderDetailCourse.setRemitFee(newCourse.getCourseCurrentPrice());
-                }else {
+                } else {
                     studentPaymentOrderDetailCourse.setPrice(newCourse.getCourseCurrentPrice());
                     studentPaymentOrderDetailCourse.setRemitFee(BigDecimal.ZERO);
                 }
@@ -573,7 +573,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
                 if (courseRemitFee.compareTo(BigDecimal.ZERO) > 0 && !newCourse.getIsStudentOptional()) {
                     studentPaymentOrderDetailCourse.setPrice(BigDecimal.ZERO);
                     studentPaymentOrderDetailCourse.setRemitFee(newCourse.getCourseCurrentPrice());
-                }else {
+                } else {
                     studentPaymentOrderDetailCourse.setPrice(newCourse.getCourseCurrentPrice());
                     studentPaymentOrderDetailCourse.setRemitFee(BigDecimal.ZERO);
                 }
@@ -1132,7 +1132,11 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
 
             if (currentPaymentCalenderId.longValue() == musicGroupPaymentCalender.getId()) {
                 musicGroupPaymentCalenderDetail.setExpectAmount(courseTotalPrice);
-                musicGroupPaymentCalenderDetail.setActualAmount(courseTotalPrice);
+                if (studentPaymentOrder.getCourseRemitFee() != null && (studentPaymentOrder.getCourseRemitFee().compareTo(BigDecimal.ZERO) > 0)) {
+                    musicGroupPaymentCalenderDetail.setActualAmount(BigDecimal.ZERO);
+                } else {
+                    musicGroupPaymentCalenderDetail.setActualAmount(courseTotalPrice);
+                }
                 musicGroupPaymentCalenderDetail.setPaymentStatus(MusicGroupStudentFee.PaymentStatus.PAID_COMPLETED);
                 musicGroupPaymentCalenderDetail.setPayTime(nowDate);
                 musicGroupPaymentCalenderDetail.setPaymentOrderId(studentPaymentOrder.getId());