Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/StudentInfo.java

@@ -18,6 +18,8 @@ public class StudentInfo extends SysUser {
 	
 	private String clazz;
 	
+	private String parentsName;
+	
 	private Subject subject = new Subject();
 
 	public String getName() {
@@ -52,6 +54,14 @@ public class StudentInfo extends SysUser {
 		this.subject = subject;
 	}
 	
+	public String getParentsName() {
+		return parentsName;
+	}
+
+	public void setParentsName(String parentsName) {
+		this.parentsName = parentsName;
+	}
+
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/TeacherAttendance.java

@@ -54,6 +54,17 @@ public class TeacherAttendance {
 	/**  */
 	private java.util.Date createTime;
 
+	public TeacherAttendance() {
+	}
+
+	public TeacherAttendance(Integer teacherId, String musicGroupId, Integer classGroupId, Long courseScheduleId, Date createTime) {
+		this.teacherId = teacherId;
+		this.musicGroupId = musicGroupId;
+		this.classGroupId = classGroupId;
+		this.courseScheduleId = courseScheduleId;
+		this.createTime = createTime;
+	}
+
 	public YesOrNoEnum getSignInStatus() {
 		return signInStatus;
 	}

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

@@ -315,7 +315,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
                     CourseSchedule preCourseSchedule = allCourseSchedules.get(i-j);
                     //后面一节课程
                     CourseSchedule backCourseSchedule = allCourseSchedules.get(i);
-                    //判断前后两届课是否存在冲突
+                    //判断前后两节课是否存在冲突
                     if(backCourseSchedule.getStartClassTime().before(preCourseSchedule.getEndClassTime())){
                         //提示信息
                         StringBuffer errInfo = new StringBuffer("在");

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

@@ -432,7 +432,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
             if (studentRegistration.getClassGroupId() != null) {
                 ClassGroup classGroup = classGroupDao.get(studentRegistration.getClassGroupId());
                 if (classGroup != null) {
-                    if (classGroup.getMusicGroupId().equals(studentRegistration.getMusicGroupId())) {
+                    if (!classGroup.getMusicGroupId().equals(studentRegistration.getMusicGroupId())) {
                         throw new Exception("班级录入错误");
                     } else {
                         //修改实际学生人数

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

@@ -753,14 +753,15 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 		if(Objects.isNull(classGroup)){
 			throw new BizException("课程信息错误");
 		}
-		if(classGroup.getStudentNum()>=classGroup.getExpectStudentNum()){
-			throw new BizException("该课程人数已达上限");
-		}
 
 		StudentPaymentOrder byStudentVipGroup = studentPaymentOrderDao.findByStudentVipGroup(vipGroupBuyParams.getVipGroupId(),
 				user.getId(),
 				DealStatusEnum.ING.getCode());
 
+        if(classGroup.getStudentNum()>=classGroup.getExpectStudentNum()&&Objects.nonNull(byStudentVipGroup)){
+            throw new BizException("该课程人数已达上限");
+        }
+
 		if(Objects.nonNull(byStudentVipGroup)){
 			byStudentVipGroup.setStatus(DealStatusEnum.CLOSE);
 			studentPaymentOrderDao.update(byStudentVipGroup);

mec-biz/src/main/resources/config/contracts/courses.ftl

@@ -80,7 +80,7 @@
         <div style="display: flex;">乙方：
             <div style="flex: 1 auto;">
                 <div class="iInfo">
-                    <span>家长姓名 ${studentInfo.realName!}</span>
+                    <span>家长姓名 ${studentInfo.parentsName!}</span>
                     <span>电话： ${studentInfo.phone!}</span>
                 </div>
                 <div class="iInfo">

mec-biz/src/main/resources/config/contracts/goods.ftl

@@ -79,7 +79,7 @@
         <div style="display: flex;">乙方：
             <div style="flex: 1 auto;">
                 <div class="iInfo">
-                    <span>家长姓名 ${studentInfo.realName!}</span>
+                    <span>家长姓名 ${studentInfo.parentsName!}</span>
                     <span>电话： ${studentInfo.phone!}</span>
                 </div>
                 <div class="iInfo">

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

@@ -55,6 +55,7 @@
         <result column="id_card_no_" property="idCardNo"/>
         <result column="wechat_id_" property="wechatId"/>
         <result column="name_" property="name"/>
+        <result column="parents_name_" property="parentsName"/>
         <result column="current_grade_" property="grade"/>
         <result column="current_class_" property="clazz"/>
         <result column="actual_subject_id_" property="subject.id"/>
@@ -319,7 +320,7 @@
     </update>
 
     <select id="queryStudentInfo" resultMap="StudentInfo">
-        SELECT u.*,sr.name_,sr.current_class_,sr.current_grade_,sr.actual_subject_id_ FROM sys_user u left join
+        SELECT u.*,sr.name_,sr.current_class_,sr.current_grade_,sr.actual_subject_id_,sr.parents_name_ FROM sys_user u left join
         student_registration sr on u.id_ = sr.user_id_ where u.id_ = #{userId} order by sr.create_time_ desc limit 0,1
     </select>
 

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

@@ -32,7 +32,7 @@
 		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
 		</selectKey>
 		-->
-		INSERT INTO student_vip_group_payment (id_,user_id_,vip_group_id_,class_group_id_,create_time_,student_payment_order_id_) VALUES(#{id},#{userId},#{vipGroupId},#{classGroupId},#{createTime},#{studentPaymentOrderId})
+		INSERT INTO student_vip_group_payment (id_,user_id_,vip_group_id_,class_group_id_,create_time_,student_payment_order_id_) VALUES(#{id},#{userId},#{vipGroupId},#{classGroupId},now(),#{studentPaymentOrderId})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->

mec-eureka/src/main/resources/application.yml

@@ -5,7 +5,9 @@ server:
 
 eureka:
   server:
-    peer-eureka-status-refresh-time-interval-ms: 5000
+    enable-self-preservation: false
+    eviction-interval-timer-in-ms: 5000
+    use-read-only-response-cache: false
   client:
     registerWithEureka: false
     fetchRegistry: false