Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/ClassGroupTeacherMapperDao.java

@@ -29,6 +29,14 @@ public interface ClassGroupTeacherMapperDao extends BaseDAO<Long, ClassGroupTeac
     List<ClassGroupTeacherMapper> findClassGroupTeachers(@Param("classGroupIds") String classGroupIds);
 
     /**
+     * 查询班级老师
+     *
+     * @param classGroupId
+     * @return
+     */
+    ClassGroupTeacherMapper getClassGroupTeachersRole(@Param("classGroupId") Integer classGroupId, @Param("teacherRole") String teacherRole);
+
+    /**
      * 批量删除班级的老师关联关系
      *
      * @param classGroupTeacherMapperList

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/MusicGroupStudentFeeDao.java

@@ -1,5 +1,6 @@
 package com.ym.mec.biz.dal.dao;
 
+import com.ym.mec.biz.dal.dto.SimpleUserDto;
 import com.ym.mec.biz.dal.dto.UpdateStudentFeeDto;
 import com.ym.mec.biz.dal.entity.MusicGroupStudentFee;
 import com.ym.mec.common.dal.BaseDAO;
@@ -103,6 +104,15 @@ public interface MusicGroupStudentFeeDao extends BaseDAO<Long, MusicGroupStudent
 	Integer countStudentNoPayNum(String musicGroupId);
 
 	/**
+	 * 获取当前乐团对应缴费状态的学院
+	 * @param musicGroupId
+	 * @param paymentStatus
+	 * @return
+	 */
+	List<SimpleUserDto> findStudentWithMusicGroupAndPaymentStatus(@Param("musicGroupId") String musicGroupId,
+																  @Param("paymentStatus")MusicGroupStudentFee.PaymentStatus paymentStatus);
+
+	/**
 	 * 根据乐团声部修改学员课程费用
 	 * @param musicGroupId
 	 * @param subjectId

mec-biz/src/main/java/com/ym/mec/biz/service/ClassGroupTeacherMapperService.java

@@ -4,6 +4,7 @@ import com.ym.mec.biz.dal.dto.ClassGroupTeachersDto;
 import com.ym.mec.biz.dal.entity.ClassGroupTeacherMapper;
 import com.ym.mec.biz.dal.entity.CourseSchedule;
 import com.ym.mec.common.service.BaseService;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
@@ -54,6 +55,13 @@ public interface ClassGroupTeacherMapperService extends BaseService<Long, ClassG
     List<ClassGroupTeacherMapper> getClassGroupTeachers(Integer classGroupId);
 
     /**
+     * 获取班级老师
+     * @param classGroupId
+     * @return
+     */
+    ClassGroupTeacherMapper getClassGroupTeachersRole(Integer classGroupId,String teacherRole);
+
+    /**
      * 修改班级老师
      * @param groupId
      * @param groupType

mec-biz/src/main/java/com/ym/mec/biz/service/CourseScheduleService.java

@@ -491,7 +491,7 @@ public interface CourseScheduleService extends BaseService<Long, CourseSchedule>
 	 * @param groupId
 	 * @return
 	 */
-	Object getTeacherCourseHeadInfo(GroupType groupType,String groupId);
+	Object getTeacherCourseHeadInfo(GroupType groupType,String groupId,Long courseScheduleId);
 
 	/**
 	 * 根据课程组获取课表信息

mec-biz/src/main/java/com/ym/mec/biz/service/MusicGroupStudentFeeService.java

@@ -31,4 +31,6 @@ public interface MusicGroupStudentFeeService extends BaseService<Long, MusicGrou
 	 * @param studentFeeDto
 	 */
 	void updateStudentFeeIsLock(UpdateStudentFeeDto studentFeeDto);
+
+
 }

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

@@ -594,6 +594,10 @@ public class ClassGroupTeacherMapperServiceImpl extends BaseServiceImpl<Long, Cl
         return classGroupTeacherMapperDao.findClassGroupTeachers(classGroupId.toString());
     }
 
+    public ClassGroupTeacherMapper getClassGroupTeachersRole(Integer classGroupId,String teacherRole) {
+        return classGroupTeacherMapperDao.getClassGroupTeachersRole(classGroupId,teacherRole);
+    }
+
     @Override
     public void updateTeacher(String groupId, Integer teacherId, String groupType) {
         classGroupTeacherMapperDao.updateTeacher(groupId, teacherId, groupType);

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

@@ -29,7 +29,6 @@ import com.ym.mec.util.collection.ListUtil;
 import com.ym.mec.util.collection.MapUtil;
 import com.ym.mec.util.date.DateUtil;
 import com.ym.mec.util.json.JsonUtil;
-import feign.codec.DecodeException;
 import org.apache.commons.collections.ListUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -4066,7 +4065,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 	}
 
 	@Override
-	public Object getTeacherCourseHeadInfo(GroupType groupType,String groupId){
+	public Object getTeacherCourseHeadInfo(GroupType groupType,String groupId,Long courseScheduleId){
 		Map<String,Object> resultMap = new HashMap<>(8);
 		Teacher teacher;
 		switch (groupType){
@@ -4104,15 +4103,18 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 				resultMap.put("teacherGiveLesson",courseScheduleTeacherSalaryDao.countTeacherGiveLesson(coursesGroup.getTeacherId()));
 				break;
 			case MUSIC:
-				MusicGroup musicGroup = musicGroupDao.get(groupId);
-				resultMap.put("groupName",musicGroup.getName());
-				resultMap.put("groupStatus",musicGroup.getStatus().getCode());
-				teacher = teacherDao.get(musicGroup.getEducationalTeacherId());
-				resultMap.put("groupTeacher",teacher.getRealName());
-				resultMap.put("teacherIntroduction",teacher.getIntroduction());
-				resultMap.put("teacherAvatar",teacher.getAvatar());
-				//统计授课次数
-				resultMap.put("teacherGiveLesson",courseScheduleTeacherSalaryDao.countTeacherGiveLesson(musicGroup.getEducationalTeacherId()));
+				if(courseScheduleId != null){
+					ClassGroup byCourseSchedule = classGroupDao.findByCourseSchedule(courseScheduleId.intValue());
+					resultMap.put("groupName",byCourseSchedule.getName());
+					ClassGroupTeacherMapper groupTeachersRole = classGroupTeacherMapperService.getClassGroupTeachersRole(byCourseSchedule.getId(), "BISHOP");
+					if(groupTeachersRole != null){
+						teacher = teacherDao.get(groupTeachersRole.getUserId());
+						resultMap.put("groupTeacher",teacher.getRealName());
+						resultMap.put("teacherIntroduction",teacher.getIntroduction());
+						resultMap.put("teacherAvatar",teacher.getAvatar());
+						resultMap.put("teacherGiveLesson",courseScheduleTeacherSalaryDao.countTeacherGiveLesson(groupTeachersRole.getUserId()));
+					}
+				}
 				break;
 			default:
 				throw new BizException("课程类型错误");
@@ -4202,7 +4204,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 		if(schedule == null){
 			throw new BizException("课程不存在");
 		}
-		return getTeacherCourseHeadInfo(schedule.getGroupType(),schedule.getMusicGroupId());
+		return getTeacherCourseHeadInfo(schedule.getGroupType(),schedule.getMusicGroupId(),courseScheduleId);
 	}
 
 	@Override

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

@@ -186,7 +186,7 @@ public class SysUserCashAccountServiceImpl extends BaseServiceImpl<Integer, SysU
             throw new BizException("用户[{}]现金账户不存在", userId);
         }
 
-        boolean isChange=amount.compareTo(cashAccount.getCourseBalance())!=0;
+        amount = decimal.subtract(cashAccount.getCourseBalance());
         
         Date date = new Date();
 
@@ -195,7 +195,7 @@ public class SysUserCashAccountServiceImpl extends BaseServiceImpl<Integer, SysU
 
         sysUserCashAccountDao.update(cashAccount);
 
-        if (isChange) {
+        if (amount.compareTo(cashAccount.getCourseBalance())!=0) {
             SysUserCoursesAccountDetail sysUserCoursesAccountDetail = new SysUserCoursesAccountDetail();
             sysUserCoursesAccountDetail.setUserId(userId);
             sysUserCoursesAccountDetail.setAmount(amount);

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

@@ -198,4 +198,10 @@
             AND teacher_role_ = #{teacherRole}
         </if>
     </select>
+    <select id="getClassGroupTeachersRole" resultMap="ClassGroupTeacherMapper">
+        SELECT u.real_name_, ct.*
+        FROM sys_user u,
+        class_group_teacher_mapper ct
+        WHERE u.id_ = ct.user_id_ AND ct.class_group_id_ = #{classGroupId} AND ct.teacher_role_ = #{teacherRole} LIMIT 1
+    </select>
 </mapper>

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

@@ -194,6 +194,16 @@
         SELECT * FROM music_group_student_fee_ WHERE music_group_id_ = #{musicGroupId}
     </select>
 
+    <select id="findStudentWithMusicGroupAndPaymentStatus" resultType="com.ym.mec.biz.dal.dto.SimpleUserDto">
+        SELECT
+            DISTINCT su.id_ userId,
+            su.real_name_ userName,
+            su.avatar_ avatar
+        FROM music_group_student_fee_ mgsf
+        LEFT JOIN sys_user su ON su.id_=mgsf.user_id_
+        WHERE music_group_id_='19120116225600001' AND payment_status_='PAID_COMPLETED'
+    </select>
+
     <update id="batchUpdate" parameterType="java.util.List">
     	<foreach collection="list" item="item" index="index" open="" close="" separator=";">
         UPDATE music_group_student_fee_

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

@@ -74,8 +74,8 @@ public class StudentCourseScheduleController extends BaseController {
 
 	@ApiOperation(value = "根据课程组获取课程组老师信息")
 	@GetMapping("/teacherCourseHeadInfo")
-	public Object teacherCourseHeadInfo(GroupType groupType,String groupId){
-		return succeed(scheduleService.getTeacherCourseHeadInfo(groupType,groupId));
+	public Object teacherCourseHeadInfo(GroupType groupType,String groupId,Long courseScheduleId){
+		return succeed(scheduleService.getTeacherCourseHeadInfo(groupType,groupId,courseScheduleId));
 	}
 
 	@ApiOperation(value = "根据课程组获取课表信息")