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

# Conflicts:
#	mec-application/src/main/resources/logback-dev.xml

mec-application/src/main/resources/logback-spring.xml

@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration scan="true" scanPeriod="10 seconds">
 
+    <property name="FILE_NAME" value="app" />
+
 <!--    <property name="LOG_HOME" value="${LOG_HOME}"/>-->
     <property name="CONSOLE_LOG_PATTERN"
               value="[%X{username} %X{ip} %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36}] : %msg%n"/>
@@ -27,6 +29,19 @@
         </encoder>
     </appender>
 
+    <appender name="FeignAccessFile" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${LOG_HOME}/${FILE_NAME}-feign.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <fileNamePattern>${LOG_HOME}/%d{yyyyMM,aux}/feign-%d{yyyyMMdd}-%i.log.gz</fileNamePattern>
+            <maxHistory>30</maxHistory>
+            <totalSizeCap>1GB</totalSizeCap>
+            <maxFileSize>20 MB</maxFileSize>
+        </rollingPolicy>
+        <encoder charset="UTF-8">
+            <pattern>[%d{yyyy-MM-dd HH:mm:ss.SSS}] [%t] %p %c{0} %m%n</pattern>
+        </encoder>
+    </appender>
+
     <appender name="messagefile"
               class="ch.qos.logback.core.rolling.RollingFileAppender">
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
@@ -120,6 +135,10 @@
         <Logger name="org.redisson" level="INFO" additivity="false">
             <appender-ref ref="file" level="INFO" />
         </Logger>
+        <!--总控平台Feign接口日志-->
+        <logger name="com.dayaedu.cbs.openfeign.client" level="DEBUG" additivity="false">
+            <appender-ref ref="FeignAccessFile" />
+        </logger>
     </springProfile>
     <!--生产环境:输出到文件 -->
     <springProfile name="pre">
@@ -127,6 +146,10 @@
             <appender-ref ref="file"/>
             <appender-ref ref="plumelog"/>
         </root>
+        <!--总控平台Feign接口日志-->
+        <logger name="com.dayaedu.cbs.openfeign.client" level="DEBUG" additivity="false">
+            <appender-ref ref="FeignAccessFile" />
+        </logger>
     </springProfile>
 
 </configuration>

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

@@ -1989,14 +1989,13 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         //删除续费记录
         musicGroupStudentFeeDao.deleteByMusicGroupId(musicGroupId, null);
 
-        // 删除课表
-        courseScheduleDao.deleteCourseSchedulesByMusicGroupID(musicGroupId, GroupType.MUSIC.getCode());
-        // 删除每节课的课酬
-        courseScheduleStudentPaymentService.deleteByMusicGroupId(musicGroupId, GroupType.MUSIC);
-        courseScheduleTeacherSalaryDao.deleteByMusicGroupId(musicGroupId, GroupType.MUSIC.getCode());
-
-        //删除考勤
-        teacherAttendanceDao.deleteByMusicGroupId(musicGroupId, GroupType.MUSIC.getCode());
+		// 删除每节课的课酬
+		courseScheduleStudentPaymentService.deleteByMusicGroupId(musicGroupId, GroupType.MUSIC);
+		courseScheduleTeacherSalaryDao.deleteByMusicGroupId(musicGroupId, GroupType.MUSIC.getCode());
+		//删除考勤
+		teacherAttendanceDao.deleteByMusicGroupId(musicGroupId, GroupType.MUSIC.getCode());
+		// 删除课表
+		courseScheduleDao.deleteCourseSchedulesByMusicGroupID(musicGroupId, GroupType.MUSIC.getCode());
 
         /*// 查询已缴费信息
         studentPaymentOrders = studentPaymentOrderDao.queryByDealStatus(musicGroupId, OrderTypeEnum.APPLY, SUCCESS);

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

@@ -468,9 +468,9 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
             }
             vipGroupApplyBaseInfoDto.setCourseSchedulesJson(JSON.toJSONString(courseSchedules));
             vipGroupDao.update(vipGroupApplyBaseInfoDto);
-            courseScheduleDao.deleteCourseSchedulesByMusicGroupID(vipGroup1.getId().toString(), vipGroup1.getGroupType());
             courseScheduleTeacherSalaryDao.deleteByMusicGroupId(vipGroup1.getId().toString(), vipGroup1.getGroupType());
             teacherAttendanceDao.deleteByMusicGroupId(vipGroup1.getId().toString(), vipGroup1.getGroupType());
+            courseScheduleDao.deleteCourseSchedulesByMusicGroupID(vipGroup1.getId().toString(), vipGroup1.getGroupType());
             this.liveProgress(vipGroupApplyBaseInfoDto,classGroup);
         }
         if (vipGroup1.getStatus().equals(VipGroupStatusEnum.PROGRESS)) {
@@ -4576,11 +4576,11 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
                     if(CollectionUtils.isEmpty(classGroupStudents)){
                         vipGroup.setStatus(VipGroupStatusEnum.CANCEL);
                         vipGroup.setStopReason("没有学员");
-                        // 删除课表
-                        courseScheduleDao.deleteCourseSchedulesByMusicGroupID(vipGroup.getId().toString(), vipGroup.getGroupType());
                         courseScheduleTeacherSalaryDao.deleteByMusicGroupId(vipGroup.getId().toString(), vipGroup.getGroupType());
                         //删除考勤
                         teacherAttendanceDao.deleteByMusicGroupId(vipGroup.getId().toString(), vipGroup.getGroupType());
+                        // 删除课表
+                        courseScheduleDao.deleteCourseSchedulesByMusicGroupID(vipGroup.getId().toString(), vipGroup.getGroupType());
                         imGroupService.cancel(classGroup.getId().toString());
                         //推送
                         sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.JIGUANG_TEACHER_LIVE_CANCEL,
@@ -4814,11 +4814,11 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
                 vipGroup.setStatus(VipGroupStatusEnum.CANCEL);
                 vipGroup.setUpdateTime(now);
                 vipGroup.setStopReason("没有学员");
-                // 删除课表
-                courseScheduleDao.deleteCourseSchedulesByMusicGroupID(vipGroup.getId().toString(), vipGroup.getGroupType());
                 courseScheduleTeacherSalaryDao.deleteByMusicGroupId(vipGroup.getId().toString(), vipGroup.getGroupType());
                 //删除考勤
                 teacherAttendanceDao.deleteByMusicGroupId(vipGroup.getId().toString(), vipGroup.getGroupType());
+                // 删除课表
+                courseScheduleDao.deleteCourseSchedulesByMusicGroupID(vipGroup.getId().toString(), vipGroup.getGroupType());
             }
             vipGroupDao.batchUpdate(vipGroupList);
             for(VipGroupClassGroupMapper vgcgm : vipGroupClassGroupMapperList){

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

@@ -238,8 +238,7 @@
         #{schoolId},#{isLock},#{note},#{teachingContent},#{organId},#{memberFlag},#{preCourseFlag},#{validEndTime},#{validStartTime},#{tenantId},#{convertFlag})
     </insert>
 
-    <insert id="batchAddCourseSchedules" parameterType="java.util.List" useGeneratedKeys="true" keyColumn="id"
-            keyProperty="id">
+    <insert id="batchAddCourseSchedules" parameterType="java.util.List" keyColumn="id" keyProperty="id">
         INSERT INTO course_schedule
         (id_,group_type_,music_group_id_,class_group_id_,status_,subsidy_,class_date_,start_class_time_,end_class_time_,
         teacher_id_,actual_teacher_id_,type_,name_,teach_mode_,student_num_,leave_student_num_,

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

@@ -612,7 +612,7 @@
 			AND CONCAT(cs.class_date_, ' ', cs.start_class_time_)>NOW() AND cs.pre_course_flag_ != 1
 	</select>
 
-    <delete id="deleteByMusicGroupId" parameterType="map" >
+    <delete id="deleteByMusicGroupId">
 		DELETE cssp FROM course_schedule_teacher_salary cssp
 		LEFT JOIN course_schedule cs on cssp.course_schedule_id_ = cs.id_
 		WHERE cssp.music_group_id_=#{musicGroupId} AND cssp.group_type_=#{groupType} and cs.status_ = 'NOT_START'

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

@@ -768,7 +768,7 @@
         WHERE course_schedule_id_ = #{courseId} AND teacher_id_ = #{userId}
     </update>
 
-    <delete id="deleteByMusicGroupId" parameterType="map" >
+    <delete id="deleteByMusicGroupId">
 		DELETE ta FROM teacher_attendance ta LEFT JOIN course_schedule cs ON ta.course_schedule_id_ = cs.id_
 		WHERE ta.music_group_id_=#{musicGroupId} AND ta.group_type_=#{groupType} and cs.status_ = 'NOT_START'
 	</delete>