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

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

@@ -31,6 +31,8 @@ public class SysMusicScore {
 		
 	}
 
+	private String extConfigJson;
+
 	/**  */
 	private Integer id;
 	
@@ -114,6 +116,14 @@ public class SysMusicScore {
 
 	private String organName;
 
+	public String getExtConfigJson() {
+		return extConfigJson;
+	}
+
+	public void setExtConfigJson(String extConfigJson) {
+		this.extConfigJson = extConfigJson;
+	}
+
 	public Integer getSubjectId() {
 		return subjectId;
 	}

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

@@ -87,6 +87,16 @@ public class SysMusicScoreAccompaniment {
 	
 	private String track;
 
+	private String extConfigJson;
+
+	public String getExtConfigJson() {
+		return extConfigJson;
+	}
+
+	public void setExtConfigJson(String extConfigJson) {
+		this.extConfigJson = extConfigJson;
+	}
+
 	public String getMetronomeUrl() {
 		return metronomeUrl;
 	}

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

@@ -4603,7 +4603,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
             activityUserMapper.setTeacherId(student.getTeacherId());
             activityUserMapper.setVipFlag(1);
             activityUserMapper.setActualPrice(order.getExpectAmount());
-            activityUserMapper.setTeacherId(order.getTenantId());
+            activityUserMapper.setTenantId(order.getTenantId());
             if (activity.isPayToBalance()) {
                 boolean appendCourseBalance = sysUserCashAccountService.appendCourseBalance(userId, studentPaymentOrder.getExpectAmount(), PlatformCashAccountDetailTypeEnum.RECHARGE, "通用营销活动购买");
                 if (!appendCourseBalance) {

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

@@ -37,6 +37,7 @@
 		<result column="muse_score_url_" property="museScoreUrl" />
 		<result column="muse_score_memo_" property="museScoreMemo" />
 		<result column="track_" property="track" />
+		<result column="ext_config_json_" property="extConfigJson" />
 	</resultMap>
 
 	<delete id="deleteBySongId">
@@ -180,7 +181,7 @@
 	</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_,sesc.parent_id_ parent_categories_id_,ses.client_type_,
-		ses.enable_evaluation_,ses.metronome_url_,ses.midi_url_,ses.play_mode_,ses.render_from_
+		ses.enable_evaluation_,ses.metronome_url_,ses.midi_url_,ses.play_mode_,ses.render_from_,ses.ext_config_json_
 		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_