Merge remote-tracking branch 'origin/master'

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

@@ -228,7 +228,7 @@ public interface MusicGroupPaymentCalenderDetailDao extends BaseDAO<Long, MusicG
 	 *
 	 * @param calenderId
 	 */
-	void updateNoPaymentAndZeroPaymentStatus(Long calenderId);
+	int updateNoPaymentAndZeroPaymentStatus(Long calenderId);
 
 	/**
 	 * 获取学员乐团欠费金额

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

@@ -1197,9 +1197,10 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 				// “进行中”更新至“已结束”
 				mgpc.setUpdateTime(date);
 				mgpc.setStatus(PaymentCalenderStatusEnum.OVER);
-				updateMusicGroupPaymentCalenderList.add(mgpc);
 				//将0元未缴费学员缴费状态更新为已缴费
-				musicGroupPaymentCalenderDetailDao.updateNoPaymentAndZeroPaymentStatus(mgpc.getId());
+				int i = musicGroupPaymentCalenderDetailDao.updateNoPaymentAndZeroPaymentStatus(mgpc.getId());
+				mgpc.setActualNum((mgpc.getActualNum()==null?0:mgpc.getActualNum()) + i);
+				updateMusicGroupPaymentCalenderList.add(mgpc);
 				//如果是进行中加学员，将报名表状态改为NORMAL
 				if(mgpc.getPaymentType() == MusicGroupPaymentCalender.PaymentType.ADD_STUDENT){
 					studentRegistrationDao.updatePaymentStatusByClaenderId(mgpc.getId());