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

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

@@ -466,4 +466,13 @@ public interface CourseScheduleDao extends BaseDAO<Long, CourseSchedule> {
 	 * @return java.util.List<com.ym.mec.biz.dal.dto.IntegerAndIntegerListDto>
 	 */
 	List<IntegerAndIntegerListDto> findClassGroupAndUserIdsMap(@Param("classGroupIds") List<Integer> classGroup);
+
+	/**
+	 * @describe 获取指定日期的课程
+	 * @author Joburgess
+	 * @date 2019/11/3
+	 * @param date: 日期
+	 * @return java.util.List<com.ym.mec.biz.dal.entity.CourseSchedule>
+	 */
+	List<CourseSchedule> findCourseScheduleWithDate(@Param("date") Date date);
 }

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

@@ -7,6 +7,7 @@ import com.ym.mec.common.dal.BaseDAO;
 import org.apache.ibatis.annotations.Param;
 
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -45,7 +46,7 @@ public interface CourseScheduleTeacherSalaryDao extends BaseDAO<Long, CourseSche
      * @Date: 2019/10/15
      * @params [days:天数]
      * @return java.util.List<com.ym.mec.biz.dal.entity.TeacherDefaultVipGroupSalary>
-     * @describe 获取多少天之前的未结算教师课酬记录
+     * @describe 获取多少天之前的未结算教师课酬记录（vip课）
      */
     List<CourseScheduleTeacherSalary> findSomeDayAgoTeacherCourseSalaryNoSettlement(Integer days);
 

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

@@ -103,4 +103,13 @@ public interface MusicGroupDao extends BaseDAO<String, MusicGroup> {
      * @return
      */
     List<MusicGroup> queryListByIds(@Param("musicGroupIds") String musicGroupIds);
-}
+
+    /**
+     * @describe 根据乐团获取对应的结算方式
+     * @author Joburgess
+     * @date 2019/11/3
+     * @param musicGroupIds: 乐团编号列表
+     * @return java.util.List<java.util.Map<java.lang.String,java.lang.String>>
+     */
+    List<Map<String,String>> findSettlementTypeByMusicGroups(@Param("musicGroupIds") List<String> musicGroupIds);
+}

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

@@ -49,8 +49,16 @@ public interface MusicGroupSubjectPlanDao extends BaseDAO<Integer, MusicGroupSub
 
     /**
      * 修改计划招生人数
-     * @param updateExpectedNumDtos
+     * @param expectedStudentNum
+     * @param musicGroupSubjectPlanId
      * @return
      */
-    int updateExpectedStudentNum(@Param("updateExpectedNumDtos") List<UpdateExpectedNumDto> updateExpectedNumDtos);
+    int updateExpectedStudentNum(@Param("expectedStudentNum") Integer expectedStudentNum,@Param("musicGroupSubjectPlanId") Integer musicGroupSubjectPlanId);
+
+    /**
+     *
+     * @param musicGroupSubjectPlans
+     * @return
+     */
+    int batchUpdateFee(@Param("plans") List<MusicGroupSubjectPlan> musicGroupSubjectPlans);
 }

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

@@ -204,4 +204,11 @@ public interface StudentRegistrationDao extends BaseDAO<Long, StudentRegistratio
      * @return
      */
     List<Map<Long, Long>> countApplyNum(String musicGroupId);
+
+    /**
+     * 根据家长手机号获取用户编号
+     * @param parentPhones
+     * @return
+     */
+    List<Map<Integer, String>> findParentId(String parentPhones);
 }

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

@@ -8,7 +8,7 @@ public class UpdateExpectedNumDto {
     private Integer musicGroupSubjectPlanId;
 
     @ApiModelProperty(value = "计划招生人数",required = false)
-    private Integer expectedNum;
+    private Integer expectedStudentNum;
 
     public Integer getMusicGroupSubjectPlanId() {
         return musicGroupSubjectPlanId;
@@ -18,11 +18,11 @@ public class UpdateExpectedNumDto {
         this.musicGroupSubjectPlanId = musicGroupSubjectPlanId;
     }
 
-    public Integer getExpectedNum() {
-        return expectedNum;
+    public Integer getExpectedStudentNum() {
+        return expectedStudentNum;
     }
 
-    public void setExpectedNum(Integer expectedNum) {
-        this.expectedNum = expectedNum;
+    public void setExpectedStudentNum(Integer expectedStudentNum) {
+        this.expectedStudentNum = expectedStudentNum;
     }
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/page/VipGroupQueryInfo.java

@@ -12,6 +12,26 @@ public class VipGroupQueryInfo extends QueryInfo {
 
     private Long vipGroupId;
 
+    private Integer teacherId;
+
+    private Integer activityId;
+
+    public Integer getTeacherId() {
+        return teacherId;
+    }
+
+    public void setTeacherId(Integer teacherId) {
+        this.teacherId = teacherId;
+    }
+
+    public Integer getActivityId() {
+        return activityId;
+    }
+
+    public void setActivityId(Integer activityId) {
+        this.activityId = activityId;
+    }
+
     public Long getVipGroupId() {
         return vipGroupId;
     }

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

@@ -30,8 +30,16 @@ public interface CourseScheduleTeacherSalaryService extends BaseService<Long, Co
      * @Date: 2019/10/15
      * @params []
      * @return void
-     * @describe 教师课酬结算
+     * @describe 教师vip课课酬结算
      */
     void teacherSalarySettlement();
 
-}
+    /**
+     * @describe 教师乐团课课酬结算
+     * @author Joburgess
+     * @date 2019/11/3
+     * @return void
+     */
+    void musicGroupTeacherSalarySettlement();
+
+}

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

@@ -23,7 +23,7 @@ public interface MusicGroupService extends BaseService<String, MusicGroup> {
 	 * @param subFeeSettingDto
 	 * @Author superzou
 	 */
-	String createGroup(SubFeeSettingDto subFeeSettingDto, Integer userId);
+	String createGroup(SubFeeSettingDto subFeeSettingDto) throws Exception;
 
 	/**
 	 * 获取学生所在乐团详情
@@ -158,11 +158,11 @@ public interface MusicGroupService extends BaseService<String, MusicGroup> {
     List<CourseScheduleTeachersDto> queryTeacherSalary(Integer courseScheduleId);
 
 	/**
-	 * 开启缴费
+	 * 开启缴费（报名中 -->  缴费中）
 	 * @param musicGroupId
 	 * @return
 	 */
-	MusicGroup openPay(String musicGroupId, String expireDate);
+	MusicGroup openPay(String musicGroupId, String expireDate) throws Exception;
 
 	/**
 	 * 获取乐团详情
@@ -202,11 +202,29 @@ public interface MusicGroupService extends BaseService<String, MusicGroup> {
 	 * @param updateExpectedNumDtos
 	 * @return
 	 */
-    int updateExpectedStudentNum(List<UpdateExpectedNumDto> updateExpectedNumDtos);
+	void updateExpectedStudentNum(List<UpdateExpectedNumDto> updateExpectedNumDtos);
 
 	/**
 	 * 开启乐团（筹备中 -->  进行中）
 	 * @param musicGroupId
 	 */
 	void musicGroupAction(String musicGroupId) throws Exception;
+
+	/**
+	 * 提交审核（草稿 -> 审核中）
+	 * @param musicGroupId
+	 */
+	void musicGroupAudit(String musicGroupId) throws Exception;
+
+	/**
+	 * 审核失败（审核中 -> 审核失败）
+	 * @param musicGroupId
+	 */
+	void musicGroupAuditFailed(String musicGroupId,String memo) throws Exception;
+
+	/**
+	 * 审核通过（审核中 -> 报名中）
+	 * @param musicGroupId
+	 */
+	void musicGroupAuditSuccess(String musicGroupId) throws Exception;
 }

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

@@ -47,4 +47,11 @@ public interface MusicGroupSubjectPlanService extends BaseService<Integer, Music
      * @param subjectId
      */
     void addApplyStudentNum(String musicGroupId, Integer subjectId,int num);
+
+    /**
+     * 批量修改声部规划费用
+     * @param musicGroupSubjectPlans
+     * @return
+     */
+    int batchUpdateFee(List<MusicGroupSubjectPlan> musicGroupSubjectPlans);
 }

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

@@ -208,4 +208,11 @@ public interface StudentRegistrationService extends BaseService<Long, StudentReg
 	 * @return
 	 */
 	List<StudentRegistration> queryStudentByMusicGroupId(String musicGroupId);
+
+	/**
+	 * 根据家长的手机号列表，获取用户编号
+	 * @param parentPhones
+	 * @return
+	 */
+	List<Map<Integer,String>> findParentId(String parentPhones);
 }

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

@@ -122,7 +122,6 @@ public class ClassGroupTeacherMapperServiceImpl extends BaseServiceImpl<Long, Cl
                 BigDecimal salary = new BigDecimal("0");
                 List<TeacherDefaultMusicGroupSalary> teacherDefaultMusicGroupSalaryList = classGroupTeacherMapper.getTeacherDefaultMusicGroupSalaryList();
 
-
                 for (TeacherDefaultMusicGroupSalary teacherDefaultMusicGroupSalary : teacherDefaultMusicGroupSalaryList) {
                     //对应基准课酬
 //                    BigDecimal baseSalary = classGroupTeacherMapper.getTeacherRole().equals(TeachTypeEnum.BISHOP) ? teacherDefaultMusicGroupSalary.getMainTeacher30MinSalary() : teacherDefaultMusicGroupSalary.getAssistantTeacher30MinSalary();

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

@@ -7,6 +7,7 @@ import com.ym.mec.biz.service.*;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
+import com.ym.mec.util.date.DateUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -35,6 +36,10 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
 	private VipGroupService vipGroupService;
 	@Autowired
 	private SchoolService schoolService;
+	@Autowired
+	private CourseScheduleDao courseScheduleDao;
+	@Autowired
+	private TeacherDefaultMusicGroupSalaryDao teacherDefaultMusicGroupSalaryDao;
 	
 	@Autowired
 	private SysConfigDao sysConfigDao;
@@ -236,4 +241,14 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
 		});
 
 	}
+
+	@Override
+	public void musicGroupTeacherSalarySettlement() {
+		Date now=new Date();
+		Date yesterday= DateUtil.addDays1(now,-1);
+		List<CourseScheduleTeacherSalary> courseScheduleTeacherSalaryList = new ArrayList<>();
+		//获取昨天的课程计划
+		List<CourseSchedule> yesterdayCourseSchedules = courseScheduleDao.findCourseScheduleWithDate(yesterday);
+
+	}
 }

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

@@ -104,6 +104,9 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 	@Autowired
 	private SysMessageService sysMessageService;
 
+	@Autowired
+	private SysMessageConfigDao sysMessageConfigDao;
+
     @Override
     public BaseDAO<String, MusicGroup> getDAO() {
         return musicGroupDao;
@@ -111,14 +114,18 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public String createGroup(SubFeeSettingDto subFeeSettingDto, Integer userId) {
+    public String createGroup(SubFeeSettingDto subFeeSettingDto) throws Exception {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if(sysUser == null){
+            throw new Exception("用户信息获取失败");
+        }
         MusicGroup musicGroup = subFeeSettingDto.getMusicGroup();
         List<MusicGroupSubjectGoodsGroup> musicGroupSubjectGoodsGroups = subFeeSettingDto.getMusicGroupSubjectGoodsGroups();
         List<MusicGroupSubjectPlan> musicGroupSubjectPlans = subFeeSettingDto.getMusicGroupSubjectPlans();
         List<SubjectRegisterDto> subjectRegisters = subFeeSettingDto.getSubjectRegisters();
         String musicGroupId = idGeneratorService.generatorId() + "";
         musicGroup.setId(musicGroupId);
-        musicGroup.setStatus(MusicGroupStatusEnum.APPLY);
+        musicGroup.setStatus(MusicGroupStatusEnum.DRAFT);
         // 保存乐团基本信息
         musicGroupDao.insert(musicGroup);
         // 保存乐团付费主体列表
@@ -166,7 +173,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
             musicGroupSubjectGoodsGroupDao.batchInsert(musicGroupSubjectGoodsGroups,musicGroupId);
         }
         // 记录创建日志
-        musicGroupBuildLogDao.insert(new MusicGroupBuildLog(musicGroupId, "提交建团申请", userId, ""));
+        musicGroupBuildLogDao.insert(new MusicGroupBuildLog(musicGroupId, "保存乐团草稿", sysUser.getId(), ""));
         return musicGroupId;
     }
 
@@ -182,10 +189,9 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         //乐团状态是否正确
         MusicGroup musicGroup = musicGroupDao.get(musicGroupId);
         if(musicGroup != null){
-            if(musicGroup.getStatus() != MusicGroupStatusEnum.AUDIT || musicGroup.getStatus() != MusicGroupStatusEnum.DRAFT){
-                throw new Exception("乐团状态异常");
+            if(musicGroup.getStatus() != MusicGroupStatusEnum.DRAFT || musicGroup.getStatus() != MusicGroupStatusEnum.AUDIT_FAILED){
+                throw new Exception("当前乐团状态不支持此操作");
             }
-
             //记录日志信息
             musicGroupBuildLogDao.insert(new MusicGroupBuildLog(musicGroupId,"修改乐团计划声部、乐器",sysUser.getId(), JSONObject.toJSONString(subFeeSettingDto)));
             //删除原有的乐团声部规划
@@ -202,8 +208,10 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public int updateExpectedStudentNum(List<UpdateExpectedNumDto> updateExpectedNumDtos) {
-        return musicGroupSubjectPlanDao.updateExpectedStudentNum(updateExpectedNumDtos);
+    public void updateExpectedStudentNum(List<UpdateExpectedNumDto> updateExpectedNumDtos) {
+        updateExpectedNumDtos.forEach(e->{
+            musicGroupSubjectPlanDao.updateExpectedStudentNum(e.getExpectedStudentNum(),e.getMusicGroupSubjectPlanId());
+        });
     }
 
     @Override
@@ -213,13 +221,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         if(sysUser == null){
             throw new Exception("用户信息获取失败");
         }
-        MusicGroup musicGroup = musicGroupDao.get(musicGroupId);
-        if(musicGroup == null){
-            throw new Exception("乐团信息不存在");
-        }
-        if(musicGroup.getStatus() != MusicGroupStatusEnum.PREPARE){
-            throw new Exception("乐团状态异常");
-        }
+        MusicGroup musicGroup = saveLog(musicGroupId,MusicGroupStatusEnum.PREPARE);
         //乐器采购清单是否确认
         Map<String,Object> param = new HashMap<>();
         param.put("musicGroupId",musicGroupId);
@@ -229,11 +231,62 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         }
         //课酬是否确认
 //        courseScheduleTeacherSalaryDao.queryCount();
-        Date date = new Date();
         //记录操作日志
         musicGroupBuildLogDao.insert(new MusicGroupBuildLog(musicGroupId,"确认开团(筹备中 -> 进行中)",sysUser.getId(),""));
         musicGroup.setStatus(MusicGroupStatusEnum.PROGRESS);
+        musicGroupDao.update(musicGroup);
+    }
+
+    private MusicGroup saveLog(String musicGroupId,MusicGroupStatusEnum statusEnum) throws Exception {
+        Date date = new Date();
+        MusicGroup musicGroup = musicGroupDao.get(musicGroupId);
+        if(musicGroup == null){
+            throw new Exception("乐团信息不存在");
+        }
+        if(musicGroup.getStatus() != statusEnum){
+            throw new Exception("当前乐团状态不支持此操作");
+        }
         musicGroup.setUpdateTime(date);
+        return musicGroup;
+    }
+
+    @Override
+    public void musicGroupAudit(String musicGroupId) throws Exception {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if(sysUser == null){
+            throw new Exception("用户信息获取失败");
+        }
+        MusicGroup musicGroup = saveLog(musicGroupId,MusicGroupStatusEnum.DRAFT);
+        //记录操作日志
+        musicGroupBuildLogDao.insert(new MusicGroupBuildLog(musicGroupId,"提交审核（草稿 -> 审核中）",sysUser.getId(),""));
+        musicGroup.setStatus(MusicGroupStatusEnum.AUDIT);
+        musicGroupDao.update(musicGroup);
+    }
+
+    @Override
+    public void musicGroupAuditFailed(String musicGroupId,String memo) throws Exception {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if(sysUser == null){
+            throw new Exception("用户信息获取失败");
+        }
+        MusicGroup musicGroup = saveLog(musicGroupId,MusicGroupStatusEnum.AUDIT);
+        //记录操作日志
+        musicGroupBuildLogDao.insert(new MusicGroupBuildLog(musicGroupId,"审核失败（审核中 -> 审核失败）",sysUser.getId(),memo));
+        musicGroup.setMemo(memo);
+        musicGroup.setStatus(MusicGroupStatusEnum.AUDIT_FAILED);
+        musicGroupDao.update(musicGroup);
+    }
+
+    @Override
+    public void musicGroupAuditSuccess(String musicGroupId) throws Exception {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if(sysUser == null){
+            throw new Exception("用户信息获取失败");
+        }
+        MusicGroup musicGroup = saveLog(musicGroupId,MusicGroupStatusEnum.AUDIT);
+        //记录操作日志
+        musicGroupBuildLogDao.insert(new MusicGroupBuildLog(musicGroupId,"审核失败（审核中 -> 报名中）",sysUser.getId(),""));
+        musicGroup.setStatus(MusicGroupStatusEnum.APPLY);
         musicGroupDao.update(musicGroup);
     }
 
@@ -659,57 +712,64 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void updateBaseInfo(SubFeeSettingDto subFeeSettingDto) throws Exception {
-        MusicGroup musicGroup = subFeeSettingDto.getMusicGroup();
-        String musicGroupId = musicGroup.getId();
-        MusicGroup group = musicGroupDao.get(musicGroupId);
-        if(group != null){
-            Date date = new Date();
-            List<Integer> months = subFeeSettingDto.getMonths();
-            //删除乐团相关付费周期
-            musicGroupPaymentCalenderDao.delByGroupId(musicGroupId);
-            if(months != null && months.size() > 0){
-                Integer num = musicGroupStudentFeeDao.countStudentNoPayNum(musicGroupId);
-                if(num > 0){
-                    throw new Exception("缴费周期更新失败，当前乐团有未缴费的学员");
-                }
-                //修改学员下次缴费日期
-                //获取当前月份
-                int currentMonth = Integer.parseInt(DateUtil.getMonth(date));
-                int nextMonth = currentMonth;
-                for (int i = 0;i < months.size();i++){
-                    if(i == months.size()-1 && months.get(i) <= currentMonth){
-                        nextMonth = months.get(0);
-                        break;
-                    }else if(months.get(i) > currentMonth){
-                        nextMonth = months.get(i);
-                        break;
-                    }
-                }
-                // 修改学员付费周期
-                Date nextPaymentDate = null;
-                if(nextMonth > currentMonth){
-                    nextPaymentDate = DateUtil.addMonths(date, nextMonth - currentMonth);
-                }else if(nextMonth < currentMonth) {
-                    nextPaymentDate = DateUtil.addMonths(date, 12 - currentMonth + nextMonth);
-                }else {
-                    nextPaymentDate = DateUtil.addMonths(date, 12);
-                }
-                musicGroupStudentFeeDao.updateNextPaymentDate(musicGroupId,nextPaymentDate);
-                //批量插入
-                musicGroupPaymentCalenderDao.batchAdd(months,musicGroupId);
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if(sysUser == null){
+            throw new Exception("用户信息获取失败");
+        }
+        String musicGroupId = subFeeSettingDto.getMusicGroup().getId();
+        MusicGroup musicGroup = saveLog(musicGroupId,MusicGroupStatusEnum.DRAFT);
+        if(musicGroup.getStatus() != MusicGroupStatusEnum.AUDIT_FAILED){
+            throw new Exception("当前乐团状态不支持此操作");
+        }
+
+        Date date = new Date();
+        List<Integer> months = subFeeSettingDto.getMonths();
+        //删除乐团相关付费周期
+        musicGroupPaymentCalenderDao.delByGroupId(musicGroupId);
+        if(months != null && months.size() > 0){
+            Integer num = musicGroupStudentFeeDao.countStudentNoPayNum(musicGroupId);
+            if(num > 0){
+                throw new Exception("缴费周期更新失败，当前乐团有未缴费的学员");
             }
-            musicGroupDao.update(musicGroup);
-            //修改课程里面的教学点
-            if(!group.getSchoolId().equals(musicGroup.getSchoolId())){
-                courseScheduleDao.updateByMusicGroupId(musicGroupId,musicGroup.getSchoolId());
+            //修改学员下次缴费日期
+            //获取当前月份
+            int currentMonth = Integer.parseInt(DateUtil.getMonth(date));
+            int nextMonth = currentMonth;
+            for (int i = 0;i < months.size();i++){
+                if(i == months.size()-1 && months.get(i) <= currentMonth){
+                    nextMonth = months.get(0);
+                    break;
+                }else if(months.get(i) > currentMonth){
+                    nextMonth = months.get(i);
+                    break;
+                }
             }
-            // 删除乐团付费主体列表
-            musicGroupPaymentEntitiesDao.delByGroupId(musicGroupId);
-            //批量新增
-            if(subFeeSettingDto.getMusicGroupPaymentEntities() != null && subFeeSettingDto.getMusicGroupPaymentEntities().size() > 0){
-                musicGroupPaymentEntitiesDao.batchAdd(subFeeSettingDto.getMusicGroupPaymentEntities(),musicGroupId);
+            // 修改学员付费周期
+            Date nextPaymentDate = null;
+            if(nextMonth > currentMonth){
+                nextPaymentDate = DateUtil.addMonths(date, nextMonth - currentMonth);
+            }else if(nextMonth < currentMonth) {
+                nextPaymentDate = DateUtil.addMonths(date, 12 - currentMonth + nextMonth);
+            }else {
+                nextPaymentDate = DateUtil.addMonths(date, 12);
             }
+            musicGroupStudentFeeDao.updateNextPaymentDate(musicGroupId,nextPaymentDate);
+            //批量插入
+            musicGroupPaymentCalenderDao.batchAdd(months,musicGroupId);
         }
+        musicGroupDao.update(musicGroup);
+        //修改课程里面的教学点
+        if(!musicGroup.getSchoolId().equals(musicGroup.getSchoolId())){
+            courseScheduleDao.updateByMusicGroupId(musicGroupId,musicGroup.getSchoolId());
+        }
+        // 删除乐团付费主体列表
+        musicGroupPaymentEntitiesDao.delByGroupId(musicGroupId);
+        //批量新增
+        if(subFeeSettingDto.getMusicGroupPaymentEntities() != null && subFeeSettingDto.getMusicGroupPaymentEntities().size() > 0){
+            musicGroupPaymentEntitiesDao.batchAdd(subFeeSettingDto.getMusicGroupPaymentEntities(),musicGroupId);
+        }
+        //记录操作日志
+        musicGroupBuildLogDao.insert(new MusicGroupBuildLog(musicGroupId,"修改乐团基本信息数据",sysUser.getId(),JSONObject.toJSONString(subFeeSettingDto)));
     }
 
     @Override
@@ -746,10 +806,16 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
     }
 
     @Override
-    public MusicGroup openPay(String musicGroupId, String expireDate) {
-        MusicGroup musicGroup = musicGroupDao.get(musicGroupId);
-        musicGroup.setStatus(MusicGroupStatusEnum.PAY);
+    public MusicGroup openPay(String musicGroupId, String expireDate) throws Exception {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if(sysUser == null){
+            throw new Exception("用户信息获取失败");
+        }
+        MusicGroup musicGroup = saveLog(musicGroupId,MusicGroupStatusEnum.APPLY);
+        //记录操作日志
+        musicGroupBuildLogDao.insert(new MusicGroupBuildLog(musicGroupId,"开启缴费（报名中 -->  缴费中）",sysUser.getId(),""));
         musicGroup.setApplyExpireDate(DateUtil.toDate(expireDate));
+        musicGroup.setStatus(MusicGroupStatusEnum.PAY);
         musicGroupDao.update(musicGroup);
         return musicGroup;
     }
@@ -798,25 +864,20 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         if(sysUser == null){
             throw new Exception("用户信息获取失败");
         }
-        Date date = new Date();
-        MusicGroup musicGroup = musicGroupDao.get(musicGroupId);
-        if(musicGroup == null){
-            throw new Exception("乐团信息不存在");
-        }
-        if(musicGroup.getStatus() != MusicGroupStatusEnum.PAY){
-            throw new Exception("乐团状态异常");
-        }
+        MusicGroup musicGroup = saveLog(musicGroupId,MusicGroupStatusEnum.PAY);
         //记录操作日志
         musicGroupBuildLogDao.insert(new MusicGroupBuildLog(musicGroupId,"确认开团(缴费中 -> 筹备中)",sysUser.getId(),""));
         musicGroup.setStatus(MusicGroupStatusEnum.PREPARE);
-        musicGroup.setUpdateTime(date);
         musicGroupDao.update(musicGroup);
+
         //给家长发送乐团基础训练课短信
         //获取所有乐团学员列表
-//        List<StudentRegistration> students = studentRegistrationService.queryStudentByMusicGroupId(musicGroupId);
+        List<StudentRegistration> students = studentRegistrationService.queryStudentByMusicGroupId(musicGroupId);
         //获取所有家长电话
-//        Set<String> parentsPhones = students.stream().map(StudentRegistration::getParentsPhone).collect(Collectors.toSet());
-//        String content = sysConfigDao.findConfigValue(MessageTypeEnum.SMS_BASICS_SKILL_APPLY_MESSAGE.getCode());
-//        sysMessageService.batchSendMessage(MessageSender.YIMEI,"",content,parentsPhones,date,0,"");
+        Set<String> parentsPhones = students.stream().map(StudentRegistration::getParentsPhone).collect(Collectors.toSet());
+        //获取对应家长的用户编号
+//        Map<Integer,String> userIds = MapUtil.convertMybatisMap(studentRegistrationService.findParentId(StringUtils.join(parentsPhones,",")));
+//        String content = sysMessageConfigDao.findContent(MessageTypeEnum.SMS_BASICS_SKILL_APPLY_MESSAGE.getCode());
+//        sysMessageService.batchSendMessage(MessageSender.YIMEI,"",content,userIds,date,0,"");
     }
 }

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

@@ -120,4 +120,9 @@ public class MusicGroupSubjectPlanServiceImpl extends BaseServiceImpl<Integer, M
         musicOneSubjectClassPlan.setUpdateTime(new Date());
         musicGroupSubjectPlanDao.updateApplyStudentNum(musicOneSubjectClassPlan);
     }
+
+    @Override
+    public int batchUpdateFee(List<MusicGroupSubjectPlan> musicGroupSubjectPlans) {
+        return musicGroupSubjectPlanDao.batchUpdateFee(musicGroupSubjectPlans);
+    }
 }

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

@@ -582,4 +582,9 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
     public List<StudentRegistration> queryStudentByMusicGroupId(String musicGroupId) {
         return studentRegistrationDao.queryStudentByMusicGroupId(musicGroupId);
     }
+
+    @Override
+    public List<Map<Integer, String>> findParentId(String parentPhones) {
+        return studentRegistrationDao.findParentId(parentPhones);
+    }
 }

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

@@ -362,27 +362,27 @@
 
     <select id="getCourseSchedulesWithDate" resultMap="courseScheduleDto">
         SELECT
-        cg.id_ seal_class_id_,
-        cs.name_,
-        cs.type_,
-        cs.id_,
-        cs.class_date_,
-        CONCAT(cs.class_date_,' ',cs.start_class_time_) start_class_time_,
-        CONCAT(cs.class_date_,' ',cs.end_class_time_) end_class_time_,
-        cs.status_,
-        cs.student_num_,
-        cs.leave_student_num_,
-        cg.student_num_ total_student_num_,
-        su.username_ teacher_name_,
-        ta.sign_in_status_ attendance_status_
+            cg.id_ seal_class_id_,
+            cs.name_,
+            cs.type_,
+            cs.id_,
+            cs.class_date_,
+            CONCAT(cs.class_date_,' ',cs.start_class_time_) start_class_time_,
+            CONCAT(cs.class_date_,' ',cs.end_class_time_) end_class_time_,
+            cs.status_,
+            cs.student_num_,
+            cs.leave_student_num_,
+            cg.student_num_ total_student_num_,
+            su.username_ teacher_name_,
+            ta.sign_in_status_ attendance_status_
         FROM
-        music_group mg
-        LEFT JOIN class_group cg ON mg.id_ = cg.music_group_id_
-        LEFT JOIN course_schedule cs ON cg.id_ = cs.class_group_id_
-        LEFT JOIN sys_user su ON cs.teacher_id_=su.id_
-        LEFT JOIN teacher_attendance ta ON cs.id_=ta.class_group_id_ AND ta.teacher_id_=cs.teacher_id_
+            music_group mg
+            LEFT JOIN class_group cg ON mg.id_ = cg.music_group_id_
+            LEFT JOIN course_schedule cs ON cg.id_ = cs.class_group_id_
+            LEFT JOIN sys_user su ON cs.teacher_id_=su.id_
+            LEFT JOIN teacher_attendance ta ON cs.id_=ta.class_group_id_ AND ta.teacher_id_=cs.teacher_id_
         WHERE
-        mg.organ_id_ = #{organId}
+            mg.organ_id_ = #{organId}
         AND cs.id_ IS NOT NULL
         AND cs.class_date_ = DATE_FORMAT(#{date},'%Y-%m-%d')
         <include refid="global.limit"/>
@@ -1131,4 +1131,11 @@
             #{classGroupId}
         </foreach>
     </select>
+    <select id="findCourseScheduleWithDate" resultMap="CourseSchedule">
+        SELECT
+            cs.*
+        FROM
+            course_schedule cs
+        WHERE cs.class_date_=DATE_FORMAT(#{date},'%Y-%m-%d %H:%i:%s')
+    </select>
 </mapper>

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

@@ -159,6 +159,7 @@
 		LEFT JOIN course_schedule cs ON cs.id_ = csts.course_schedule_id_
 		WHERE
 		CONCAT( cs.class_date_, ' ', cs.start_class_time_ ) <= DATE_ADD( NOW( ), INTERVAL - 7 DAY )
+		AND cs.type_='VIP'
 		AND csts.settlement_time_ IS NULL
     </select>
     

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

@@ -301,4 +301,16 @@
     <select id="queryListByIds" resultMap="MusicGroup" parameterType="list">
 		SELECT * FROM music_group WHERE FIND_IN_SET(id_,#{musicGroupIds})
 	</select>
+    <select id="findSettlementTypeByMusicGroups" resultType="map">
+		SELECT
+			id_ AS 'key',
+			settlement_type_ AS 'value'
+		FROM
+			music_group
+		WHERE
+			id_ IN
+			<foreach collection="musicGroupIds" item="musicGroupId" open="(" close=")" separator=",">
+				#{musicGroupId}
+			</foreach>
+    </select>
 </mapper>

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

@@ -104,12 +104,12 @@
     </update>
 
     <update id="updateExpectedStudentNum">
-        <foreach collection="updateExpectedNumDtos" item="item" index="index" open="" close="" separator=";">
-            UPDATE music_group_subject_plan
-            <set>
-                expected_student_num_ = #{item.expectedNum}
-            </set>
-            where id_ = #{item.musicGroupSubjectPlanId}
+        UPDATE music_group_subject_plan SET expected_student_num_ = #{expectedStudentNum},update_time_ = now() WHERE id_ = #{musicGroupSubjectPlanId}
+    </update>
+
+    <update id="batchUpdateFee">
+        <foreach collection="plans" item="item" separator=";">
+            UPDATE music_group_subject_plan SET fee_ = #{item.fee},update_time_ = now() WHERE id_ = #{item.id}
         </foreach>
     </update>
 

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

@@ -429,6 +429,17 @@
         GROUP BY actual_subject_id_
     </select>
 
+    <select id="findParentId" resultType="java.util.Map">
+        SELECT MAX(sr.user_id_) `key`,sr.parents_phone_ `value`
+        FROM student_registration sr
+        WHERE FIND_IN_SET(sr.parents_phone_,#{parentPhones})
+        GROUP BY sr.parents_phone_
+    </select>
+    <select id="queryStudentByMusicGroupId" resultMap="StudentRegistration">
+        SELECT * FROM student_registration sr
+        WHERE sr.music_group_id_ = #{musicGroupId} AND sr.payment_status_ = 2
+    </select>
+
     <!-- 批量开启缴费 -->
     <update id="batchOpenPay">
         UPDATE student_registration

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

@@ -118,8 +118,15 @@
 
     <sql id="vipGroupQueryCondition">
         <where>
+            1=1
             <if test="search!=null and search!=''">
-                vg.name LIKE CONCAT('%',#{search},'%')
+                AND (vg.name_ LIKE CONCAT('%',#{search},'%') OR vg.id_=#{search})
+            </if>
+            <if test="teacherId!=null">
+                AND vg.user_id_=#{teacherId}
+            </if>
+            <if test="activityId!=null">
+                AND vg.vip_group_activity_id_=#{activityId}
             </if>
             <if test="organId!=null">
                 AND FIND_IN_SET(#{organId},vg.organ_id_list_)

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

@@ -73,7 +73,8 @@ public class MusicGroupController extends BaseController {
 		if(updateExpectedNumDtos == null || updateExpectedNumDtos.size() <= 0){
 			return failed("参数校验错误");
 		}
-		return succeed(musicGroupService.updateExpectedStudentNum(updateExpectedNumDtos));
+		musicGroupService.updateExpectedStudentNum(updateExpectedNumDtos);
+		return succeed();
 	}
 
 	@ApiOperation(value = "根据乐团编号查询乐团详情")
@@ -98,12 +99,12 @@ public class MusicGroupController extends BaseController {
 	@ApiOperation(value = "新增乐团  建团申请数据提交")
 	@PostMapping("/createGroup")
 	@PreAuthorize("@pcs.hasPermissions('musicGroup/createGroup')")
-	public Object createGroup(@RequestBody SubFeeSettingDto subFeeSettingDto) {
+	public Object createGroup(@RequestBody SubFeeSettingDto subFeeSettingDto) throws Exception {
 		SysUser sysUser = sysUserFeignService.queryUserInfo();
 		if (sysUser == null || sysUser.getId() == null) {
 			return failed("获取用户信息失败");
 		}
-		return succeed(musicGroupService.createGroup(subFeeSettingDto, sysUser.getId()));
+		return succeed(musicGroupService.createGroup(subFeeSettingDto));
 	}
 
 	@ApiOperation(value = "根据乐团ids获取乐团列表")
@@ -116,12 +117,12 @@ public class MusicGroupController extends BaseController {
 		return succeed(musicGroupService.queryListByIds(musicGroupIds));
 	}
 
-	@ApiOperation(value = "开启乐团缴费功能")
+	@ApiOperation(value = "开启缴费（报名中 -->  缴费中）")
 	@PostMapping("/openPay")
 	@PreAuthorize("@pcs.hasPermissions('musicGroup/openPay')")
 	@ApiImplicitParams({ @ApiImplicitParam(name = "musicGroupId", value = "乐团编号", required = true, dataType = "String"),
 			@ApiImplicitParam(name = "expireDate", value = "截止缴费日期", required = true, dataType = "String") })
-	public Object openPay(String musicGroupId, String expireDate) {
+	public Object openPay(String musicGroupId, String expireDate) throws Exception {
 		return succeed(musicGroupService.openPay(musicGroupId, expireDate));
 	}
 
@@ -134,6 +135,34 @@ public class MusicGroupController extends BaseController {
 		return succeed();
 	}
 
+	@ApiOperation(value = "提交审核（草稿 -> 审核中）")
+	@PostMapping("/audit")
+	@PreAuthorize("@pcs.hasPermissions('musicGroup/audit')")
+	@ApiImplicitParams({ @ApiImplicitParam(name = "musicGroupId", value = "乐团编号", required = true, dataType = "String") })
+	public Object audit(String musicGroupId) throws Exception {
+		musicGroupService.musicGroupAudit(musicGroupId);
+		return succeed();
+	}
+
+	@ApiOperation(value = "审核失败（审核中 -> 审核失败）")
+	@PostMapping("/auditFailed")
+	@PreAuthorize("@pcs.hasPermissions('musicGroup/auditFailed')")
+	@ApiImplicitParams({ @ApiImplicitParam(name = "musicGroupId", value = "乐团编号", required = true, dataType = "String"),
+			@ApiImplicitParam(name = "memo", value = "memo", required = true, dataType = "String") })
+	public Object auditFailed(String musicGroupId,String memo) throws Exception {
+		musicGroupService.musicGroupAuditFailed(musicGroupId,memo);
+		return succeed();
+	}
+
+	@ApiOperation(value = "审核通过（审核中 -> 报名中）")
+	@PostMapping("/auditSuccess")
+	@PreAuthorize("@pcs.hasPermissions('musicGroup/auditSuccess')")
+	@ApiImplicitParams({ @ApiImplicitParam(name = "musicGroupId", value = "乐团编号", required = true, dataType = "String")})
+	public Object auditSuccess(String musicGroupId) throws Exception {
+		musicGroupService.musicGroupAuditSuccess(musicGroupId);
+		return succeed();
+	}
+
 	@ApiOperation(value = "开启乐团（筹备中 -->  进行中）")
 	@PostMapping("/action")
 	@PreAuthorize("@pcs.hasPermissions('musicGroup/action')")

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

@@ -1,5 +1,6 @@
 package com.ym.mec.web.controller;
 
+import com.ym.mec.biz.dal.entity.MusicGroupSubjectPlan;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -14,6 +15,8 @@ import org.springframework.web.bind.annotation.RestController;
 import com.ym.mec.biz.service.MusicGroupSubjectPlanService;
 import com.ym.mec.common.controller.BaseController;
 
+import java.util.List;
+
 @RequestMapping("musicGroupSubjectPlan")
 @Api(tags = "乐团声部计划服务")
 @RestController
@@ -36,4 +39,18 @@ public class MusicGroupSubjectPlanController extends BaseController {
         return succeed(musicGroupSubjectPlanService.getMusicSubjectClassPlan(musicGroupId));
     }
 
+    @ApiOperation(value = "获取乐团声部规划列表")
+    @GetMapping("/queryPage")
+    @PreAuthorize("@pcs.hasPermissions('musicGroupSubjectPlan/queryPage')")
+    public Object queryPage(@ApiParam(value = "乐团编号", required = true) String musicGroupId) {
+        return succeed(musicGroupSubjectPlanService.getMusicSubjectClassPlan(musicGroupId));
+    }
+
+    @ApiOperation(value = "修改乐团声部规划费用")
+    @GetMapping("/batchUpdateFee")
+    @PreAuthorize("@pcs.hasPermissions('musicGroupSubjectPlan/batchUpdateFee')")
+    public Object batchUpdateFee(List<MusicGroupSubjectPlan> musicGroupSubjectPlans) {
+        return succeed(musicGroupSubjectPlanService.batchUpdateFee(musicGroupSubjectPlans));
+    }
+
 }