Merge branch '20221101' into master_saas

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

@@ -351,11 +351,18 @@ public class StudentInstrumentServiceImpl extends BaseServiceImpl<Long, StudentI
 
     @Override
     public Boolean subjectChangeUpdateInstrument(SubjectChange subjectChange) {
+    	
         StudentInstrument studentInstrument = null;
     	
 		if (subjectChange.getOriginalOrderId() != null) {
             studentInstrument = studentInstrumentDao.getByOrderId(subjectChange.getOriginalOrderId().longValue());
 		}
+    	if(subjectChange.getChangeMusical() == null){
+    		if(studentInstrument != null){
+    			studentInstrumentDao.delete(studentInstrument.getId());
+    		}
+    		return true;
+    	}
 		
 		Date date = new Date();
         

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

@@ -499,6 +499,13 @@ public class SubjectChangeServiceImpl extends BaseServiceImpl<Integer, SubjectCh
                 throw new BizException("声部更换失败，当前用户是0元入团，且当前声部已有0元入团学生");
             }
         }
+        
+        if(StringUtils.isBlank(subjectChange.getChangeAccessories()) && StringUtils.isBlank(subjectChange.getOriginalAccessories())
+        		&& subjectChange.getOriginalMusical() == null && subjectChange.getChangeMusical() == null){
+        	studentRegistrationService.changeStudentSubject(subjectChange.getStudentId(), subjectChange.getMusicGroupId(), subjectChange.getOriginalSubjectId(), subjectChange.getChangeSubjectId());
+        	return subjectChange;
+        }
+        
         Date nowDate = new Date();
         SubjectChange lastSubjectChange = getStudentOriginal(subjectChange.getStudentId(), subjectChange.getMusicGroupId());
         if (lastSubjectChange != null) {