Merge branch 'online1' of http://git.dayaedu.com/yonge/mec into music_score_zouxuan

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/SysMusicScoreAccompaniment.java

@@ -43,6 +43,8 @@ public class SysMusicScoreAccompaniment {
 
 	/**  */
 	private Integer categoriesId;
+	
+	private Integer parentCategoriesId;
 
 	/**  */
 	private String type;
@@ -115,6 +117,14 @@ public class SysMusicScoreAccompaniment {
 		this.categoriesId = categoriesId;
 	}
 
+	public Integer getParentCategoriesId() {
+		return parentCategoriesId;
+	}
+
+	public void setParentCategoriesId(Integer parentCategoriesId) {
+		this.parentCategoriesId = parentCategoriesId;
+	}
+
 	public String getCategoriesName() {
 		return categoriesName;
 	}

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

@@ -17,6 +17,7 @@
 		<result column="name_" property="examSongName" />
 		<result column="categories_name_" property="categoriesName" />
 		<result column="categories_id_" property="categoriesId" />
+		<result column="parent_categories_id_" property="parentCategoriesId" />
 		<result column="type_" property="type" />
 		<result column="url_" property="url" />
 		<result column="del_flag_" property="delFlag" />
@@ -124,7 +125,7 @@
 	
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="SysMusicScoreAccompaniment" parameterType="map">
-		SELECT sesa.*,ses.name_,ses.type_,ses.url_,s.name_ subject_name_,sesc.name_ categories_name_,sesc.id_ categories_id_,ses.client_type_,ses.rank_ids_
+		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_,ses.rank_ids_
 		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_