系统收费优化

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

@@ -301,6 +301,7 @@ public class MusicGroupSchoolTermCourseDetailServiceImpl extends BaseServiceImpl
 				musicGroupPaymentCalenderDto.setPaymentPattern(1);
 				musicGroupPaymentCalenderDto.setMemberPaymentAmount(memberFee.getCurrentHalfYearFee().setScale(0, BigDecimal.ROUND_HALF_UP));
 				musicGroupPaymentCalenderDto.setAutoCreate(true);
+				musicGroupPaymentCalenderDto.setIsGiveMusicNetwork(false);
 				List<MusicGroupPaymentCalenderDto.MusicGroupPaymentDateRange> musicGroupPaymentDateRangeList = new ArrayList<>();
 				MusicGroupPaymentCalenderDto.MusicGroupPaymentDateRange range = new MusicGroupPaymentCalenderDto().new MusicGroupPaymentDateRange();
 				range.setStartPaymentDate(date);

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

@@ -301,7 +301,7 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
     		}
         }
         if(StringUtils.isNotEmpty(cloudTeacherOrder.getMusicGroupId())){
-            StudentRegistration registration = studentRegistrationDao.findStudentByMusicGroupIdAndUserId(cloudTeacherOrder.getMusicGroupId(), cloudTeacherOrder.getStudentId());
+            StudentRegistration registration = studentRegistrationDao.getByUserIdAndMusicGroupId(cloudTeacherOrder.getMusicGroupId(), cloudTeacherOrder.getStudentId());
             if(registration != null && registration.getMusicGroupStatus() == StudentMusicGroupStatusEnum.NORMAL){
                 student.setMemberMusicGroupId(cloudTeacherOrder.getMusicGroupId());
                 if (student.getMusicMembershipEndTime() == null || nowDate.after(student.getMusicMembershipEndTime())) {