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

# Conflicts:
#	mec-biz/src/main/resources/config/mybatis/CloudTeacherOrderMapper.xml

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

@@ -2,9 +2,7 @@ package com.ym.mec.biz.dal.entity;
 
 import com.ym.mec.biz.dal.enums.ClientTypeEnum;
 import com.ym.mec.biz.dal.enums.ExamSongTypeEnum;
-import com.ym.mec.common.enums.AccessSource;
 import com.ym.mec.common.enums.BaseEnum;
-
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 /**
@@ -360,13 +358,9 @@ public class SysMusicScore {
 
 	public void setMuseScoreMemo(String museScoreMemo) {
 		this.museScoreMemo = museScoreMemo;
-	}	public String getMidiUrl() {
-		return midiUrl;
 	}
 
-	public void setMidiUrl(String midiUrl) {
-		this.midiUrl = midiUrl;
-	}	@Override
+	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);
 	}

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

@@ -327,12 +327,11 @@
                cto.student_id_ as studentId,
                cto.type_ as type,
                case cto.type_
-                   when 'DAY' then '天'
-                   when 'MONTH' then '月'
-                   when 'QUARTERLY' then '季'
-                   when 'YEAR_HALF' then '半年'
-                   when 'YEAR' then '年'
-                   else ''
+					WHEN 'DAY' THEN '天'
+                    WHEN 'MONTH' THEN '月'
+                    WHEN 'QUARTERLY' THEN '季'
+                    WHEN 'YEAR_HALF' THEN '半年'
+                    WHEN 'YEAR' THEN '年' ELSE ''
                end as typeName,
                cto.time_ as time,
                sj.id_ as subject,
@@ -417,11 +416,11 @@
             cto.id_ AS cloudTeacherOrderId,
             cto.student_id_ AS studentId,
             cto.type_ AS type,
-            CASE cto.type_ WHEN 1 THEN '天'
-                WHEN 2 THEN '月'
-                WHEN 3 THEN '季'
-                WHEN 4 THEN '半年'
-                WHEN 5 THEN '年' ELSE ''
+            CASE cto.type_ WHEN 'DAY' THEN '天'
+                WHEN 'MONTH' THEN '月'
+                WHEN 'QUARTERLY' THEN '季'
+                WHEN 'YEAR_HALF' THEN '半年'
+                WHEN 'YEAR' THEN '年' ELSE ''
                 END AS typeName,
             cto.time_ AS time,
             u.tenant_id_ AS tenantId,

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

@@ -85,7 +85,9 @@
 		SELECT sccpd.*,su.username_,su.phone_,spo.pay_time_ FROM student_cloud_coach_payment_details sccpd
 		LEFT JOIN sys_user su ON  su.id_ = sccpd.user_id_
 		LEFT JOIN student_payment_order spo ON spo.music_group_id_ = sccpd.id_
+		AND spo.user_id_ = sccpd.user_id_ AND spo.type_ = 'MEMBER' AND spo.status_ = 'SUCCESS'
 		<include refid="queryPageSql"/>
+		GROUP BY sccpd.id_
 		ORDER BY sccpd.id_
 		<include refid="global.limit"/>
 	</select>