合班缴费

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

@@ -728,7 +728,9 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         }
         //新课程形态
         List<MusicGroupPaymentCalenderCourseSettings> newCourses;
-        if (calender.getPayUserType() == PayUserType.STUDENT && registerPayDto.getNewCourse() != null && registerPayDto.getNewCourse().size() > 0) {
+        //因为前端会传newCourse过来所以这里加了合班缴费判断
+        if (calender.getPaymentType() != PaymentType.SPAN_GROUP_CLASS_ADJUST &&
+                calender.getPayUserType() == PayUserType.STUDENT && registerPayDto.getNewCourse() != null && registerPayDto.getNewCourse().size() > 0) {
             newCourses = musicGroupPaymentCalenderCourseSettingsDao.getCalenderCourseSettings(registerPayDto.getNewCourse());
             for (MusicGroupPaymentCalenderCourseSettings calenderCourseSetting : newCourses) {
                 if (goodsDto.isRemitCourseRFeeFlag()) {