update

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

@@ -8,8 +8,6 @@ import java.util.List;
 public interface SysConfigService extends BaseService<Long, SysConfig> {
     //乐团基础规则
 
-    //是否开启乐团预报名
-    String MUSIC_PRE_APPLY_OPEN_FLAG = "music_pre_apply_open_flag";
     //乐团预报名人数达到指定数量，可将乐团状态变更为创建缴费中
     String MUSIC_MIN_STUDENT_NUM = "music_min_student_num";
     //报名缴费阶段乐团若未合并学员，缴费人数达到指定人数时可确认开团(用于校验是否回访)
@@ -18,10 +16,6 @@ public interface SysConfigService extends BaseService<Long, SysConfig> {
     String OLD_MUSIC_PAYMENT_STUDENT_NUM = "old_music_payment_student_num";
     //乐团问卷调查编号
     String MUSIC_GROUP_TOPIC_ID = "music_group_topic_id";
-    //自动确认收货时间
-    String AUTO_AFFIRM_RECEIVE_TIME = "auto_affirm_receive_time";
-    //提醒老师创建新的缴费项目,距离缴费项有效期前{}天
-    String PUSH_CREATE_PAYMENT_CALENDER = "push_create_payment_calender";
 
     //考勤和课酬规则
 
@@ -127,26 +121,10 @@ public interface SysConfigService extends BaseService<Long, SysConfig> {
     String LABOUR_TEACHER_SALARY_TYPE = "labour_teacher_salary_type";
     //线下连堂课间隔时间
     String OFFLINE_CONTINUE_COURSE_MINUTES = "offline_continue_course_minutes";
-    //陪练课可选老师的分部
-    String PRACTICE_TEACHER_ORGAN_RANGE = "practice_teacher_organ_range";
-    //陪练课可预约声部列表
-    String PRACTICE_SUBJECT_ID_LIST = "practice_subject_id_list";
-    //陪练课预约开始时间
-    String PRACTICE_APPLY_START_TIME = "practice_apply_start_time";
-    //陪练课预约结束时间
-    String PRACTICE_APPLY_END_TIME = "practice_apply_end_time";
-    //试听课默认单节课时长
-    String DEMO_GROUP_SINGLE_CLASS_MINUTES_ = "demo_group_single_class_minutes_";
     //学生允许请假的时间，为开课前{}小时
     String ADVANCE_LEAVE_HOURS = "advance_leave_hours";
     //教师可调整课程默认时间，开课前{}小时
     String ENABLE_TEACHER_COURSE_ADJUST_DEFAULT_HOURS = "enable_teacher_course_adjust_default_hours";
-    //内部库存预警值
-    String INNER_REPERTORY_WARN_NUM = "inner_repertory_warn_num";
-    //外部库存预警值
-    String OUTER_REPERTORY_WARN_NUM = "outer_repertory_warn_num";
-    //库存预警手机号
-    String REPERTORY_WARN_PHONE = "repertory_warn_phone";
     //退款周期
     String REFUND_PERIOD = "refund_period";
 
@@ -158,13 +136,6 @@ public interface SysConfigService extends BaseService<Long, SysConfig> {
     //上课时间在指定时间段内提醒时间安排异常
     String COURSE_END_TIME_ERROR = "course_end_time_error";
 
-    //对外课程课后缓冲时间{}分钟
-    String COURSE_BEFORE_BUFFER_TIME = "course_before_buffer_time";
-    //对外课程课后缓冲时间{}分钟
-    String COURSE_AFTER_BUFFER_TIME = "course_after_buffer_time";
-    //全职资源公摊金额
-    String FULL_JOB_FEE = "full_job_fee";
-
     //乐保
     //是否开启乐保
     String MUSICAL_REPAIR_OPEN_FLAG = "musical_repair_open_flag";
@@ -174,7 +145,31 @@ public interface SysConfigService extends BaseService<Long, SysConfig> {
     String ONE_YEAR_MUSICAL_REPAIR_ORIGINAL_AMOUNT = "one_year_musical_repair_original_amount";
 
 
-    //乐团配置
+    //特殊规则默认值--》网管&试听课规则
+    //试听课默认单节课时长
+    String DEMO_GROUP_SINGLE_CLASS_MINUTES_ = "demo_group_single_class_minutes_";
+    //陪练课可选老师的分部
+    String PRACTICE_TEACHER_ORGAN_RANGE = "practice_teacher_organ_range";
+    //陪练课可预约声部列表
+    String PRACTICE_SUBJECT_ID_LIST = "practice_subject_id_list";
+    //陪练课预约开始时间
+    String PRACTICE_APPLY_START_TIME = "practice_apply_start_time";
+    //陪练课预约结束时间
+    String PRACTICE_APPLY_END_TIME = "practice_apply_end_time";
+
+    //特殊规则默认值--》商品规则设置
+    //内部库存预警值
+    String INNER_REPERTORY_WARN_NUM = "inner_repertory_warn_num";
+    //外部库存预警值
+    String OUTER_REPERTORY_WARN_NUM = "outer_repertory_warn_num";
+    //库存预警手机号
+    String REPERTORY_WARN_PHONE = "repertory_warn_phone";
+
+    //课程默认值规则---》乐团规则设置
+    //自动确认收货时间
+    String AUTO_AFFIRM_RECEIVE_TIME = "auto_affirm_receive_time";
+    //提醒老师创建新的缴费项目,距离缴费项有效期前{}天
+    String PUSH_CREATE_PAYMENT_CALENDER = "push_create_payment_calender";
     //提醒乐团主管排下学期的课程的时间节点（默认提前14天）
     String REMIND_COURSE_TIME = "remind_course_time";
     //会员结束前15天自动创建乐团续费（默认提前15天）
@@ -183,10 +178,7 @@ public interface SysConfigService extends BaseService<Long, SysConfig> {
     String MEMBER_GROUP_TERM_GIVE_COURSE_TIME = "member_group_term_give_course_time";
     //各声部不购买会员入团资格限制学员数
     String MEMBER_GROUP_FEE_STUDENT_NUM = "member_group_fee_student_num";
-    //考级活动开始时间
-    String DEGREE_ACTIVITY_START_TIME = "degree_activity_start_time";
-    //考级活动开始时间
-    String DEGREE_ACTIVITY_END_TIME = "degree_activity_end_time";
+
 
     public static final String BASE_API_URL = "base_api_url";
 
@@ -330,7 +322,27 @@ public interface SysConfigService extends BaseService<Long, SysConfig> {
 
     String VIP_SPECIAL_ACTIVITY_IDS = "vip_special_activity_ids";
 
+    //特殊规则默认值--》其他参数设置
+    //基本课酬{}元
     String DAYA_BASE_SALARY_AMOUNT = "daya_base_salary_amount";
+    //对外课程课后缓冲时间{}分钟
+    String COURSE_BEFORE_BUFFER_TIME = "course_before_buffer_time";
+    //对外课程课后缓冲时间{}分钟
+    String COURSE_AFTER_BUFFER_TIME = "course_after_buffer_time";
+    //全职资源公摊金额
+    String FULL_JOB_FEE = "full_job_fee";
+    //云教练训练时长小于80分钟需要回访
+    String STUDENT_CLOUD_TEACHER_TOTAL_PLAY_TIME = "student_cloud_teacher_total_play_time";
+    //云教练训练次数小于4次需要回访
+    String STUDENT_CLOUD_TEACHER_TRAIN_NUM = "student_cloud_teacher_train_num";
+    //考级活动开始时间
+    String DEGREE_ACTIVITY_START_TIME = "degree_activity_start_time";
+    //考级活动开始时间
+    String DEGREE_ACTIVITY_END_TIME = "degree_activity_end_time";
+    //支持考级活动报名的分部列表
+    String DEGREE_SUPPORT_ORGAN_LIST = "degree_support_organ_list";
+
+
 
     String WARNING_MIN_COURSE_SALARY = "warning_min_course_salary";
 
@@ -340,6 +352,8 @@ public interface SysConfigService extends BaseService<Long, SysConfig> {
     //试用会员结束前3天提醒学员续费（默认提前3天）
     String EXPERIENCE_PUSH_MEMBER_RENEW = "experience_push_member_renew";
 
+    //云教练活动分部目标JSON
+    String CLOUD_TEACHER_ACTIVE_TARGET = "cloud_teacher_active_target";
 
     //会员结束前15天提醒学员续费（默认提前5天）
     String PUSH_MEMBER_RENEW_AGAIN = "push_member_renew_again";
@@ -358,15 +372,6 @@ public interface SysConfigService extends BaseService<Long, SysConfig> {
     //云教练试用时间最晚截止时间
     String EXPERIENCE_MEMBERSHIP_END_TIME = "experience_membership_end_time";
 
-    //云教练训练时长小于80分钟需要回访
-    String STUDENT_CLOUD_TEACHER_TOTAL_PLAY_TIME = "student_cloud_teacher_total_play_time";
-
-    //云教练训练次数小于4次需要回访
-    String STUDENT_CLOUD_TEACHER_TRAIN_NUM = "student_cloud_teacher_train_num";
-
-    //云教练活动分部目标JSON
-    String CLOUD_TEACHER_ACTIVE_TARGET = "cloud_teacher_active_target";
-
     /**
      * @return com.ym.mec.biz.dal.entity.SysConfig
      * @params paramName

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

@@ -1053,7 +1053,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 		String configValue = sysTenantConfigService.getTenantConfigValue(SysConfigService.ENABLE_STUDENT_ATTENDANCE_BEFOR_COURSE_START_TIME_RANGE_VIP, user.getTenantId());
 		String courseBeforeBufferTime = sysTenantConfigService.getTenantConfigValue(SysConfigService.COURSE_BEFORE_BUFFER_TIME, user.getTenantId());
 		String courseAfterBufferTime = sysTenantConfigService.getTenantConfigValue(SysConfigService.COURSE_AFTER_BUFFER_TIME, user.getTenantId());
-        Map<String, Object> result = new HashMap<>(3);
+        Map<String, Object> result = new HashMap<>(7);
         result.put("vipAppealDaysRange", sysConfigDao.findConfigValue(SysConfigService.VIP_APPEAL_DAYS_RANGE));
 		String tenantConfigValue = sysTenantConfigService.getTenantConfigValue(SysConfigService.ADVANCE_LEAVE_HOURS, user.getTenantId());
 		Integer advanceLeaveHours = 0;

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

@@ -1421,48 +1421,39 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         if(musicGroup.getTenantId() == null){
             throw new BizException("乐团机构信息异常，请联系管理员");
         }
-        //预报名开关
-        String configValue = sysTenantConfigService.getTenantConfigValue(SysConfigService.MUSIC_PRE_APPLY_OPEN_FLAG, musicGroup.getTenantId());
-        if(StringUtils.isNotEmpty(configValue) && configValue.equals(1)){
-            //记录操作日志
-            musicGroupBuildLogDao.insert(new MusicGroupBuildLog(musicGroupId, "审核通过（审核中 -> 预报名）", sysUser.getId(), ""));
-            musicGroup.setStatus(MusicGroupStatusEnum.PRE_APPLY);
-            musicGroupDao.update(musicGroup);
+        //记录操作日志
+        musicGroupBuildLogDao.insert(new MusicGroupBuildLog(musicGroupId, "审核通过（审核中 -> 预报名）", sysUser.getId(), ""));
+        musicGroup.setStatus(MusicGroupStatusEnum.PRE_APPLY);
+        musicGroupDao.update(musicGroup);
 
-            // 创建群
-            imGroupService.create(Long.parseLong(musicGroupId), null, "乐团预报名", null, musicGroup.getName(), musicGroup.getName(), null, GroupType.MUSIC.getCode());
+        // 创建群
+        imGroupService.create(Long.parseLong(musicGroupId), null, "乐团预报名", null, musicGroup.getName(), musicGroup.getName(), null, GroupType.MUSIC.getCode());
 
-            Map<Integer, String> userRoleMap = new HashMap<Integer, String>();
+        Map<Integer, String> userRoleMap = new HashMap<Integer, String>();
 
-            if (musicGroup.getTeamTeacherId() != null) {
-                userRoleMap.put(musicGroup.getTeamTeacherId(), "运营主管");
-            }
-            if (musicGroup.getEducationalTeacherId() != null) {
-                userRoleMap.put(musicGroup.getEducationalTeacherId(), "乐团主管");
-            }
-            if (musicGroup.getDirectorUserId() != null) {
-                userRoleMap.put(musicGroup.getDirectorUserId(), "乐队指导");
-            }
-            if (musicGroup.getTransactionTeacherId() != null) {
-                userRoleMap.put(musicGroup.getTransactionTeacherId(), "衔接老师");
-            }
-            // 添加成员
-            imGroupMemberService.join(Long.parseLong(musicGroupId), userRoleMap);
-            Set<Integer> roleIds = new HashSet<>(1);
-            roleIds.add(musicGroup.getEducationalTeacherId());
-            sysMessageService.batchSeoMessage(roleIds,
-                    MessageTypeEnum.BACKSTAGE_CREATE_MUSIC_GROUP_ADJUST_SUCCESS, "", musicGroup.getName());
-            Map<Integer, String> map = new HashMap<>(1);
-            map.put(musicGroup.getEducationalTeacherId(), musicGroup.getEducationalTeacherId().toString());
-            if (map != null && map.size() > 0) {
-                sysMessageService.batchSendMessage(MessageSender.JIGUANG, MessageTypeEnum.BACKSTAGE_CREATE_MUSIC_GROUP_ADJUST_SUCCESS,
-                        map, null, 0, null, "SYSTEM", musicGroup.getName());
-            }
-        }else {
-            //记录操作日志
-            musicGroupBuildLogDao.insert(new MusicGroupBuildLog(musicGroupId, "审核通过（审核中 -> 创建缴费中）", sysUser.getId(), ""));
-            musicGroup.setStatus(MusicGroupStatusEnum.PRE_BUILD_FEE);
-            musicGroupDao.update(musicGroup);
+        if (musicGroup.getTeamTeacherId() != null) {
+            userRoleMap.put(musicGroup.getTeamTeacherId(), "运营主管");
+        }
+        if (musicGroup.getEducationalTeacherId() != null) {
+            userRoleMap.put(musicGroup.getEducationalTeacherId(), "乐团主管");
+        }
+        if (musicGroup.getDirectorUserId() != null) {
+            userRoleMap.put(musicGroup.getDirectorUserId(), "乐队指导");
+        }
+        if (musicGroup.getTransactionTeacherId() != null) {
+            userRoleMap.put(musicGroup.getTransactionTeacherId(), "衔接老师");
+        }
+        // 添加成员
+        imGroupMemberService.join(Long.parseLong(musicGroupId), userRoleMap);
+        Set<Integer> roleIds = new HashSet<>(1);
+        roleIds.add(musicGroup.getEducationalTeacherId());
+        sysMessageService.batchSeoMessage(roleIds,
+                MessageTypeEnum.BACKSTAGE_CREATE_MUSIC_GROUP_ADJUST_SUCCESS, "", musicGroup.getName());
+        Map<Integer, String> map = new HashMap<>(1);
+        map.put(musicGroup.getEducationalTeacherId(), musicGroup.getEducationalTeacherId().toString());
+        if (map != null && map.size() > 0) {
+            sysMessageService.batchSendMessage(MessageSender.JIGUANG, MessageTypeEnum.BACKSTAGE_CREATE_MUSIC_GROUP_ADJUST_SUCCESS,
+                    map, null, 0, null, "SYSTEM", musicGroup.getName());
         }
     }
 

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

@@ -1,6 +1,9 @@
 package com.ym.mec.student.controller;
 
 
+import com.ym.mec.biz.service.SysConfigService;
+import com.ym.mec.biz.service.SysTenantConfigService;
+import com.ym.mec.biz.service.impl.SysConfigServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
@@ -75,6 +78,9 @@ public class DegreeController extends BaseController {
     private SysConfigDao sysConfigDao;
 
     @Autowired
+    private SysTenantConfigService sysTenantConfigService;
+
+    @Autowired
     private OrganizationDao organizationDao;
 
 	@Value("${message.debugMode: false}")
@@ -199,10 +205,10 @@ public class DegreeController extends BaseController {
 //        Student student = studentDao.get(user.getId());
         result.put("userInfo", user);
         //result.put("isNewUser", student.getIsNewUser());
-        
-        SysConfig organConfig = sysConfigDao.findByParamName("degree_support_organ_list");
-        if(StringUtils.isNotEmpty(organConfig.getParanValue())){
-            List<Integer> userIds = Arrays.stream(organConfig.getParanValue().split(",")).mapToInt(Integer::valueOf).boxed().collect(Collectors.toList());
+
+        String configValue = sysTenantConfigService.getTenantConfigValue(SysConfigService.DEGREE_SUPPORT_ORGAN_LIST, user.getTenantId());
+        if(StringUtils.isNotEmpty(configValue)){
+            List<Integer> userIds = Arrays.stream(configValue.split(",")).mapToInt(Integer::valueOf).boxed().collect(Collectors.toList());
             result.put("organs", organizationDao.findOrgans(userIds));
         }
         result.put("sporadicChargeInfo", sporadicChargeInfoService.queryDetailPage(queryInfo));