Merge branch 'online1'

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

@@ -348,15 +348,17 @@ public class SubjectChangeServiceImpl extends BaseServiceImpl<Integer, SubjectCh
         //差价小于0退到余额
         if (amountMargin.compareTo(BigDecimal.ZERO) <= 0) {
 //            sysUserCashAccountService.updateBalance(subjectChange.getStudentId(), amountMargin.negate(), PlatformCashAccountDetailTypeEnum.REFUNDS, "声部更换退还");
-            SysUserCashAccountLog sysUserCashAccountLog = new SysUserCashAccountLog();
-            sysUserCashAccountLog.setUserId(subjectChange.getStudentId());
-            sysUserCashAccountLog.setGroupType(SUBJECT_CHANGE);
-            sysUserCashAccountLog.setOrganId(subjectChange.getOrganId());
-            sysUserCashAccountLog.setGroupId(subjectChange.getId().toString());
-            sysUserCashAccountLog.setAmount(amountMargin.negate());
-            sysUserCashAccountLog.setReturnFeeType(ReturnFeeEnum.SUBJECT_CHANGE);
-            sysUserCashAccountLog.setComment("声部更换退还");
-            sysUserCashAccountLogDao.insert(sysUserCashAccountLog);
+            if(amountMargin.compareTo(BigDecimal.ZERO) < 0){
+                SysUserCashAccountLog sysUserCashAccountLog = new SysUserCashAccountLog();
+                sysUserCashAccountLog.setUserId(subjectChange.getStudentId());
+                sysUserCashAccountLog.setGroupType(SUBJECT_CHANGE);
+                sysUserCashAccountLog.setOrganId(subjectChange.getOrganId());
+                sysUserCashAccountLog.setGroupId(subjectChange.getId().toString());
+                sysUserCashAccountLog.setAmount(amountMargin.negate());
+                sysUserCashAccountLog.setReturnFeeType(ReturnFeeEnum.SUBJECT_CHANGE);
+                sysUserCashAccountLog.setComment("声部更换退还");
+                sysUserCashAccountLogDao.insert(sysUserCashAccountLog);
+            }
             studentRegistrationService.changeStudentSubject(subjectChange.getStudentId(), subjectChange.getMusicGroupId(), subjectChange.getOriginalSubjectId(), subjectChange.getChangeSubjectId());
         }
 

mec-biz/src/main/resources/config/mybatis/SysMusicScoreAccompanimentMapper.xml

@@ -160,7 +160,7 @@
 		</where>
 	</select>
 	<select id="queryAccPage" resultMap="SysMusicScoreAccompaniment">
-		SELECT sesa.*,ses.name_,ses.type_,ses.url_,s.name_ subject_name_,sesc.name_ categories_name_,sesc.id_ categories_id_,ses.client_type_
+		SELECT sesa.*,ses.name_,ses.type_,ses.url_,s.name_ subject_name_,sesc.name_ categories_name_,sesc.id_ categories_id_,sesc.parent_id_ parent_categories_id_,ses.client_type_
 		FROM sys_music_score ses
 		LEFT JOIN sys_music_score_accompaniment sesa ON ses.id_ = sesa.exam_song_id_
 		LEFT JOIN sys_music_score_categories sesc ON sesc.id_ = ses.music_score_categories_id_