Merge remote-tracking branch 'origin/master'

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

@@ -90,6 +90,7 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 
 		teacherAttendance.setMusicGroupId(currentCourseDetail.getMusicGroupId());
 		teacherAttendance.setClassGroupId(currentCourseDetail.getClassId());
+		teacherAttendance.setRemark(teacherSignOutDto.getTeacherAttendanceInfo().getRemark());
 		Date date = new Date();
 		if(teacherSignOutDto.getTeacherAttendanceInfo().getStatus().equals(SignStatusEnum.SIGN_IN.getCode())){
 

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

@@ -212,7 +212,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 		classGroup.setExpectStudentNum(vipGroupApplyBaseInfoDto.getStudentNum());
 		classGroup.setTotalClassTimes(totalClassTimes);
 		classGroup.setType(ClassGroupTypeEnum.VIP);
-		classGroup.setDelFlag(YesOrNoEnum.NO);
+		classGroup.setDelFlag(YesOrNoEnum.YES);
 		classGroup.setMusicGroupId(vipGroupApplyBaseInfoDto.getId().toString());
 		classGroup.setCreateTime(now);
 		classGroup.setUpdateTime(now);
@@ -745,6 +745,8 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 		SysUser sysUser = sysUserFeignService.queryUserById(vipGroupApplyBaseInfoDto.getUserId());
 
 		ClassGroup classGroup = classGroupDao.findByVipGroup(vipGroupId);
+        classGroup.setDelFlag(YesOrNoEnum.NO);
+        classGroupDao.update(classGroup);
 
 		ClassGroupTeacherSalary classGroupTeacherSalary = classGroupTeacherSalaryDao.findByVipGoupAndTeacher(vipGroupId.intValue(), vipGroupApplyBaseInfoDto.getUserId());
 

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

@@ -106,10 +106,9 @@
             class_group_student_mapper cgsm
             LEFT JOIN class_group cg ON cgsm.class_group_id_ = cg.id_
             LEFT JOIN sys_user su ON cgsm.user_id_ = su.id_
-            LEFT JOIN music_group_student_fee_ mgsf ON cg.music_group_id_=mgsf.music_group_id_
+            LEFT JOIN music_group_student_fee_ mgsf ON cg.music_group_id_=mgsf.music_group_id_ AND su.id_ = mgsf.user_id_
         WHERE
             cgsm.class_group_id_ = #{classGroupId}
-        GROUP BY su.id_,mgsf.continuous_absenteeism_times_
         ORDER BY su.id_
         <include refid="global.limit"/>
     </select>

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

@@ -194,7 +194,7 @@
         WHERE spo.user_id_=#{userId}
             AND spo.music_group_id_=#{vipGroupId}
             AND spo.status_=#{status}
-            and spo.type_ = 'SMALL_CLASS_TO_BUY'
+            AND spo.type_ = 'SMALL_CLASS_TO_BUY' FOR UPDATE
     </select>
     <!-- 查询报名订单 -->
     <select id="findMusicGroupApplyOrderByStatus" resultMap="StudentPaymentOrder">