update

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

@@ -43,10 +43,10 @@ public interface SubjectDao extends BaseDAO<Integer, Subject> {
 
     /**
      * 通过乐团收费类型，获取默认的声部列表
-     * @param musicGroupId
+     * @param chargeTypeId
      * @return
      */
-    List<Subject> findDefaultSubByGroupId(Integer musicGroupId);
+    List<Subject> findDefaultSubByChargeTypeId(Integer chargeTypeId);
 
     /**
      * 通过乐团编号获取声部列表以及声部报名、缴费、计划人数

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

@@ -35,10 +35,10 @@ public interface SubjectService extends BaseService<Integer, Subject> {
     /**
      * 通过乐团收费类型，获取默认的声部列表
      *
-     * @param musicGroupId
+     * @param chargeTypeId
      * @return
      */
-    List<Subject> findDefaultSubByGroupId(Integer musicGroupId);
+    List<Subject> findDefaultSubByChargeTypeId(Integer chargeTypeId);
 
     /**
      * 通过乐团编号获取声部列表以及声部报名、缴费、计划人数

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

@@ -104,7 +104,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 	public List<Date> getCourseScheduleDateByStudent(Date month, Integer isAttend) {
 		SysUser user = sysUserFeignService.queryUserInfo();
 		if(null==user){
-			throw new BizException("请登录");
+			throw new BizException("获取用户信息失败");
 		}
 		return courseScheduleDao.getStudentCourseScheduleDate(user.getId().longValue(),month,isAttend);
 	}
@@ -113,7 +113,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 	public List<Date> getCourseScheduleDateByTeacher(Date month) {
 		SysUser user = sysUserFeignService.queryUserInfo();
 		if(null==user){
-			throw new BizException("请登录");
+			throw new BizException("获取用户信息失败");
 		}
 		return courseScheduleDao.getTeacherCourseScheduleDate(user.getId().longValue(),month);
 	}

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

@@ -114,7 +114,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 				musicGroupSubjectGoodsGroupDao.insert(e);
 			});
 			// 新增聊天群
-			ImGroupModel imGroupModel = new ImGroupModel(musicGroupId, musicGroup.getName());
+//			ImGroupModel imGroupModel = new ImGroupModel(musicGroupId, musicGroup.getName());
 			// 教务老师和运营主管加入群组
 			ImGroupMember[] imGroupMembers = { new ImGroupMember(musicGroup.getTeamTeacherId().toString()),
 					new ImGroupMember(musicGroup.getEducationalTeacherId().toString()) };

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

@@ -55,8 +55,8 @@ public class SubjectServiceImpl extends BaseServiceImpl<Integer, Subject>  imple
     }
 
     @Override
-    public List<Subject> findDefaultSubByGroupId(Integer musicGroupId) {
-        return subjectDao.findDefaultSubByGroupId(musicGroupId);
+    public List<Subject> findDefaultSubByChargeTypeId(Integer chargeTypeId) {
+        return subjectDao.findDefaultSubByChargeTypeId(chargeTypeId);
     }
 
     @Override

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

@@ -14,9 +14,12 @@ import com.ym.mec.biz.dal.page.VipGroupTeachingRecordQueryInfo;
 import com.ym.mec.biz.service.CourseScheduleService;
 import com.ym.mec.biz.service.VipGroupService;
 import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.common.entity.ImGroupMember;
+import com.ym.mec.common.entity.ImGroupModel;
 import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
+import com.ym.mec.im.ImFeignService;
 import com.ym.mec.util.collection.MapUtil;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -66,6 +69,8 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 	private CourseScheduleStudentPaymentDao courseScheduleStudentPaymentDao;
     @Autowired
 	private CourseScheduleTeacherSalaryDao courseScheduleTeacherSalaryDao;
+    @Autowired
+	private ImFeignService imFeignService;
 
 	@Override
 	public BaseDAO<Long, VipGroup> getDAO() {
@@ -122,6 +127,12 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 		vipGroupClassGroupMapper.setClassGroupId(classGroup.getId());
 		vipGroupClassGroupMapperDao.insert(vipGroupClassGroupMapper);
 
+		//创建融云班级群
+		// 指导老师加入群组
+		ImGroupMember[] imGroupMembers = { new ImGroupMember(vipGroup.getVipGroupApplyBaseInfo().getUserId().toString())};
+		// 创建群组
+		imFeignService.groupCreate(new ImGroupModel(classGroup.getId().toString(), imGroupMembers, classGroup.getName()));
+
 		//创建班级老师关联记录
 		ClassGroupTeacherMapper classGroupTeacherMapper=new ClassGroupTeacherMapper();
 		classGroupTeacherMapper.setTeacherRole(TeachTypeEnum.BISHOP);

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

@@ -95,15 +95,10 @@
         SELECT * FROM subject <include refid="querySubPageSql"/>
     </select>
 
-    <select id="findDefaultSubByGroupId" resultMap="Subject">
-        SELECT s.id_,s.name_,g.name_ goods_name_,g.id_ goods_id_,ctsm.kit_group_purchase_type_,ctsm.deposit_fee_,ctsm.fee_
-        FROM music_group mg
-        LEFT JOIN charge_type_subject_mapper ctsm ON ctsm.charge_type_id_ = mg.charge_type_id_
-        LEFT JOIN `subject` s ON ctsm.subject_id_ = s.id_
-        LEFT JOIN subject_goods_mapper sgm ON s.id_ = sgm.subject_id_
-        LEFT JOIN goods_category gc ON gc.id_ = sgm.goods_category_id_
-        LEFT JOIN goods g ON gc.id_ = g.goods_category_id_
-        WHERE mg.id_ = #{musicGroupId}
+    <select id="findDefaultSubByChargeTypeId" resultMap="Subject">
+        SELECT s.* FROM charge_type_subject_mapper ctsm
+        LEFT JOIN `subject` s ON subject_id_ = s.id_
+        WHERE ctsm.charge_type_id_ = #{chargeTypeId}
     </select>
 
     <resultMap id="subApplyDetail" type="com.ym.mec.biz.dal.dto.SubjectApplyDetailDto">

mec-im/src/main/java/com/ym/SealClassConfiguration.java

@@ -29,12 +29,12 @@ import java.util.List;
 @Configuration
 public class SealClassConfiguration {
 
-    @Bean
+    /*@Bean
     public <K, V> RedisTemplate<K, V> redisTemplate(RedisConnectionFactory redisConnectionFactory) {
         RedisTemplate<K, V> redisTemplate = new RedisTemplate<>();
         redisTemplate.setConnectionFactory(redisConnectionFactory);
         return redisTemplate;
-    }
+    }*/
 
     @Bean
     public GlobalExceptionHandlerAdvice globalExceptionAdvice() {

mec-teacher/src/main/java/com/ym/mec/teacher/controller/App.java

@@ -1,13 +0,0 @@
-package com.ym.mec.teacher.controller;
-
-/**
- * Hello world!
- *
- */
-public class App 
-{
-    public static void main( String[] args )
-    {
-        System.out.println( "Hello World!" );
-    }
-}

mec-web/src/main/java/com/ym/mec/web/controller/StudentRegistrationController.java

@@ -72,9 +72,9 @@ public class StudentRegistrationController extends BaseController {
             @ApiImplicitParam(name = "musicGroupId", value = "乐团编号", required = true, dataType = "String")})
     public Object queryFeeDetail(String studentId,String musicGroupId) {
         if (StringUtils.isEmpty(studentId) || StringUtils.isEmpty(musicGroupId)) {
-            return succeed(studentRegistrationService.queryFeeDetail(Integer.parseInt(studentId), musicGroupId));
+            return failed("参数校验异常");
         }
-        return failed();
+        return succeed(studentRegistrationService.queryFeeDetail(Integer.parseInt(studentId), musicGroupId));
     }
 
     @ApiOperation(value = "获取未分班的学生")

mec-web/src/main/java/com/ym/mec/web/controller/SubjectController.java

@@ -63,10 +63,10 @@ public class SubjectController extends BaseController {
     }
 
     @ApiOperation(value = "通过乐团收费类型，获取默认的声部列表")
-    @GetMapping("/findDefaultSubByGroupId")
-    @ApiImplicitParams({ @ApiImplicitParam(name = "musicGroupId", value = "乐团编号", required = true, dataType = "Integer")})
-    public Object findDefaultSubByGroupId(Integer musicGroupId){
-        return succeed(subjectService.findDefaultSubByGroupId(musicGroupId));
+    @GetMapping("/findDefaultSubByChargeTypeId")
+    @ApiImplicitParams({ @ApiImplicitParam(name = "chargeTypeId", value = "收费类型编号", required = true, dataType = "Integer")})
+    public Object findDefaultSubByChargeTypeId(Integer chargeTypeId){
+        return succeed(subjectService.findDefaultSubByChargeTypeId(chargeTypeId));
     }
 
     @ApiOperation(value = "修改、新增声部关联的商品列表")