Merge branch 'master' of http://git.dayaedu.com/yonge/mec

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

@@ -103,17 +103,18 @@ public class SysUserCashAccountServiceImpl extends BaseServiceImpl<Integer, SysU
 		cashAccount.setUpdateTime(date);
 
 		sysUserCashAccountDao.update(cashAccount);
-
-		//推送余额消费信息
-		Map<Integer,String> phoneMap = new HashMap<>(1);
-		SysUser sysUser = sysUserFeignService.queryUserById(userId);
-		phoneMap.put(userId,sysUser.getPhone());
-		sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.YIMEI, MessageTypeEnum.STUDENT_SMS_BALANCE_CONSUME,
-				phoneMap,null,0,null,"",decimal,balance);
-		Map<Integer,String> idMap = new HashMap<>(1);
-		idMap.put(userId,userId.toString());
-		sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.STUDENT_SMS_BALANCE_CONSUME,
-				idMap,null,0,null,"",decimal,balance);
+		if(!decimal.equals(BigDecimal.ZERO)){
+			//推送余额消费信息
+			Map<Integer,String> phoneMap = new HashMap<>(1);
+			SysUser sysUser = sysUserFeignService.queryUserById(userId);
+			phoneMap.put(userId,sysUser.getPhone());
+			sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.YIMEI, MessageTypeEnum.STUDENT_SMS_BALANCE_CONSUME,
+					phoneMap,null,0,null,"",decimal,balance);
+			Map<Integer,String> idMap = new HashMap<>(1);
+			idMap.put(userId,userId.toString());
+			sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.STUDENT_SMS_BALANCE_CONSUME,
+					idMap,null,0,null,"",decimal,balance);
+		}
 		return true;
 	}
 

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

@@ -334,23 +334,25 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 					//减去第一节课时长
 					int firstMinutes = courseScheduleDao.getSingleClassMinutes(courseScheduleId.longValue());
 					totalMinutes -= firstMinutes;
-					String courseClassDate;
-					String courseStartDateTime;
-					String courseEndDateTime;
-					for (CourseSchedule e:courseSchedules) {
-						//获取当前课程的单节课时长
-						int signClassMinutes = courseScheduleDao.getSingleClassMinutes(e.getId());
-						totalMinutes -= signClassMinutes;
-						if(totalMinutes >= 0){
-							//补充签到签退时间
-							courseClassDate = DateUtil.format(e.getClassDate(), DateUtil.DEFAULT_PATTERN);
-							courseStartDateTime = DateUtil.format(e.getStartClassTime(), DateUtil.EXPANDED_TIME_FORMAT);
-							courseEndDateTime = DateUtil.format(e.getEndClassTime(), DateUtil.EXPANDED_TIME_FORMAT);
-							Date startDateTime = DateUtil.stringToDate(courseClassDate + " " + courseStartDateTime, DateUtil.EXPANDED_DATE_TIME_FORMAT);
-							Date endDateTime = DateUtil.stringToDate(courseClassDate + " " + courseEndDateTime, DateUtil.EXPANDED_DATE_TIME_FORMAT);
-							teacherAttendanceDao.cuntinueCourseSign(e.getId(),startDateTime,endDateTime);
-						}else {
-							break;
+					if(totalMinutes > 0){
+						String courseClassDate;
+						String courseStartDateTime;
+						String courseEndDateTime;
+						for (CourseSchedule e:courseSchedules) {
+							//获取当前课程的单节课时长
+							int signClassMinutes = courseScheduleDao.getSingleClassMinutes(e.getId());
+							totalMinutes -= signClassMinutes;
+							if(totalMinutes >= 0){
+								//补充签到签退时间
+								courseClassDate = DateUtil.format(e.getClassDate(), DateUtil.DEFAULT_PATTERN);
+								courseStartDateTime = DateUtil.format(e.getStartClassTime(), DateUtil.EXPANDED_TIME_FORMAT);
+								courseEndDateTime = DateUtil.format(e.getEndClassTime(), DateUtil.EXPANDED_TIME_FORMAT);
+								Date startDateTime = DateUtil.stringToDate(courseClassDate + " " + courseStartDateTime, DateUtil.EXPANDED_DATE_TIME_FORMAT);
+								Date endDateTime = DateUtil.stringToDate(courseClassDate + " " + courseEndDateTime, DateUtil.EXPANDED_DATE_TIME_FORMAT);
+								teacherAttendanceDao.cuntinueCourseSign(e.getId(),startDateTime,endDateTime);
+							}else {
+								break;
+							}
 						}
 					}
 				}
@@ -362,16 +364,6 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 			}
 			teacherAttendance.setSignOutTime(date);
 			teacherAttendanceDao.update(teacherAttendance);
-			//教师签退后，给未签到学员添加旷课记录
-//			List<StudentAttendance> studentAttendances = studentAttendanceDao.queryNoSignStudentRecord(courseScheduleId);
-//			if(studentAttendances != null && studentAttendances.size() > 0){
-//				studentAttendances.forEach(e->{
-//					e.setTeacherId(userId);
-//					e.setStatus(StudentAttendanceStatusEnum.TRUANT);
-//					e.setRemark("学员未到，自动补旷课");
-//				});
-//				studentAttendanceDao.addStudentAttendances(studentAttendances);
-//			}
 		}
 	}
 

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

@@ -2166,13 +2166,14 @@
             cs.update_time_,
             cs.teach_mode_,
             cs.type_,
-            cs.name_,
+            cg.name_,
             cs.student_num_,
             cs.leave_student_num_,
             cs.schoole_id_
         FROM
             course_schedule_teacher_salary csts
             LEFT JOIN course_schedule cs ON csts.course_schedule_id_ = cs.id_
+            LEFT JOIN class_group cg ON  cg.id_=csts.class_group_id_
         WHERE
             (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
             AND csts.user_id_ = #{userId}

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

@@ -307,7 +307,7 @@
             AND vg.registration_start_time_ <= NOW()
             AND vg.courses_start_date > NOW()
             AND (select count(1) as num from student_payment_order where vg.id_ = music_group_id_ AND user_id_=#{userId} AND status_='SUCCESS') = 0
-            AND (vg.organ_id_ = #{organId} OR FIND_IN_SET(#{userId}, vg.student_id_list_))
+            AND vg.organ_id_ = #{organId} AND IF(vg.student_id_list_ IS NULL,1,FIND_IN_SET(#{userId}, vg.student_id_list_))
             <if test="subjectId!=null">
                AND FIND_IN_SET(#{subjectId},cg.subject_id_list_)
             </if>

mec-im/src/main/java/com/ym/service/Impl/RoomServiceImpl.java

@@ -1139,7 +1139,7 @@ public class RoomServiceImpl implements RoomService {
         if(byRidAndUid.size() > 0){
             SysUser sysUser = sysUserFeignService.queryUserById(Integer.parseInt(userId));
             Teacher teacher = teacherDao.get(sysUser.getId());
-            CourseSchedule courseSchedule = courseScheduleDao.get(Long.parseLong(roomId));
+            CourseSchedule courseSchedule = courseScheduleDao.get(Long.parseLong(roomId.substring(4)));
             try {
                 if(teacher != null && teacher.getId().equals(courseSchedule.getActualTeacherId())){
                     teacherAttendanceService.addTeacherAttendanceRecord(Integer.parseInt(roomId.substring(4)),Integer.parseInt(userId), SignStatusEnum.SIGN_OUT,true);