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

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

@@ -154,13 +154,13 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         classGroup.setCreateTime(date);
         classGroup.setUpdateTime(date);
         classGroup.setType(ClassGroupTypeEnum.NORMAL);
-
+        classGroup.setGroupType(groupType);
         classGroup.setExpectStudentNum(userIdStrSet.size());
         classGroup.setStudentNum(userIdStrSet.size());
         insert(classGroup);
 
         //2、插入班级学生关联关系
-        List<Integer> userIdList = new  ArrayList<>();
+        List<Integer> userIdList = new ArrayList<>();
         List<ClassGroupStudentMapper> classGroupStudentList = new ArrayList<>();
         for (String userId : userIdStrSet) {
             ClassGroupStudentMapper classGroupStudentMapper = new ClassGroupStudentMapper();
@@ -183,7 +183,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         classGroupStudentMapperDao.classGroupStudentsInsert(classGroupStudentList);
 
         //加入IM群组
-        addImGroup(classGroup,userIdList);
+        addImGroup(classGroup, userIdList);
         return classGroup;
     }
 
@@ -249,7 +249,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         classGroupRelationService.classGroupRelationsInsert(classGroupRelationList);
 
         //加入IM群组
-        addImGroup(classGroup,userIdList);
+        addImGroup(classGroup, userIdList);
 
         return classGroup;
     }
@@ -353,7 +353,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
             userIdList.add(classGroupTeacherMapper.getUserId());
 
             //加入Im群组
-            addImGroup(highClassGroup,userIdList);
+            addImGroup(highClassGroup, userIdList);
         }
         return highClassGroupList;
     }
@@ -461,6 +461,11 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         List<ClassGroupTeachersDto> classGroupAndTeachers = getClassGroupAndTeachers(musicGroupId, "NORMAL,MIX,HIGH", classGroupId);
         BigDecimal zeroSalary = new BigDecimal(0);
         MusicGroup musicGroup = musicGroupDao.get(musicGroupId);
+        if (type != null) {
+            musicGroup.setSettlementType(type);
+            musicGroupDao.update(musicGroup);
+        }
+
         for (ClassGroupTeachersDto classGroupAndTeacher : classGroupAndTeachers) {
             //班级的教师列表
             List<ClassGroupTeacherMapper> classGroupTeacherMapperList = classGroupAndTeacher.getClassGroupTeacherMapperList();
@@ -1108,6 +1113,8 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                 courseScheduleStudentPayment.setCreateTime(date);
                 courseScheduleStudentPayment.setUpdateTime(date);
                 courseScheduleStudentPayment.setClassGroupId(noStartCourse.getClassGroupId());
+                courseScheduleStudentPayment.setMusicGroupId(classGroup.getMusicGroupId());
+                courseScheduleStudentPayment.setGroupType(classGroup.getGroupType());
                 courseScheduleStudentPaymentList.add(courseScheduleStudentPayment);
             }
         }
@@ -1312,6 +1319,8 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         for (CourseSchedule noStartCourse : noStartCourses) {
             for (StudentRegistration studentRegistration : studentList) {
                 CourseScheduleStudentPayment courseScheduleStudentPayment = new CourseScheduleStudentPayment();
+                courseScheduleStudentPayment.setGroupType(classGroup.getGroupType());
+                courseScheduleStudentPayment.setMusicGroupId(classGroup.getMusicGroupId());
                 courseScheduleStudentPayment.setCourseScheduleId(noStartCourse.getId());
                 courseScheduleStudentPayment.setUserId(studentRegistration.getUserId());
                 courseScheduleStudentPayment.setExpectPrice(expectPrice);

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

@@ -893,7 +893,13 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 		}
 		courseScheduleComplaints.setUserId(user.getId());
 		courseScheduleComplaints.setStatus(AuditStatusEnum.ING);
+		if(courseScheduleComplaints.getScore()>2){
+			courseScheduleComplaints.setStatus(AuditStatusEnum.PASS);
+		}
 		courseScheduleComplaintsDao.insert(courseScheduleComplaints);
+		if(courseScheduleComplaints.getScore()>2){
+			return;
+		}
 		//学员提起申诉通知
 		CourseSchedule courseSchedule = courseScheduleDao.get(courseScheduleComplaints.getCourseScheduleId());
 		Set<Integer> roleIds = new HashSet<>(1);

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

@@ -155,11 +155,14 @@ public class CourseScheduleStudentPaymentServiceImpl extends BaseServiceImpl<Lon
 			}
 			studentsWithClassGroup.forEach(classGroupStudent->{
 				courseSchedulesByClassGroup.forEach(courseSchedule -> {
-					courseScheduleStudentPayments.add(new CourseScheduleStudentPayment(
+					CourseScheduleStudentPayment courseScheduleStudentPayment = new CourseScheduleStudentPayment(
 							courseSchedule.getId(),
 							classGroupStudent.getUserId(),
 							zeroPrice,
-							courseSchedule.getClassGroupId()));
+							courseSchedule.getClassGroupId());
+					courseScheduleStudentPayment.setGroupType(classGroupStudent.getGroupType());
+					courseScheduleStudentPayment.setMusicGroupId(classGroupStudent.getMusicGroupId());
+					courseScheduleStudentPayments.add(courseScheduleStudentPayment);
 				});
 			});
 		});

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

@@ -160,6 +160,7 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
             if(Objects.nonNull(classGroup)){
                 teacherAttendance.setClassGroupId(classGroup.getId());
                 teacherAttendance.setMusicGroupId(classGroup.getMusicGroupId());
+                teacherAttendance.setGroupType(classGroup.getGroupType());
             }
             if(CollectionUtils.isEmpty(collect)||!collect.contains(courseScheduleTeacherSalary.getUserId())){
                 teacherAttendance.setTeacherId(courseScheduleTeacherSalary.getUserId());

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

@@ -69,6 +69,8 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 			throw new BizException("请选择课程!");
 		}
 
+		ClassGroup classGroup = new ClassGroup();
+
 //		SysConfig byParamName = sysConfigService.findByParamName(SysConfigService.ADVANCE_SIGN_IN_MINUTES);
 //		Integer advanceSignInMinutes=Integer.parseInt(byParamName.getParanValue());
 
@@ -92,6 +94,7 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 
 		teacherAttendance.setMusicGroupId(currentCourseDetail.getMusicGroupId());
 		teacherAttendance.setClassGroupId(currentCourseDetail.getClassId());
+		teacherAttendance.setGroupType(classGroup.getGroupType());
 		teacherAttendance.setRemark(teacherSignOutDto.getTeacherAttendanceInfo().getRemark());
 		int advanceSignMinutes = Integer.parseInt(sysConfigDao.findConfigValue(SysConfigService.ADVANCE_SIGN_IN_MINUTES));
 
@@ -162,7 +165,6 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 				teacherAttendanceDao.insert(teacherAttendance);
 			}
 			//修改当前课时
-			ClassGroup classGroup = new ClassGroup();
 			classGroup.setId(teacherAttendance.getClassGroupId());
 			classGroup.setCurrentClassTimes(teacherAttendance.getCurrentClassTimes() + 1);
 			classGroup.setUpdateTime(date);
@@ -171,6 +173,7 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 			CourseHomework courseHomework=teacherSignOutDto.getCourseHomeworkInfo();
 			courseHomework.setCourseScheduleId(teacherAttendance.getCourseScheduleId());
 			courseHomework.setMusicGroupId(currentCourseDetail.getMusicGroupId());
+			courseHomework.setGroupType(classGroup.getGroupType());
 			courseHomework.setClassGroupId(currentCourseDetail.getClassId().intValue());
 			courseHomework.setExpectNum(studentAttendanceDao.countNormalAttendanceStudentNums(teacherAttendance.getCourseScheduleId()));
 			CourseSchedule nextCourseSchedule = courseScheduleDao.getNextCourseSchedule(classGroup.getId());

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

@@ -999,7 +999,6 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 			return;
 		}
 
-
 		updateVipGroupStudentNumAndStatus(vipGroupId, classGroup,0,true);
 		SysUserCashAccount sysUserCashAccount = sysUserCashAccountService.get(userId);
 

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

@@ -287,12 +287,9 @@
     <select id="countStudentPayLog" resultType="java.lang.Integer">
         SELECT COUNT(spo.id_)
         FROM student_payment_order spo
-        LEFT JOIN class_group cg ON cg.id_ = spo.class_group_id_
+        LEFT JOIN music_group mg ON spo.music_group_id_=mg.id_
         <where>
-            cg.del_flag_ = 0
-            <if test="search != null and search != ''">
-                AND cg.name_ LIKE CONCAT('%',#{search},'%')
-            </if>
+            spo.status_ = 'SUCCESS'
             <if test="date != null and date != ''">
                 AND spo.create_time_ LIKE CONCAT(#{date},'%')
             </if>
@@ -311,14 +308,11 @@
         <result column="type_" property="type" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
     </resultMap>
     <select id="queryStudentPayLog" resultMap="StudentPayInfoDto">
-        SELECT spo.actual_amount_,spo.status_,spo.type_,cg.name_,spo.create_time_
+        SELECT spo.actual_amount_,spo.status_,spo.type_,mg.name_,spo.create_time_
         FROM student_payment_order spo
-        LEFT JOIN class_group cg ON cg.id_ = spo.class_group_id_
+        LEFT JOIN music_group mg ON spo.music_group_id_=mg.id_
         <where>
-            spo.status_ = 'SUCCESS' AND cg.del_flag_ = 0
-            <if test="search != null and search != ''">
-                AND cg.name_ LIKE CONCAT('%',#{search},'%')
-            </if>
+            spo.status_ = 'SUCCESS'
             <if test="date != null and date != ''">
                 AND spo.create_time_ LIKE CONCAT(#{date},'%')
             </if>
@@ -663,6 +657,7 @@
         <foreach collection="list" item="item" index="index" open="(" close=")" separator=",">
             #{item}
         </foreach>
+        AND current_class_times_ &lt; total_class_times_
     </update>
     <update id="batchUpdateClassGroupCourseTimes" parameterType="map">
         <foreach collection="classGroupCourseTimes.entrySet()" index="key" item="value" open="" close="" separator=";">

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

@@ -1064,7 +1064,7 @@
     </select>
     <!-- 查找班级未开始的课程 -->
     <select id="findNoStartCoursesByClassGroupId" resultMap="CourseSchedule">
-        SELECT * FROM course_schedule WHERE class_group_id_ = #{classGroupId} AND status_ = 'NOT_START'
+        SELECT * FROM course_schedule WHERE class_group_id_ = #{classGroupId} AND status_ = 'NOT_START' AND group_type_ = 'MUSIC'
     </select>
 
     <resultMap id="CourseAttendanceDetailHeadInfoDto" type="com.ym.mec.biz.dal.dto.CourseAttendanceDetailHeadInfoDto">
@@ -1103,7 +1103,7 @@
     </select>
     <select id="queryMusicGroupIds" resultType="java.lang.String">
         SELECT DISTINCT spo.music_group_id_ FROM student_payment_order spo
-        LEFT JOIN class_group_student_mapper cgsm ON spo.class_group_id_ = cgsm.class_group_id_
+        LEFT JOIN class_group_student_mapper cgsm ON spo.music_group_id_ = cgsm.music_group_id_
         WHERE spo.type_ != 'OTHER' AND spo.music_group_id_ IS NOT NULL
         AND spo.user_id_ = #{userId} AND spo.status_='SUCCESS' AND cgsm.status_ != 'QUIT'
         <include refid="global.limit"/>

mec-student/src/main/java/com/ym/mec/student/controller/StudentCourseHomeworkController.java

@@ -43,6 +43,7 @@ public class StudentCourseHomeworkController extends BaseController {
     public Object update(@RequestBody StudentCourseHomework studentCourseHomework){
         studentCourseHomework.setStatus(YesOrNoEnum.YES);
         studentCourseHomework.setId(studentCourseHomework.getCourseHomeworkId());
+        studentCourseHomework.setCourseHomeworkId(null);
         studentCourseHomeworkService.update(studentCourseHomework);
         return succeed();
     }

mec-student/src/main/java/com/ym/mec/student/controller/StudentCourseHomeworkReplyController.java

@@ -1,5 +1,7 @@
 package com.ym.mec.student.controller;
 
+import com.ym.mec.auth.api.client.SysUserFeignService;
+import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.entity.StudentCourseHomeworkReply;
 import com.ym.mec.biz.dal.page.StudentCourseHomeworkReplyQueryInfo;
 import com.ym.mec.biz.service.StudentCourseHomeworkReplyService;
@@ -8,8 +10,11 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+
 /**
  * @Author Joburgess
  * @Date 2019/9/19
@@ -22,10 +27,17 @@ public class StudentCourseHomeworkReplyController extends BaseController {
 
     @Autowired
     private StudentCourseHomeworkReplyService studentCourseHomeworkReplyService;
+    @Resource
+    private SysUserFeignService sysUserFeignService;
 
     @ApiOperation(value = "新增回复")
     @PostMapping("/add")
     public Object add(@RequestBody StudentCourseHomeworkReply studentCourseHomeworkReply) {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null) {
+            return failed(HttpStatus.FORBIDDEN, "请登录");
+        }
+        studentCourseHomeworkReply.setUserId(sysUser.getId());
         studentCourseHomeworkReplyService.insert(studentCourseHomeworkReply);
         return succeed();
     }