Merge remote-tracking branch 'origin/master'

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

@@ -60,19 +60,19 @@ public class TeacherDefaultMusicGroupSalaryServiceImpl extends BaseServiceImpl<L
 			TeacherDefaultMusicGroupSalary salary = salaries.get(0);
 			Integer userId = salary.getUserId();
 			// 获取老师默认乐团课课酬
-			List<TeacherDefaultMusicGroupSalary> origSalaryList = teacherDefaultMusicGroupSalaryDao.getTeacherSalaryByUserIdAndType(userId, null);
+			/*List<TeacherDefaultMusicGroupSalary> origSalaryList = teacherDefaultMusicGroupSalaryDao.getTeacherSalaryByUserIdAndType(userId, null);
 
 			Map<CourseScheduleType, TeacherDefaultMusicGroupSalary> map = new HashMap<CourseScheduleType, TeacherDefaultMusicGroupSalary>();
 			if (origSalaryList != null && origSalaryList.size() > 0) {
 				for (TeacherDefaultMusicGroupSalary ms : origSalaryList) {
 					map.put(ms.getCourseScheduleType(), ms);
 				}
-			}
+			}*/
 
 			Map<CourseScheduleType, TeacherDefaultMusicGroupSalary> salaryMap = new HashMap<CourseScheduleType, TeacherDefaultMusicGroupSalary>();
 			for (TeacherDefaultMusicGroupSalary ms : salaries) {
 				// 修改了哪些课酬
-				TeacherDefaultMusicGroupSalary oldMS = map.get(ms.getCourseScheduleType());
+				/*TeacherDefaultMusicGroupSalary oldMS = map.get(ms.getCourseScheduleType());
 
 				if (oldMS == null || oldMS.getAssistantTeacher30MinSalary() == null || oldMS.getMainTeacher30MinSalary() == null
 						|| oldMS.getAssistantTeacher90MinSalary() == null || oldMS.getMainTeacher90MinSalary() == null
@@ -81,8 +81,8 @@ public class TeacherDefaultMusicGroupSalaryServiceImpl extends BaseServiceImpl<L
 						|| oldMS.getAssistantTeacher90MinSalary().doubleValue() != ms.getAssistantTeacher90MinSalary().doubleValue()
 						|| oldMS.getMainTeacher90MinSalary().doubleValue() != ms.getMainTeacher90MinSalary().doubleValue()) {
 					salaryMap.put(ms.getCourseScheduleType(), ms);
-				}
-
+				}*/
+				salaryMap.put(ms.getCourseScheduleType(), ms);
 			}
 
 			if (salaryMap.size() > 0) {

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

@@ -70,26 +70,26 @@ public class TeacherDefaultVipGroupSalaryServiceImpl extends BaseServiceImpl<Lon
 			TeacherDefaultVipGroupSalary salary = teacherDefaultVipGroupSalaries.get(0);
 			Integer userId = salary.getUserId();
 			// 获取老师默认VIP课课酬
-			List<TeacherDefaultVipGroupSalary> origSalaryList = teacherDefaultVipGroupSalaryDao.queryByUserId(userId);
+			/*List<TeacherDefaultVipGroupSalary> origSalaryList = teacherDefaultVipGroupSalaryDao.queryByUserId(userId);
 
 			Map<Integer, TeacherDefaultVipGroupSalary> map = new HashMap<Integer, TeacherDefaultVipGroupSalary>();
 			if (origSalaryList != null && origSalaryList.size() > 0) {
 				for (TeacherDefaultVipGroupSalary ms : origSalaryList) {
 					map.put(ms.getVipGroupCategoryId(), ms);
 				}
-			}
+			}*/
 
 			Map<Integer, TeacherDefaultVipGroupSalary> salaryMap = new HashMap<Integer, TeacherDefaultVipGroupSalary>();
 			for (TeacherDefaultVipGroupSalary ms : teacherDefaultVipGroupSalaries) {
 				// 修改了哪些课酬
-				TeacherDefaultVipGroupSalary oldMS = map.get(ms.getVipGroupCategoryId());
+				/*TeacherDefaultVipGroupSalary oldMS = map.get(ms.getVipGroupCategoryId());
 
 				if (oldMS == null || oldMS.getOfflineClassesSalary() == null
 						|| oldMS.getOfflineClassesSalary().doubleValue() != ms.getOfflineClassesSalary().doubleValue()
 						|| oldMS.getOnlineClassesSalary() == null || oldMS.getOnlineClassesSalary().doubleValue() != ms.getOnlineClassesSalary().doubleValue()) {
 					salaryMap.put(ms.getVipGroupCategoryId(), ms);
-				}
-
+				}*/
+				salaryMap.put(ms.getVipGroupCategoryId(), ms);
 			}
 
 			if (salaryMap.size() > 0) {

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

@@ -425,6 +425,6 @@
 
 	<select id="queryUserNoSettlementListByTypeAndStartClassDate" resultMap="CourseScheduleTeacherSalary">
 		SELECT ts.*,cs.type_,cs.teach_mode_,cs.class_date_,cs.start_class_time_,cs.end_class_time_ FROM course_schedule_teacher_salary ts LEFT JOIN course_schedule cs ON ts.course_schedule_id_ = cs.id_
-		WHERE cs.type_ IN (#{typeList}) AND ts.user_id_ = #{userId} AND ts.settlement_time_ IS NULL AND cs.class_date_ &gt;= #{startClassDate}
+		WHERE FIND_IN_SET(cs.type_, #{typeList}) AND ts.user_id_ = #{userId} AND ts.settlement_time_ IS NULL AND cs.class_date_ &gt;= #{startClassDate}
 	</select>
 </mapper>

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

@@ -318,7 +318,7 @@
     	select count(cs.id_) from course_schedule cs
         left join demo_group vg on cs.music_group_id_ = vg.id_
         where cs.type_ = 'DEMO'
-  		and DATE_FORMAT(cs.class_date_, '%Y%m' ) = DATE_FORMAT(CURDATE() , '%Y%m')
+  		and DATE_FORMAT(cs.class_date_, '%Y%m' ) = DATE_FORMAT(CURDATE() , '%Y%m') and (cs.del_flag_ = 0 or cs.del_flag_ is null)
         <if test="organIds != null">
             AND INTE_ARRAY(vg.organ_id_list_,#{organIds})
         </if>

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

@@ -351,7 +351,7 @@
 		left join class_group cg on cs.class_group_id_ = cg.id_
 		left join music_group mg on cg.music_group_id_ = mg.id_
 		where cs.group_type_ = 'MUSIC' AND cg.group_type_ = 'MUSIC'
-  		and DATE_FORMAT(cs.class_date_, '%Y%m' ) = DATE_FORMAT(CURDATE() , '%Y%m')
+  		and DATE_FORMAT(cs.class_date_, '%Y%m' ) = DATE_FORMAT(CURDATE() , '%Y%m') and (cs.del_flag_ = 0 or cs.del_flag_ is null)
    		<if test="organId != null">
    			AND FIND_IN_SET(mg.organ_id_,#{organId})
    		</if>

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

@@ -752,7 +752,7 @@
     
     <select id="queryCurrentMonthCoursesNum" resultType="int">
     	select count(cs.id_) from course_schedule cs left join vip_group vg on cs.music_group_id_ = vg.id_ where cs.type_ in ('VIP')
-  		and DATE_FORMAT(cs.class_date_, '%Y%m' ) = DATE_FORMAT(CURDATE() , '%Y%m')
+  		and DATE_FORMAT(cs.class_date_, '%Y%m' ) = DATE_FORMAT(CURDATE() , '%Y%m') and (cs.del_flag_ = 0 or cs.del_flag_ is null)
    		<if test="organId != null">
    		    AND FIND_IN_SET(vg.organ_id_,#{organId})
    		</if>
@@ -788,7 +788,7 @@
     </select>
     
     <select id="queryByIds" resultMap="VipGroup" parameterType="string">
-    	select * from vip_group where id_ in (#{idList})
+    	select * from vip_group where FIND_IN_SET(id_,#{idList})
     </select>
     <resultMap id="VipBuyResult" type="com.ym.mec.biz.dal.dto.VipBuyResultDto">
         <result property="vipGroupId" column="id_"/>