Merge remote-tracking branch 'origin/master'

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

@@ -594,7 +594,7 @@
     <select id="getFeeByType" resultType="com.ym.mec.biz.dal.dto.StudentPaymentOrderExportDto">
         SELECT MAX(spo.expect_amount_)                                expectAmount,
                SUM(IF(g.type_ = 'INSTRUMENT', so.expect_amount_, 0))  musicalFee,
-               SUM(IF(g.type_ != 'INSTRUMENT', so.expect_amount_, 0)) teachingFee
+               SUM(IF(g.type_ != 'INSTRUMENT' || g.type_ IS NULL, so.expect_amount_, 0)) teachingFee
         FROM student_payment_order spo
                  LEFT JOIN sell_order so ON spo.id_ = so.order_id_
                  LEFT JOIN goods g ON IF(so.parent_goods_id_ IS NOT NULL,g.id_ = so.parent_goods_id_,g.id_ = so.goods_id_)

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

@@ -722,9 +722,10 @@
     	select sr.*,s.name_ subject_name_,mg.status_ music_group_status_,mg.name_ music_group_name_,mgq.status_ music_group_quit_status_ 
     	from student_registration sr left join subject s on s.id_ = sr.actual_subject_id_
     	left join music_group mg on sr.music_group_id_ = mg.id_
-    	left join (select mgq.* from music_group_quit mgq LEFT JOIN student_registration sr ON mgq.music_group_id_ = sr.music_group_id_ AND mgq.user_id_ = sr.user_id_ AND mgq.join_date_ = sr.create_time_
-		 where mgq.id_ in (select max(id_) from music_group_quit group by music_group_id_,user_id_)) mgq  on mgq.music_group_id_ = mg.id_
-    	where sr.user_id_ = #{userId}
-    	order by sr.id_
+    	left join (select mgq.* from music_group_quit mgq 
+		 where mgq.id_ in (select max(id_) from music_group_quit group by music_group_id_,user_id_)) mgq  ON mgq.music_group_id_ = sr.music_group_id_ 
+		 AND mgq.user_id_ = sr.user_id_ AND mgq.join_date_ = sr.create_time_
+    	where sr.user_id_ = #{userId} 
+    	order by sr.id_ 
     </select>
 </mapper>