Merge branch 'Joburgess' of http://git.dayaedu.com/yonge/mec into test

 Conflicts:

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

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

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

@@ -146,8 +146,8 @@ public class MusicGroupPaymentCalenderDetailServiceImpl extends BaseServiceImpl<
 		}
 		int length = ids.split(",").length;
 		Date date = new Date();
-//		Long calenderId = calenderDetails.get(0).getMusicGroupPaymentCalenderId();
-//		MusicGroupPaymentCalender calender = musicGroupPaymentCalenderService.get(calenderId);
+		Long calenderId = calenderDetails.get(0).getMusicGroupPaymentCalenderId();
+		MusicGroupPaymentCalender calender = musicGroupPaymentCalenderService.get(calenderId);
 		calenderDetails.forEach(e->{
 			e.setUpdateTime(date);
 			e.setOpen(1);
@@ -156,6 +156,10 @@ public class MusicGroupPaymentCalenderDetailServiceImpl extends BaseServiceImpl<
 		});
 		musicGroupPaymentCalenderDetailDao.batchUpdate(calenderDetails);
 		Set<Integer> studentIds = calenderDetails.stream().map(e -> e.getUserId()).collect(Collectors.toSet());
+		//将0元未缴费学员缴费状态更新为已缴费
+		int j = musicGroupPaymentCalenderDetailDao.updateNoPaymentAndZeroPaymentStatus(calender.getId());
+		calender.setActualNum((calender.getActualNum()==null?0:calender.getActualNum()) + j);
+		musicGroupPaymentCalenderDao.update(calender);
 		//推送消息
 		/*if (calender.getPayUserType() == STUDENT && studentIds.size() > 0) {
 			Map<Integer, String> push = new HashMap<>();

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

@@ -1236,6 +1236,9 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 				// “未开始”更新至“进行中”
 				mgpc.setUpdateTime(date);
 				mgpc.setStatus(PaymentCalenderStatusEnum.OPEN);
+				//将0元未缴费学员缴费状态更新为已缴费
+				int i = musicGroupPaymentCalenderDetailDao.updateNoPaymentAndZeroPaymentStatus(mgpc.getId());
+				mgpc.setActualNum((mgpc.getActualNum()==null?0:mgpc.getActualNum()) + i);
 				updateMusicGroupPaymentCalenderList.add(mgpc);
 				if(mgpc.getPayUserType() == STUDENT){
 					//推送待续费通知

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

@@ -518,8 +518,11 @@
 		AND mgpcd.music_group_payment_calender_id_ = #{calenderId} AND FIND_IN_SET(mgpcd.user_id_,#{studentIds})
 	</select>
 
-	<update id="updateNoPaymentAndZeroPaymentStatus">
-		UPDATE music_group_payment_calender_detail SET payment_status_ = 'PAID_COMPLETED',actual_amount_ = 0,update_time_ = NOW()
-		WHERE music_group_payment_calender_id_ = #{calenderId} AND expect_amount_ = 0 AND payment_status_ = 'NON_PAYMENT'
+    <update id="updateNoPaymentAndZeroPaymentStatus">
+		UPDATE music_group_payment_calender_detail mgpcd
+		LEFT JOIN music_group_payment_calender mgpc ON mgpc.id_ = mgpcd.music_group_payment_calender_id_
+		SET mgpcd.payment_status_ = 'PAID_COMPLETED',mgpcd.actual_amount_ = 0,mgpcd.update_time_ = NOW()
+		WHERE mgpcd.music_group_payment_calender_id_ = #{calenderId} AND mgpcd.expect_amount_ = 0
+		AND mgpcd.payment_status_ = 'NON_PAYMENT' AND (mgpcd.open_ = 1 OR mgpc.status_ = 'OPEN')
 	</update>
 </mapper>