Merge remote-tracking branch 'origin/master'

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

@@ -16,6 +16,16 @@ public class BasicUserDto {
 
     private String musicGroupName;
 
+    private String userType;
+
+    public String getUserType() {
+        return userType;
+    }
+
+    public void setUserType(String userType) {
+        this.userType = userType;
+    }
+
     public String getMusicGroupId() {
         return musicGroupId;
     }

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

@@ -899,6 +899,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
                 throw new BizException("课酬未确认");
             }
         }
+        updateTeamTeacher(musicGroup,musicGroup);
         //生成学员费用表
         List<MusicGroupStudentFee> musicGroupStudentFees = musicGroupStudentFeeDao.initMusicGroupStudentFee(musicGroupId);
         if (musicGroupStudentFees != null && musicGroupStudentFees.size() > 0) {
@@ -1805,6 +1806,30 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         return musicGroupPageInfo;
     }
 
+    private void updateTeamTeacher(MusicGroup oldMusicGroup,MusicGroup newMusicGroup){
+        List<ClassGroup> classGroups = classGroupDao.findClassGroupByMusicGroupIdAndType(newMusicGroup.getId(), null);
+        if(classGroups == null || classGroups.size() == 0){
+            return;
+        }
+        Integer teamTeacherId = newMusicGroup.getTeamTeacherId();
+        Integer educationalTeacherId = newMusicGroup.getEducationalTeacherId();
+        Integer directorUserId = newMusicGroup.getDirectorUserId();
+        ImGroupMember[] oldImGroupMembers1 = {new ImGroupMember(oldMusicGroup.getTeamTeacherId().toString())};
+        ImGroupMember[] nowImGroupMembers1 = {new ImGroupMember(teamTeacherId.toString())};
+        ImGroupMember[] oldImGroupMembers2 = {new ImGroupMember(oldMusicGroup.getEducationalTeacherId().toString())};
+        ImGroupMember[] nowImGroupMembers2 = {new ImGroupMember(educationalTeacherId.toString())};
+        ImGroupMember[] oldImGroupMembers3 = {new ImGroupMember(oldMusicGroup.getDirectorUserId().toString())};
+        ImGroupMember[] nowImGroupMembers3 = {new ImGroupMember(directorUserId.toString())};
+        classGroups.forEach(e->{
+            imFeignService.groupQuit(new ImGroupModel(e.getId().toString(), oldImGroupMembers1, e.getName()));
+            imFeignService.groupJoin(new ImGroupModel(e.getId().toString(), nowImGroupMembers1, e.getName()));
+            imFeignService.groupQuit(new ImGroupModel(e.getId().toString(), oldImGroupMembers2, e.getName()));
+            imFeignService.groupJoin(new ImGroupModel(e.getId().toString(), nowImGroupMembers2, e.getName()));
+            imFeignService.groupQuit(new ImGroupModel(e.getId().toString(), oldImGroupMembers3, e.getName()));
+            imFeignService.groupJoin(new ImGroupModel(e.getId().toString(), nowImGroupMembers3, e.getName()));
+        });
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void updateBaseInfo(SubFeeSettingDto subFeeSettingDto) throws Exception {
@@ -1821,6 +1846,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
             //如果已生成课表，那么修改未上课时教学点
             courseScheduleDao.updateCourseScheduleSchool("MUSIC", musicGroupId, musicGroup.getSchoolId());
         }
+        updateTeamTeacher(musicGroup,group);
         List<Integer> months = subFeeSettingDto.getMonths();
 
         Date date = new Date();

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

@@ -158,6 +158,7 @@
             LEFT JOIN class_group_student_mapper cgsm ON cssp.user_id_=cgsm.user_id_ AND cssp.class_group_id_=cgsm.class_group_id_
         WHERE
             cssp.course_schedule_id_ =#{courseScheduleId}
+            AND su.id_ IS NOT NULL
             AND cgsm.status_!='QUIT'
     </select>
 

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

@@ -240,6 +240,7 @@
 		<result column="head_url_" property="headUrl" />
 		<result column="gender_" property="gender"/>
 		<result column="music_group_id_" property="musicGroupId"/>
+		<result column="user_type_" property="userType"/>
 	</resultMap>
 
 	<select id="findTeachersByStuId" resultMap="BasicUserDto">

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

@@ -15,6 +15,9 @@
         <result column="create_time_" property="createTime"/>
         <result column="update_time_" property="updateTime"/>
         <result column="price_" property="price"/>
+        <result column="deposit_fee_" property="depositFee"/>
+        <result column="remission_course_fee_" property="remissionCourseFee"/>
+        <result column="kit_group_purchase_type_json_" property="kitGroupPurchaseTypeJson"/>
     </resultMap>
 
     <!-- 根据主键查询一条记录 -->
@@ -35,15 +38,16 @@
             parameterType="com.ym.mec.biz.dal.entity.MusicGroupSubjectGoodsGroup"
             useGeneratedKeys="true" keyColumn="id" keyProperty="id">
         INSERT INTO music_group_subject_goods_group
-        (id_,name_,type_,music_group_id_,subject_id_,goods_id_list_,create_time_,update_time_,price_)
-        VALUES(#{id},#{name},#{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{musicGroupId},#{subjectId},#{goodsIdList},NOW(),NOW(),#{price})
+        (id_,name_,type_,music_group_id_,subject_id_,goods_id_list_,create_time_,update_time_,price_,deposit_fee_,remission_course_fee_,kit_group_purchase_type_json_)
+        VALUES(#{id},#{name},#{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{musicGroupId},#{subjectId},#{goodsIdList},NOW(),NOW(),#{price},#{depositFee},#{remissionCourseFee},#{kitGroupPurchaseTypeJson})
     </insert>
 
     <insert id="batchInsert" parameterType="java.util.List">
         INSERT INTO music_group_subject_goods_group
-        (name_,type_,music_group_id_,subject_id_,goods_id_list_,create_time_,update_time_,price_) VALUES
+        (name_,type_,music_group_id_,subject_id_,goods_id_list_,create_time_,update_time_,price_,deposit_fee_,remission_course_fee_,kit_group_purchase_type_json_) VALUES
         <foreach collection="lists" item="item" index="index" separator=",">
-            (#{item.name},#{item.type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{musicGroupId},#{item.subjectId},#{item.goodsIdList},now(),now(),#{item.price})
+            (#{item.name},#{item.type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+            #{musicGroupId},#{item.subjectId},#{item.goodsIdList},now(),now(),#{item.price},#{item.depositFee},#{item.remissionCourseFee},#{item.kitGroupPurchaseTypeJson})
         </foreach>
     </insert>
 
@@ -52,6 +56,15 @@
             parameterType="com.ym.mec.biz.dal.entity.MusicGroupSubjectGoodsGroup">
         UPDATE music_group_subject_goods_group
         <set>
+            <if test="depositFee != null">
+                deposit_fee_ = #{depositFee},
+            </if>
+            <if test="remissionCourseFee != null">
+                remission_course_fee_ = #{remissionCourseFee},
+            </if>
+            <if test="kitGroupPurchaseTypeJson != null">
+                kit_group_purchase_type_json_ = #{kitGroupPurchaseTypeJson},
+            </if>
             <if test="price != null">
                 price_ = #{price},
             </if>

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

@@ -250,7 +250,7 @@
         SELECT * FROM teacher WHERE certificate_num_ = #{certificateNum} LIMIT 1
     </select>
     <select id="queryGroupStudents" resultMap="com.ym.mec.biz.dal.dao.MusicGroupDao.BasicUserDto">
-        SELECT su.username_,su.id_ user_id_,su.avatar_ head_url_,su.gender_,s.name_ subject_name_,sr.music_group_id_
+        SELECT su.username_,su.id_ user_id_,su.avatar_ head_url_,su.gender_,s.name_ subject_name_,sr.music_group_id_,su.user_type_
         FROM class_group_teacher_mapper cgtm
         LEFT JOIN class_group_student_mapper cgsm ON cgtm.class_group_id_ = cgsm.class_group_id_
         LEFT JOIN sys_user su ON cgsm.user_id_ = su.id_
@@ -504,7 +504,7 @@
     </select>
 
     <select id="queryMusicGroupStudents" resultMap="com.ym.mec.biz.dal.dao.MusicGroupDao.BasicUserDto">
-        SELECT su.username_,su.id_ user_id_,su.avatar_ head_url_,su.gender_,GROUP_CONCAT(s.name_) subject_name_
+        SELECT su.username_,su.id_ user_id_,su.avatar_ head_url_,su.gender_,GROUP_CONCAT(s.name_) subject_name_,su.user_type_
         FROM teacher t
         LEFT JOIN sys_user su ON t.id_ = su.id_
         LEFT JOIN `subject` s ON FIND_IN_SET(s.id_,t.subject_id_)

mec-client-api/src/main/java/com/ym/mec/im/ImFeignService.java

@@ -81,7 +81,7 @@ public interface ImFeignService {
 	Object groupBatchDismiss(@RequestBody List<ImGroupModel> groupModels);
 
 	/**
-	 * 批量解散群组
+	 * 批量退出群组
 	 * @param groupModels
 	 * @return
 	 */