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

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

@@ -143,7 +143,7 @@ public interface StudentRegistrationService extends BaseService<Long, StudentReg
 	 * @param studentPaymentOrder
 	 * @return
 	 */
-	StudentPaymentOrder updateApplyOrder(StudentPaymentOrder studentPaymentOrder);
+	StudentPaymentOrder updateApplyOrder(StudentPaymentOrder studentPaymentOrder) throws Exception;
 
 	/**
 	 * 获取乐团科目的学生

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

@@ -285,5 +285,15 @@ public interface VipGroupService extends BaseService<Long, VipGroup> {
      * @return void
      */
     void stopVipGroupWithNoCreate();
+
+    /**
+     * @describe 添加vip课学员
+     * @author Joburgess
+     * @date 2019/11/15
+     * @param vipGroupId:
+     * @param studentIds:
+     * @return void
+     */
+    void addVipGroupStudents(Long vipGroupId,List<Integer> studentIds);
     
 }

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

@@ -261,16 +261,18 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         MusicGroup musicGroup = musicGroupDao.get(highClassGroupList.get(0).getMusicGroupId());
 
         List<ClassGroup> classGroups = classGroupDao.findClassGroupByMusicGroupIdAndType(musicGroup.getId(), ClassGroupTypeEnum.HIGH);
-        List<Integer> classGroupIds = classGroups.stream().map(classGroup -> classGroup.getId()).collect(Collectors.toList());
-        //删除基础提高班
-        classGroupDao.batchSoftDelete(classGroupIds);
-        //删除基础提高班课程
-        courseScheduleDao.deleteCourseSchedulesByClassGroupIds(classGroupIds);
-        //删除基础提高老师
-        classGroupTeacherMapperDao.delClassGroupTeacherMapper(classGroupIds);
-
-        for (ClassGroup classGroup : classGroups) {
-            imFeignService.groupDismiss(new ImGroupModel(classGroup.getId().toString(), null, classGroup.getName()));
+        if (classGroups.size() > 0) {
+            List<Integer> classGroupIds = classGroups.stream().map(classGroup -> classGroup.getId()).collect(Collectors.toList());
+            //删除基础提高班
+            classGroupDao.batchSoftDelete(classGroupIds);
+            //删除基础提高班课程
+            courseScheduleDao.deleteCourseSchedulesByClassGroupIds(classGroupIds);
+            //删除基础提高老师
+            classGroupTeacherMapperDao.delClassGroupTeacherMapper(classGroupIds);
+
+            for (ClassGroup classGroup : classGroups) {
+                imFeignService.groupDismiss(new ImGroupModel(classGroup.getId().toString(), null, classGroup.getName()));
+            }
         }
 
         Integer schoolId = musicGroup.getSchoolId();
@@ -665,6 +667,8 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         classGroupRelationDao.deleteBySubClassId(classGroupId);
         //删除班级
         classGroupDao.delete(classGroupId);
+        //删除im群组
+        imFeignService.groupQuit(new ImGroupModel(classGroupId.toString(), null, null));
     }
 
     @Override
@@ -676,6 +680,8 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         classGroupRelationDao.deleteByClassId(classGroupId);
         //删除合奏班
         classGroupDao.delete(classGroupId);
+        //删除im群组
+        imFeignService.groupQuit(new ImGroupModel(classGroupId.toString(), null, null));
     }
 
     @Override

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

@@ -139,6 +139,8 @@ public class ClassGroupStudentMapperServiceImpl extends BaseServiceImpl<Long, Cl
 
         //1、班级关系添加
         List<ClassGroupStudentMapper> classGroupStudentMappers = new ArrayList<>();
+        List<ImGroupMember> imGroupMemberList = new ArrayList<>();
+
         for (String userIdStr : userIdStrSet) {
             ClassGroupStudentMapper classGroupStudentMapper = new ClassGroupStudentMapper();
             classGroupStudentMapper.setMusicGroupId(classGroup.getMusicGroupId());
@@ -152,9 +154,14 @@ public class ClassGroupStudentMapperServiceImpl extends BaseServiceImpl<Long, Cl
                 studentRegistration.setClassGroupId(classGroupId);
                 studentRegistrationService.update(studentRegistration);
             }
+            imGroupMemberList.add(new ImGroupMember(userIdStr));
         }
         classGroupStudentMapperDao.classGroupStudentsInsert(classGroupStudentMappers);
 
+        //添加进IM群组
+        ImGroupMember[] imGroupMembers = imGroupMemberList.toArray(new ImGroupMember[imGroupMemberList.size()]);
+        imFeignService.groupJoin(new ImGroupModel(classGroup.getId().toString(), imGroupMembers, classGroup.getName()));
+
         //2、班级人数调整
         classGroupService.updateClassStudentNum(classGroupId.longValue(), userIdStrSet.size());
 
@@ -168,6 +175,9 @@ public class ClassGroupStudentMapperServiceImpl extends BaseServiceImpl<Long, Cl
             classGroupService.updateClassStudentNum(classGroupRelation.getClassGroupId().longValue(), userIdStrSet.size());
             List<CourseSchedule> mixCourseScheduleList = courseScheduleService.findNoStartCoursesByClassGroupId(classGroupRelation.getClassGroupId());
             courseScheduleList.addAll(mixCourseScheduleList);
+
+            //添加进合奏班IM群组
+            imFeignService.groupJoin(new ImGroupModel(classGroupRelation.getClassGroupId().toString(), imGroupMembers, null));
         }
 
         BigDecimal coursePrice = new BigDecimal("0");

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

@@ -843,6 +843,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 	}
 
 	@Override
+	@Transactional(rollbackFor = Exception.class)
 	public void courseScheduleCommplaint(CourseScheduleComplaints courseScheduleComplaints) {
 		SysUser user = sysUserFeignService.queryUserInfo();
 
@@ -851,11 +852,11 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 		}
 
 		if(Objects.isNull(courseScheduleComplaints.getCourseScheduleId())){
-			throw new BizException("请指定需要投诉的课程");
+			throw new BizException("请指定需要评价的课程");
 		}
 
 		if(StringUtils.isBlank(courseScheduleComplaints.getReason())){
-			throw new BizException("请说明投诉原因");
+			throw new BizException("请说明写下您的评价");
 		}
 
 		if(StringUtils.length(courseScheduleComplaints.getReason())>150){
@@ -866,7 +867,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 
 		CourseScheduleComplaints byUserAndCourse = courseScheduleComplaintsDao.findByUserAndCourse(courseScheduleComplaints.getUserId().longValue(), courseScheduleComplaints.getCourseScheduleId());
 		if(byUserAndCourse!=null){
-			throw new BizException("您已经对该课程进行过申诉操作!");
+			throw new BizException("您已经对该课程做出了评价!");
 		}
 
 		CourseScheduleDto courseSchedules = courseScheduleDao.getCourseSchedules(courseScheduleComplaints.getCourseScheduleId());
@@ -886,7 +887,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 		Set<Integer> roleIds = new HashSet<>(1);
 		roleIds.add(SysUserRole.EDUCATIONAL_TEACHER);
 		Map<String,Long> memo = new HashMap<>(1);
-		memo.put("courseScheduleComplaintsId",byUserAndCourse.getId());
+		memo.put("courseScheduleComplaintsId",courseScheduleComplaints.getId());
 		sysMessageService.batchSeoMessage(musicGroupDao.queryUserIdByRoleId(roleIds),MessageTypeEnum.BACKSTAGE_STUDENT_APPEAL, JSONObject.toJSONString(memo),courseSchedule.getName(),user.getUsername());
 	}
 

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

@@ -80,6 +80,8 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
     private SysUserCashAccountDetailService sysUserCashAccountDetailService;
     @Autowired
     private SysUserCashAccountService sysUserCashAccountService;
+    @Autowired
+    private ClassGroupStudentMapperService classGroupStudentMapperService;
 
     @Override
     public BaseDAO<Long, StudentRegistration> getDAO() {
@@ -534,7 +536,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public StudentPaymentOrder updateApplyOrder(StudentPaymentOrder studentPaymentOrder) {
+    public StudentPaymentOrder updateApplyOrder(StudentPaymentOrder studentPaymentOrder) throws Exception {
         //更新订单状态
         studentPaymentOrderService.update(studentPaymentOrder);
         Date nowDate = new Date();
@@ -549,6 +551,8 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
                 StudentPaymentOrder waitPayOrder = studentPaymentOrderService.findMusicGroupApplyOrderByStatus(studentRegistration.getUserId(), studentRegistration.getMusicGroupId(), DealStatusEnum.WAIT_PAY);
                 waitPayOrder.setStatus(DealStatusEnum.CLOSE);
                 studentPaymentOrderService.update(waitPayOrder);
+                //添加学生
+                classGroupStudentMapperService.addStudents(studentRegistration.getClassGroupId(),studentRegistration.getUserId().toString());
             }
 
             if (studentRegistration.getTemporaryCourseFee() == null) {
@@ -577,9 +581,9 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
                 musicGroupStudentFee.setSubjectId(studentRegistration.getActualSubjectId());
                 musicGroupStudentFee.setPaymentStatus(MusicGroupStudentFee.PaymentStatus.PAID_COMPLETED);
                 musicGroupStudentFeeDao.insert(musicGroupStudentFee);
-                studentRegistration.setTemporaryCourseFee(new BigDecimal(0));
             }
 
+            studentRegistration.setTemporaryCourseFee(new BigDecimal(0));
             studentRegistration.setPaymentStatus(PaymentStatusEnum.YES);
             studentRegistration.setMusicGroupStatus(ClassGroupStudentStatusEnum.NORMAL);
             studentRegistrationDao.update(studentRegistration);

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

@@ -541,6 +541,10 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 		StudentVipGroupDetailDto vipGroupDetail = vipGroupDao.getVipGroupDetail(vipGroupId);
 		if(StringUtils.isNotEmpty(vipGroup.getCourseSchedulesJson())){
 			vipGroupDetail.setCourseSchedules(JSON.parseArray(vipGroup.getCourseSchedulesJson(),CourseSchedule.class));
+			List<CourseSchedule> collect = vipGroupDetail.getCourseSchedules().stream()
+					.sorted(Comparator.comparing(CourseSchedule::getStartClassTime))
+					.collect(Collectors.toList());
+			vipGroupDetail.setCourseSchedules(collect);
 		}
 
         vipGroupDetail.setNumberOfClasses(vipGroupDao.countTeacherVipGroups(vipGroupDetail.getTeacherId().longValue()));
@@ -1370,6 +1374,17 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 	}
 
 	@Override
+	public void addVipGroupStudents(Long vipGroupId, List<Integer> studentIds) {
+		if(CollectionUtils.isEmpty(studentIds)){
+			throw new BizException("请选择学生");
+		}
+		if(Objects.isNull(vipGroupId)){
+			throw new BizException("请指定班级");
+		}
+
+	}
+
+	@Override
 	public void stopVipGroupWithNoCreate() {
 		List<VipGroup> noCreateSuccessVipGroups = vipGroupDao.findNoCreateSuccessVipGroup();
 		if(CollectionUtils.isEmpty(noCreateSuccessVipGroups)){

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

@@ -86,7 +86,7 @@
             LEFT JOIN class_group cg ON vgcgm.class_group_id_=cg.id_
             WHERE vgcgm.vip_group_id_ IN
             <foreach collection="vipGroupIds" item="vipGroupId" open="(" close=")" separator=",">
-                #{vipGroupIds}
+                #{vipGroupId}
             </foreach>
     </select>
 </mapper>