Merge remote-tracking branch 'origin/master'

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

@@ -50,7 +50,7 @@ public interface MusicGroupPaymentCalenderDao extends BaseDAO<Long, MusicGroupPa
      * @param status
      * @return
      */
-    List<MusicGroupPaymentCalender> queryByPaymentStatus(@Param("status") List<PaymentStatusEnum> status, @Param("payUserType") String payUserType);
+    List<MusicGroupPaymentCalender> queryByPaymentStatus(@Param("status") List<MusicGroupPaymentCalender.PaymentCalenderStatusEnum> status, @Param("payUserType") String payUserType);
 
     /**
      * 获取缴费信息锁

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

@@ -2377,7 +2377,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
             });
         }
         if (Objects.nonNull(classGroup4MixDtos.get(0).getCourseAddType())&&classGroup4MixDtos.get(0).getCourseAddType().equals("onlyUpdateTeacher")) {
-            List<Integer> classGroupIds = new ArrayList<Integer>();
+            List<Integer> classGroupIds = new ArrayList<>();
             classGroupIds.add(classGroupId);
             // 删除历史记录
             classGroupTeacherMapperDao.delClassGroupTeacherMapper(classGroupIds);

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

@@ -1064,9 +1064,9 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 	@Transactional(rollbackFor = Exception.class,isolation = Isolation.READ_COMMITTED)
 	public boolean autoUpdateMusicGroupPaymentCalenderStatus() {
 		Date date = new Date();
-		List<PaymentStatusEnum> statusList = new ArrayList<PaymentStatusEnum>();
-		statusList.add(PaymentStatusEnum.NO);
-		statusList.add(PaymentStatusEnum.OPEN);
+		List<PaymentCalenderStatusEnum> statusList = new ArrayList<>();
+		statusList.add(PaymentCalenderStatusEnum.NO);
+		statusList.add(PaymentCalenderStatusEnum.OPEN);
 		List<MusicGroupPaymentCalender> musicGroupPaymentCalenderList = musicGroupPaymentCalenderDao.queryByPaymentStatus(statusList,PayUserType.STUDENT.getCode());
 
 		List<MusicGroupPaymentCalender> updateMusicGroupPaymentCalenderList = new ArrayList<MusicGroupPaymentCalender>();

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

@@ -2073,7 +2073,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
                 sysMessageService.batchSendMessage(MessageSender.AWSMS, MessageTypeEnum.STUDENT_SMS_MUSIC_GROUP_RENEW_SUCCESS, yimei, null, 0, "1", "",
                         studentRegistration.getParentsName(), studentPaymentOrder.getActualAmount());
             }
-            studentRegistrationService.updateUserSurplusCourseFee(userId,musicGroupId,amount,"乐团续费",userId);
+            studentRegistrationService.updateUserSurplusCourseFee(userId,musicGroupId,studentPaymentOrder.getExpectAmount(),"乐团续费",userId);
             return true;
         } else {
             if (studentPaymentOrder.getBalancePaymentAmount() != null && studentPaymentOrder.getBalancePaymentAmount().doubleValue() > 0) {
@@ -2271,11 +2271,19 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
             throw new BizException("用户信息获取失败");
         }
         String musicGroupId = subFeeSettingDto.getMusicGroup().getId();
-        MusicGroup group = musicGroupDao.get(musicGroupId);
-        MusicGroup musicGroup = subFeeSettingDto.getMusicGroup();
+        MusicGroup group = musicGroupDao.getLocked(musicGroupId);
         if (group == null) {
             throw new BizException("乐团信息不存在");
-        } else if (!group.getSchoolId().equals(musicGroup.getSchoolId())) {
+        }
+        
+		if (!(group.getStatus() == MusicGroupStatusEnum.DRAFT || group.getStatus() == MusicGroupStatusEnum.AUDIT_FAILED
+				|| group.getStatus() == MusicGroupStatusEnum.PROGRESS)) {
+			throw new BizException("当前乐团状态不能修改基本信息");
+		}
+
+        MusicGroup musicGroup = subFeeSettingDto.getMusicGroup();
+        musicGroup.setStatus(group.getStatus());
+        if (!group.getSchoolId().equals(musicGroup.getSchoolId())) {
             //如果已生成课表，那么修改未上课时教学点
             courseScheduleDao.updateCourseScheduleSchool("MUSIC", musicGroupId, musicGroup.getSchoolId());
         }