Merge branch 'saas' of http://git.dayaedu.com/yonge/mec into zx_saas_2022_degree

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

@@ -2,6 +2,7 @@ package com.ym.mec.biz.service.impl;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -114,10 +115,13 @@ public class PayServiceImpl implements PayService {
 		if (studentPaymentOrder != null && studentPaymentOrder.getType() == OrderTypeEnum.SMALL_CLASS_TO_BUY || studentPaymentOrder.getType() == OrderTypeEnum.PRACTICE_GROUP_BUY
 				|| studentPaymentOrder.getType() == OrderTypeEnum.PRACTICE_GROUP_RENEW) {
 			
+			//忽略的分部
+			List<Integer> ignoreOrganList = Arrays.asList(4);
+			
 			// 是否由平台收款
 			String isPlatformCollection = sysConfigDao.findConfigValue(SysConfigService.IS_OPEN_SMALL_CLASS_INCOME_TO_PLATFORM);
 			
-			if (StringUtils.equals("1", isPlatformCollection)) {
+			if (StringUtils.equals("1", isPlatformCollection) && !ignoreOrganList.contains(organId)) {
 				Date date = new Date();
 	        	
 	        	String merNo = sysConfigDao.findConfigValue(SysConfigService.PLATFORM_PAYEE_ACCOUNT);

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

@@ -111,7 +111,10 @@
 	</select>
     <select id="queryByScoreIdAndCourseId"
             resultMap="CourseScheduleStudentMusicScore">
-        SELECT cssm.*,smsa.mp3_url_,sms.url_,sms.name_ music_score_name_  FROM course_schedule_student_music_score cssm
+        SELECT cssm.*,
+        CASE WHEN smsa.metronome_mp3_url_ IS NULL OR smsa.metronome_mp3_url_ = '' THEN smsa.mp3_url_ ELSE smsa.metronome_mp3_url_ END url_,
+        sms.url_ mp3_url_,sms.name_ music_score_name_
+        FROM course_schedule_student_music_score cssm
         LEFT JOIN sys_music_score_accompaniment smsa ON cssm.music_score_accompaniment_id_ = smsa.id_
         LEFT JOIN sys_music_score sms ON sms.id_ = smsa.exam_song_id_
         <where>