1、课程名字生成调整

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

@@ -7,6 +7,8 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 import com.ym.mec.biz.dal.enums.ClassGroupStudentStatusEnum;
 import com.ym.mec.biz.dal.enums.GroupType;
 
+import java.util.Date;
+
 /**
  * 对应数据库表(class_group_student_mapper):
  */
@@ -38,6 +40,16 @@ public class ClassGroupStudentMapper {
 
 	private String userName;
 
+	private Date updateTime;
+
+	public Date getUpdateTime() {
+		return updateTime;
+	}
+
+	public void setUpdateTime(Date updateTime) {
+		this.updateTime = updateTime;
+	}
+
 	public String getUserName() {
 		return userName;
 	}

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

@@ -1131,7 +1131,11 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                 courseSchedule.setTeachMode(TeachModeEnum.OFFLINE);
                 courseSchedule.setType(classGroup4MixDto.getCourseType());
                 courseSchedule.setGroupType(GroupType.MUSIC);
-                courseSchedule.setName(subjectNames + "-" + CourseSchedule.CourseScheduleType.SINGLE.getMsg());
+                if(classGroup4MixDto.getCourseType().equals(CourseSchedule.CourseScheduleType.MIX)){
+                    courseSchedule.setName(classGroup4MixDto.getCourseType().getMsg());
+                }else{
+                    courseSchedule.setName(subjectNames + "-" + CourseSchedule.CourseScheduleType.SINGLE.getMsg());
+                }
                 courseSchedule.setTeacherId(teacherId);
                 courseSchedule.setActualTeacherId(teacherId);
                 courseScheduleDao.insert(courseSchedule);
@@ -1328,7 +1332,11 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                 courseSchedule.setTeachMode(TeachModeEnum.OFFLINE);
                 courseSchedule.setMusicGroupId(classGroup.getMusicGroupId());
                 courseSchedule.setType(classGroup4MixDto.getCourseType());
-                courseSchedule.setName(subjectNames + "-" + classGroup4MixDto.getCourseType().getMsg());
+                if(classGroup4MixDto.getCourseType().equals(CourseSchedule.CourseScheduleType.MIX)){
+                    courseSchedule.setName(classGroup4MixDto.getCourseType().getMsg());
+                }else{
+                    courseSchedule.setName(subjectNames + "-" + classGroup4MixDto.getCourseType().getMsg());
+                }
                 courseSchedule.setGroupType(GroupType.MUSIC);
                 courseSchedule.setTeacherId(teacherId);
                 courseSchedule.setActualTeacherId(teacherId);
@@ -1548,7 +1556,11 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                 courseSchedule.setType(classGroup4MixDto.getCourseType());
                 courseSchedule.setGroupType(GroupType.MUSIC);
                 courseSchedule.setMusicGroupId(classGroup.getMusicGroupId());
-                courseSchedule.setName(subjectNames + "-" + classGroup4MixDto.getCourseType().getMsg());
+                if(classGroup4MixDto.getCourseType().equals(CourseSchedule.CourseScheduleType.MIX)){
+                    courseSchedule.setName(classGroup4MixDto.getCourseType().getMsg());
+                }else{
+                    courseSchedule.setName(subjectNames + "-" + classGroup4MixDto.getCourseType().getMsg());
+                }
                 courseSchedule.setTeacherId(teacherId);
                 courseSchedule.setActualTeacherId(teacherId);
 

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

@@ -565,10 +565,6 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 					StudentApplyRefunds studentApplyRefund = studentApplyRefunds.get(0);
 					if(data.getStudentStatus()==0&&studentApplyRefund.getStatus().equals(StudentApplyRefundsStatus.ING)){
 						data.setStudentStatus(2);
-						data.setRefundDate(studentApplyRefund.getUpdateTime());
-					}
-					if(data.getStudentStatus()==0){
-						data.setRefundDate(studentApplyRefund.getUpdateTime());
 					}
 				}
 			});

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

@@ -13,6 +13,7 @@
         <result column="class_group_id_" property="classGroupId"/>
         <result column="user_id_" property="userId"/>
         <result column="create_time_" property="createTime"/>
+        <result column="update_time_" property="updateTime"/>
         <result column="username_" property="userName"/>
         <result column="status_" property="status" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
     </resultMap>
@@ -30,8 +31,8 @@
     <!-- 向数据库增加一条记录 -->
     <insert id="insert" parameterType="com.ym.mec.biz.dal.entity.ClassGroupStudentMapper" useGeneratedKeys="true"
             keyColumn="id" keyProperty="id">
-        INSERT INTO class_group_student_mapper (id_,group_type_,music_group_id_,class_group_id_,user_id_,status_,create_time_)
-        VALUES(#{id},#{groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{musicGroupId},#{classGroupId},#{userId},#{status},now())
+        INSERT INTO class_group_student_mapper (id_,group_type_,music_group_id_,class_group_id_,user_id_,status_,create_time_,update_time_)
+        VALUES(#{id},#{groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{musicGroupId},#{classGroupId},#{userId},#{status},now(),now())
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -50,6 +51,7 @@
             <if test="groupType != null">
                 group_type_ = #{groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
             </if>
+            update_time_ = now(),
         </set>
         WHERE id_ = #{id}
     </update>

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

@@ -474,6 +474,7 @@
         <result column="current_class_times_" property="currentClassTimes"/>
         <result column="course_balance_" property="courseSalary"/>
         <result column="create_time_" property="applyDate"/>
+        <result column="update_time_" property="refundDate"/>
         <result column="student_status_" property="studentStatus"/>
     </resultMap>
 
@@ -486,6 +487,7 @@
             cg.current_class_times_,
             suaa.course_balance_,
             cgsm.create_time_,
+            cgsm.update_time_,
             CASE cgsm.status_ WHEN 'QUIT' THEN 1 ELSE 0 END student_status_
         FROM
             class_group cg