|
@@ -164,10 +164,8 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
|
|
|
if(musicGroup.getStatus() == MusicGroupStatusEnum.AUDIT){
|
|
|
Set<Integer> roleIds = new HashSet<>(1);
|
|
|
roleIds.add(SysUserRole.SECTION_MANAGER);
|
|
|
- String[] organIds = null;
|
|
|
- if(StringUtils.isNotEmpty(sysUser.getOrganId())){
|
|
|
- organIds = sysUser.getOrganId().split(",");
|
|
|
- }
|
|
|
+
|
|
|
+ String[] organIds = { musicGroup.getOrganId() + "" };
|
|
|
sysMessageService.batchSeoMessage(musicGroupDao.queryUserIdByRoleId(roleIds,organIds),MessageTypeEnum.BACKSTAGE_CREATE_MUSIC_GROUP_APPLY,"",sysUser.getUsername());
|
|
|
}
|
|
|
// 保存乐团付费主体列表
|
|
@@ -483,10 +481,8 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
|
|
|
musicGroupStudentFee.setTemporaryCourseFee(new BigDecimal(0));
|
|
|
musicGroupStudentFee.setNextPaymentDate(musicGroupPaymentCalenderService.getNextPaymentDate(musicGroupId));
|
|
|
musicGroupStudentFeeDao.update(musicGroupStudentFee);*/
|
|
|
-
|
|
|
Map<String,Object> result=new HashMap<>();
|
|
|
result.put("orderNo",studentPaymentOrder.getOrderNo());
|
|
|
-
|
|
|
return result;
|
|
|
}else{
|
|
|
if (userCashAccount.getBalance().doubleValue() > 0) {
|
|
@@ -540,8 +536,12 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
|
|
|
//删除原有的声部商品组合
|
|
|
musicGroupSubjectGoodsGroupDao.delByMusicGroupId(subFeeSettingDto.getMusicGroupId());
|
|
|
|
|
|
- musicGroupSubjectPlanDao.batchAdd(subFeeSettingDto.getMusicGroupSubjectPlans(),musicGroupId);
|
|
|
- musicGroupSubjectGoodsGroupDao.batchInsert(subFeeSettingDto.getMusicGroupSubjectGoodsGroups(),musicGroupId);
|
|
|
+ if (subFeeSettingDto.getMusicGroupSubjectPlans() != null && subFeeSettingDto.getMusicGroupSubjectPlans().size() > 0) {
|
|
|
+ musicGroupSubjectPlanDao.batchAdd(subFeeSettingDto.getMusicGroupSubjectPlans(), musicGroupId);
|
|
|
+ }
|
|
|
+ if (subFeeSettingDto.getMusicGroupSubjectGoodsGroups() != null && subFeeSettingDto.getMusicGroupSubjectGoodsGroups().size() > 0) {
|
|
|
+ musicGroupSubjectGoodsGroupDao.batchInsert(subFeeSettingDto.getMusicGroupSubjectGoodsGroups(), musicGroupId);
|
|
|
+ }
|
|
|
}else {
|
|
|
throw new Exception("乐团信息不存在");
|
|
|
}
|
|
@@ -605,10 +605,8 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
|
|
|
roleIds.add(SysUserRole.OPERATION_EXECUTIVE);
|
|
|
roleIds.add(SysUserRole.ADMISSIONS_DIRECTOR);
|
|
|
roleIds.add(SysUserRole.DEAN_OF_STUDIES);
|
|
|
- String[] organIds = null;
|
|
|
- if(StringUtils.isNotEmpty(sysUser.getOrganId())){
|
|
|
- organIds = sysUser.getOrganId().split(",");
|
|
|
- }
|
|
|
+
|
|
|
+ String[] organIds = { musicGroup.getOrganId() + "" };
|
|
|
sysMessageService.batchSeoMessage(musicGroupDao.queryUserIdByRoleId(roleIds,organIds),MessageTypeEnum.BACKSTAGE_ACTION_GROUP,"1",musicGroup.getName());
|
|
|
}
|
|
|
|
|
@@ -639,10 +637,8 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
|
|
|
musicGroupDao.update(musicGroup);
|
|
|
Set<Integer> roleIds = new HashSet<>(1);
|
|
|
roleIds.add(SysUserRole.SECTION_MANAGER);
|
|
|
- String[] organIds = null;
|
|
|
- if(StringUtils.isNotEmpty(sysUser.getOrganId())){
|
|
|
- organIds = sysUser.getOrganId().split(",");
|
|
|
- }
|
|
|
+
|
|
|
+ String[] organIds = { musicGroup.getOrganId() + "" };
|
|
|
sysMessageService.batchSeoMessage(musicGroupDao.queryUserIdByRoleId(roleIds,organIds),MessageTypeEnum.BACKSTAGE_CREATE_MUSIC_GROUP_APPLY,"",sysUser.getUsername());
|
|
|
}
|
|
|
|
|
@@ -677,10 +673,8 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
|
|
|
roleIds.add(SysUserRole.EDUCATIONAL_TEACHER);
|
|
|
roleIds.add(SysUserRole.OPERATION_EXECUTIVE);
|
|
|
roleIds.add(SysUserRole.ADMISSIONS_DIRECTOR);
|
|
|
- String[] organIds = null;
|
|
|
- if(StringUtils.isNotEmpty(sysUser.getOrganId())){
|
|
|
- organIds = sysUser.getOrganId().split(",");
|
|
|
- }
|
|
|
+
|
|
|
+ String[] organIds = { musicGroup.getOrganId() + "" };
|
|
|
sysMessageService.batchSeoMessage(musicGroupDao.queryUserIdByRoleId(roleIds,organIds),MessageTypeEnum.BACKSTAGE_ACTION_APPLY,"",musicGroup.getName());
|
|
|
}
|
|
|
|
|
@@ -779,10 +773,8 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
|
|
|
Set<Integer> roleIds = new HashSet<>(2);
|
|
|
roleIds.add(SysUserRole.SECTION_MANAGER);
|
|
|
roleIds.add(SysUserRole.OPERATION_EXECUTIVE);
|
|
|
- String[] organIds = null;
|
|
|
- if(StringUtils.isNotEmpty(sysUser.getOrganId())){
|
|
|
- organIds = sysUser.getOrganId().split(",");
|
|
|
- }
|
|
|
+
|
|
|
+ String[] organIds = { musicGroup.getOrganId() + "" };
|
|
|
sysMessageService.batchSeoMessage(musicGroupDao.queryUserIdByRoleId(roleIds,organIds),MessageTypeEnum.BACKSTAGE_MUSIC_GROUP_STOP,"1",musicGroup.getName());
|
|
|
return true;
|
|
|
}
|
|
@@ -869,10 +861,8 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
|
|
|
roleIds.add(SysUserRole.EDUCATIONAL_TEACHER);
|
|
|
roleIds.add(SysUserRole.OPERATION_EXECUTIVE);
|
|
|
roleIds.add(SysUserRole.ADMISSIONS_DIRECTOR);
|
|
|
- String[] organIds = null;
|
|
|
- if(StringUtils.isNotEmpty(sysUser.getOrganId())){
|
|
|
- organIds = sysUser.getOrganId().split(",");
|
|
|
- }
|
|
|
+
|
|
|
+ String[] organIds = { musicGroup.getOrganId() + "" };
|
|
|
sysMessageService.batchSeoMessage(musicGroupDao.queryUserIdByRoleId(roleIds,organIds),MessageTypeEnum.BACKSTAGE_LENGTHEN_PAYMENT,"",musicGroup.getName());
|
|
|
return true;
|
|
|
}
|
|
@@ -902,10 +892,8 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
|
|
|
Map<String,Object> memo = new HashMap<>(2);
|
|
|
memo.put("Id",musicGroupQuit.getId());
|
|
|
memo.put("type","MUSICGROUP");
|
|
|
- String[] organIds = null;
|
|
|
- if(StringUtils.isNotEmpty(sysUser.getOrganId())){
|
|
|
- organIds = sysUser.getOrganId().split(",");
|
|
|
- }
|
|
|
+
|
|
|
+ String[] organIds = { musicGroup.getOrganId() + "" };
|
|
|
sysMessageService.batchSeoMessage(musicGroupDao.queryUserIdByRoleId(roleIds,organIds),MessageTypeEnum.BACKSTAGE_STUDENT_APPLY_QUIT_GROUP,JSONObject.toJSONString(memo),sysUser.getUsername());
|
|
|
return true;
|
|
|
}
|
|
@@ -929,12 +917,18 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
|
|
|
musicGroupQuitDao.update(musicGroupQuit);
|
|
|
|
|
|
if (status == ApprovalStatus.APPROVED) {
|
|
|
- classGroupStudentMapperDao.deleteStudentByMusicGroupId(musicGroupId, userId);
|
|
|
|
|
|
StudentRegistration studentRegistration = studentRegistrationDao.queryByUserIdAndMusicGroupId(userId, musicGroupId);
|
|
|
if (studentRegistration == null) {
|
|
|
throw new BizException("用户注册信息不存在");
|
|
|
}
|
|
|
+ //更新学员在班级的状态
|
|
|
+ classGroupStudentMapperDao.deleteStudentByMusicGroupId(musicGroupId, userId);
|
|
|
+
|
|
|
+ //更新班级人数
|
|
|
+ List<Integer> classGroupIdList = classGroupStudentMapperDao.queryClassGroupIdList(musicGroupId, userId, GroupType.MUSIC);
|
|
|
+ classGroupDao.batchUpdateStudentNumMinusOne(classGroupIdList);
|
|
|
+
|
|
|
// 删除未上课
|
|
|
courseScheduleService.batchDeleteMusicGroupCourseWithStudent(musicGroupId, userId, GroupType.MUSIC);
|
|
|
|
|
@@ -1280,10 +1274,8 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
|
|
|
MusicGroup musicGroup = musicGroupDao.get(classGroupDao.findByCourseSchedule(courseScheduleId.intValue()).getMusicGroupId());
|
|
|
Set<Integer> roleIds = new HashSet<>(1);
|
|
|
roleIds.add(SysUserRole.SECTION_MANAGER);
|
|
|
- String[] organIds = null;
|
|
|
- if(StringUtils.isNotEmpty(sysUser.getOrganId())){
|
|
|
- organIds = sysUser.getOrganId().split(",");
|
|
|
- }
|
|
|
+
|
|
|
+ String[] organIds = { musicGroup.getOrganId() + "" };
|
|
|
sysMessageService.batchSeoMessage(musicGroupDao.queryUserIdByRoleId(roleIds,organIds),MessageTypeEnum.BACKSTAGE_TEACHER_AMOUNT_CHANGE,"",
|
|
|
teacher.getRealName(),musicGroup.getName(),scope.equals("all")?"所有":"本次");
|
|
|
return true;
|
|
@@ -1481,11 +1473,8 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
|
|
|
Set<Integer> roleIds = new HashSet<>(3);
|
|
|
roleIds.add(SysUserRole.SECTION_MANAGER);
|
|
|
roleIds.add(SysUserRole.EDUCATIONAL_TEACHER);
|
|
|
- roleIds.add(SysUserRole.OPERATION_EXECUTIVE);
|
|
|
- String[] organIds = null;
|
|
|
- if(StringUtils.isNotEmpty(sysUser.getOrganId())){
|
|
|
- organIds = sysUser.getOrganId().split(",");
|
|
|
- }
|
|
|
+ roleIds.add(SysUserRole.OPERATION_EXECUTIVE);
|
|
|
+ String[] organIds = { musicGroup.getOrganId() + "" };
|
|
|
sysMessageService.batchSeoMessage(musicGroupDao.queryUserIdByRoleId(roleIds,organIds),MessageTypeEnum.BACKSTAGE_ACTION_PAYMENT,"",musicGroup.getName());
|
|
|
return musicGroup;
|
|
|
}
|
|
@@ -1559,10 +1548,8 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
|
|
|
}
|
|
|
Set<Integer> roleIds = new HashSet<>(1);
|
|
|
roleIds.add(SysUserRole.SECTION_MANAGER);
|
|
|
- String[] organIds = null;
|
|
|
- if(StringUtils.isNotEmpty(sysUser.getOrganId())){
|
|
|
- organIds = sysUser.getOrganId().split(",");
|
|
|
- }
|
|
|
+
|
|
|
+ String[] organIds = { musicGroup.getOrganId() + "" };
|
|
|
sysMessageService.batchSeoMessage(musicGroupDao.queryUserIdByRoleId(roleIds,organIds),MessageTypeEnum.BACKSTAGE_MUSIC_GROUP_MARKING,"",musicGroup.getName());
|
|
|
}
|
|
|
}
|