Merge remote-tracking branch 'origin/master'

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

@@ -47,7 +47,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 	public boolean create(MusicGroupPaymentCalender musicGroupPaymentCalender) {
 
 		Date date = new Date();
-		List<MusicGroupStudentFee> list = null;
+		List<MusicGroupStudentFee> musicGroupStudentFeeList = null;
 
 		musicGroupPaymentCalender.setCreateTime(date);
 		musicGroupPaymentCalender.setUpdateTime(date);
@@ -63,30 +63,35 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 		} else if (date.after(musicGroupPaymentCalender.getStartPaymentDate())) {
 			musicGroupPaymentCalender.setPaymentStatus(PaymentStatusEnum.OPEN);
 			// 统计缴费人数
-			list = musicGroupStudentFeeDao.queryByMusicGroupId(musicGroupPaymentCalender.getMusicGroupId());
-			if (list == null) {
-				list = new ArrayList<MusicGroupStudentFee>();
+			musicGroupStudentFeeList = musicGroupStudentFeeDao.queryByMusicGroupId(musicGroupPaymentCalender.getMusicGroupId());
+			if (musicGroupStudentFeeList == null) {
+				musicGroupStudentFeeList = new ArrayList<MusicGroupStudentFee>();
 			}
-			musicGroupPaymentCalender.setExpectNum(list.size());
+			musicGroupPaymentCalender.setExpectNum(musicGroupStudentFeeList.size());
 		} else {
 			musicGroupPaymentCalender.setPaymentStatus(PaymentStatusEnum.NO);
 		}
 
 		this.insert(musicGroupPaymentCalender);
-		
+
 		List<MusicGroupStudentFee> updateMusicGroupStudentFeeList = new ArrayList<MusicGroupStudentFee>();
 
 		List<MusicGroupPaymentCalenderDetail> musicGroupPaymentCalenderDetailList = new ArrayList<MusicGroupPaymentCalenderDetail>();
 		if (musicGroupPaymentCalender.getPaymentStatus() == PaymentStatusEnum.OPEN) {
-			if (list != null && list.size() > 0) {
+			if (musicGroupStudentFeeList != null && musicGroupStudentFeeList.size() > 0) {
+				
 				MusicGroupPaymentCalenderDetail musicGroupPaymentCalenderDetail = null;
 				// 创建缴费明细
-				for (MusicGroupStudentFee mgsf : list) {
+				for (MusicGroupStudentFee mgsf : musicGroupStudentFeeList) {
 					musicGroupPaymentCalenderDetail = new MusicGroupPaymentCalenderDetail();
 					musicGroupPaymentCalenderDetail.setMusicGroupPaymentCalenderId(musicGroupPaymentCalender.getId());
 					musicGroupPaymentCalenderDetail.setCreateTime(date);
 					musicGroupPaymentCalenderDetail.setExpectAmount(mgsf.getCourseFee());
-					musicGroupPaymentCalenderDetail.setPaymentStatus(PaymentStatus.NON_PAYMENT);
+					if (mgsf.getCourseFee().doubleValue() == 0) {
+						musicGroupPaymentCalenderDetail.setPaymentStatus(PaymentStatus.PAID_COMPLETED);
+					} else {
+						musicGroupPaymentCalenderDetail.setPaymentStatus(PaymentStatus.NON_PAYMENT);
+					}
 					musicGroupPaymentCalenderDetail.setUpdateTime(date);
 					musicGroupPaymentCalenderDetail.setUserId(mgsf.getUserId());
 
@@ -94,9 +99,13 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 				}
 
 				// 更新学员缴费状态
-				List<MusicGroupStudentFee> musicGroupStudentFeeList = musicGroupStudentFeeDao.queryByMusicGroupId(musicGroupPaymentCalender.getMusicGroupId());
 				for (MusicGroupStudentFee mgsf : musicGroupStudentFeeList) {
-					mgsf.setPaymentStatus(PaymentStatus.NON_PAYMENT);
+					if (mgsf.getCourseFee().doubleValue() == 0) {
+						mgsf.setPaymentStatus(PaymentStatus.PAID_COMPLETED);
+						mgsf.setRemainNetworkClassTimes(mgsf.getRemainNetworkClassTimes() + 1);
+					} else {
+						mgsf.setPaymentStatus(PaymentStatus.NON_PAYMENT);
+					}
 					mgsf.setUpdateTime(date);
 					updateMusicGroupStudentFeeList.add(mgsf);
 				}
@@ -146,15 +155,19 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 				updateMusicGroupPaymentCalenderList.add(mgpc);
 
 				// 学生状态更新进行中
-				List<MusicGroupStudentFee> list = musicGroupStudentFeeDao.queryByMusicGroupId(mgpc.getMusicGroupId());
+				List<MusicGroupStudentFee> musicGroupStudentFeeList = musicGroupStudentFeeDao.queryByMusicGroupId(mgpc.getMusicGroupId());
 
 				// 创建缴费明细
-				for (MusicGroupStudentFee mgsf : list) {
+				for (MusicGroupStudentFee mgsf : musicGroupStudentFeeList) {
 					musicGroupPaymentCalenderDetail = new MusicGroupPaymentCalenderDetail();
 					musicGroupPaymentCalenderDetail.setMusicGroupPaymentCalenderId(mgpc.getId());
 					musicGroupPaymentCalenderDetail.setCreateTime(date);
 					musicGroupPaymentCalenderDetail.setExpectAmount(mgsf.getCourseFee());
-					musicGroupPaymentCalenderDetail.setPaymentStatus(PaymentStatus.NON_PAYMENT);
+					if (mgsf.getCourseFee().doubleValue() == 0) {
+						musicGroupPaymentCalenderDetail.setPaymentStatus(PaymentStatus.PAID_COMPLETED);
+					} else {
+						musicGroupPaymentCalenderDetail.setPaymentStatus(PaymentStatus.NON_PAYMENT);
+					}
 					musicGroupPaymentCalenderDetail.setUpdateTime(date);
 					musicGroupPaymentCalenderDetail.setUserId(mgsf.getUserId());
 
@@ -162,9 +175,13 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 				}
 
 				// 更新学员缴费状态
-				List<MusicGroupStudentFee> musicGroupStudentFeeList = musicGroupStudentFeeDao.queryByMusicGroupId(mgpc.getMusicGroupId());
 				for (MusicGroupStudentFee mgsf : musicGroupStudentFeeList) {
-					mgsf.setPaymentStatus(PaymentStatus.NON_PAYMENT);
+					if (mgsf.getCourseFee().doubleValue() == 0) {
+						mgsf.setPaymentStatus(PaymentStatus.PAID_COMPLETED);
+						mgsf.setRemainNetworkClassTimes(mgsf.getRemainNetworkClassTimes() + 1);
+					} else {
+						mgsf.setPaymentStatus(PaymentStatus.NON_PAYMENT);
+					}
 					mgsf.setUpdateTime(date);
 					updateMusicGroupStudentFeeList.add(mgsf);
 				}

mec-common/common-core/src/main/java/com/ym/mec/common/entity/HttpResponseResult.java

@@ -53,7 +53,7 @@ public class HttpResponseResult<T> {
 		this.msg = msg;
 	}
 
-	public Object getData() {
+	public T getData() {
 		return data;
 	}