Merge remote-tracking branch 'origin/master'

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

@@ -238,7 +238,9 @@ public class MusicGroupPaymentCalenderDetailServiceImpl extends BaseServiceImpl<
 		if(musicGroupPaymentCalender == null){
 			throw new BizException("查询缴费信息失败");
 		}
-		
+		if(musicGroupPaymentCalender.getPaymentType() == MusicGroupPaymentCalender.PaymentType.MUSIC_APPLY){
+			throw new BizException("操作失败：报名缴费项不允许添加学员");
+		}
 		if (musicGroupPaymentCalender.getStatus() == PaymentCalenderStatusEnum.AUDITING
 				|| musicGroupPaymentCalender.getStatus() == PaymentCalenderStatusEnum.REJECT) {
 			throw new BizException("当前缴费状态不能添加学生");

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

@@ -2072,7 +2072,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         MusicGroup musicGroup = subFeeSettingDto.getMusicGroup();
         if (group == null) {
             throw new BizException("乐团信息不存在");
-        } else if (group.getSchoolId() != musicGroup.getSchoolId()) {
+        } else if (!group.getSchoolId().equals(musicGroup.getSchoolId())) {
             //如果已生成课表，那么修改未上课时教学点
             courseScheduleDao.updateCourseScheduleSchool("MUSIC", musicGroupId, musicGroup.getSchoolId());
         }
@@ -2083,8 +2083,6 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         //缴费方式不同
         if ((group.getStatus().equals(MusicGroupStatusEnum.AUDIT_FAILED) || group.getStatus().equals(MusicGroupStatusEnum.DRAFT))
                 && !group.getChargeTypeId().equals(musicGroup.getChargeTypeId())) {
-            //删除原有的乐团声部规划
-            musicGroupSubjectPlanDao.delByMusicGroupId(musicGroupId);
             //删除原有的声部商品组合
             musicGroupSubjectGoodsGroupDao.delByMusicGroupId(musicGroupId);
             //删除原有的缴费项目
@@ -2140,9 +2138,9 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         musicGroup.setUpdateTime(date);
         musicGroupDao.update(musicGroup);
         //修改课程里面的教学点
-        if (!group.getSchoolId().equals(musicGroup.getSchoolId())) {
-            courseScheduleDao.updateByMusicGroupId(musicGroupId, musicGroup.getSchoolId());
-        }
+//        if (!musicGroup.getSchoolId().equals(musicGroup.getSchoolId())) {
+//            courseScheduleDao.updateByMusicGroupId(musicGroupId, musicGroup.getSchoolId());
+//        }
         // 删除乐团付费主体列表
         musicGroupPaymentEntitiesDao.delByGroupId(musicGroupId);
         //批量新增

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

@@ -178,7 +178,7 @@
 	<delete id="deleteByUserIdAndMusicGroupId">
 		DELETE FROM music_group_payment_calender_detail
 		WHERE music_group_payment_calender_id_ IN (SELECT mgpc.id_ FROM music_group_payment_calender mgpc
-		WHERE mgpc.music_group_id_ = #{musicGroupId} AND mgpc.payment_status_ IN ('NO','OPEN'))
+		WHERE mgpc.music_group_id_ = #{musicGroupId} AND mgpc.status_ IN ('NO','OPEN'))
 		AND user_id_ = #{userId} AND payment_status_ = 'NON_PAYMENT'
 	</delete>
     <delete id="deleteByCalenderId">