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

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/OperatingReportNewDao.java

@@ -83,15 +83,9 @@ public interface OperatingReportNewDao extends BaseDAO<Integer, OperatingReportN
     //付费乐团课学员缴费预收
     List<Map<Integer,BigDecimal>> sumMusicCourseAmount();
 
-    //付费乐团课学校缴费预收
-    List<Map<Integer,BigDecimal>> sumSchoolMusicCourseAmount();
-
     //获取排课资格预收
     List<Map<Integer,BigDecimal>> sumSubActivityUserMapperAmount();
 
-    //导入的销售收入
-    List<Map<Integer,BigDecimal>> sumImportSaleOrderAmount(@Param("month") String month);
-
     //导入的服务收入
     List<Map<Integer,BigDecimal>> sumImportServerOrderAmount(@Param("month") String month);
 }

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

@@ -302,23 +302,14 @@
 		where mgpc.pay_user_type_ = 'STUDENT' AND mgpscd.used_course_minutes_ = 0
 		group by mgpc.organ_id_
 	</select>
-	<select id="sumSchoolMusicCourseAmount" resultType="java.util.Map">
-
-	</select>
 	<select id="sumSubActivityUserMapperAmount" resultType="java.util.Map">
 		select su.organ_id_ 'key',SUM(aum.sub_no_course_price_) 'value' from activity_user_mapper aum
 		LEFT JOIN sys_user su ON su.id_ = aum.user_id_
 		where aum.return_fee_ = 0 AND aum.sub_no_course_price_ > 0
 		group by su.organ_id_
 	</select>
-	<select id="sumImportSaleOrderAmount" resultType="java.util.Map">
-		select spo.organ_id_,SUM(spro.sale_amount_) from student_payment_order spo
-		LEFT JOIN student_payment_route_order spro ON spro.order_no_ = spo.order_no_
-		where spo.group_type_ = 'OUTORDER' AND DATE_FORMAT(spro.pay_time_,'%Y-%m') = #{month}
-		GROUP BY spo.organ_id_;
-	</select>
 	<select id="sumImportServerOrderAmount" resultType="java.util.Map">
-		select spo.organ_id_,SUM(spro.service_amount_) from student_payment_order spo
+		select spo.organ_id_ 'key',SUM(spro.service_amount_) 'value' from student_payment_order spo
 		LEFT JOIN student_payment_route_order spro ON spro.order_no_ = spo.order_no_
 		where spo.group_type_ = 'OUTORDER' AND DATE_FORMAT(spo.create_time_,'%Y-%m') = #{month}
 		GROUP BY spo.organ_id_;