Merge remote-tracking branch 'origin/master'

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

@@ -70,13 +70,13 @@ public class MusicGroupPaymentCalenderDetailServiceImpl extends BaseServiceImpl<
 			e.setUpdateTime(date);
 			e.setExpectAmount(expectAmount);
 		});
-		//如果是设置为0元
-		MusicGroupPaymentCalender calender = musicGroupPaymentCalenderDao.get(calenderDetails.get(0).getMusicGroupPaymentCalenderId());
-		if(calender.getType() == ONLINE){
-			//剩余网管课可购买次数加一
-			musicGroupStudentFeeDao.remainNetworkClassTimesAdd(ids);
-		}
 		if(expectAmount.doubleValue() == 0){
+			//如果是设置为0元
+			MusicGroupPaymentCalender calender = musicGroupPaymentCalenderDao.get(calenderDetails.get(0).getMusicGroupPaymentCalenderId());
+			if(calender.getType() == ONLINE){
+				//剩余网管课可购买次数加一
+				musicGroupStudentFeeDao.remainNetworkClassTimesAdd(ids);
+			}
 			//缴费完成
 			musicGroupStudentFeeDao.setPaidCompleted(calenderDetails);
 		}
@@ -162,22 +162,21 @@ public class MusicGroupPaymentCalenderDetailServiceImpl extends BaseServiceImpl<
 		}
 		Date date = new Date();
 		MusicGroupStudentFee studentFee = musicGroupStudentFeeDao.findByUser(userId, calender.getMusicGroupId());
-		//修改预计人数
-//		calender.setExpectNum(calender.getExpectNum());
 		calender.setUpdateTime(date);
 		//生成详情
 		MusicGroupPaymentCalenderDetail musicGroupPaymentCalenderDetail = new MusicGroupPaymentCalenderDetail();
 		musicGroupPaymentCalenderDetail.setMusicGroupPaymentCalenderId(calender.getId());
 		musicGroupPaymentCalenderDetail.setCreateTime(date);
 		musicGroupPaymentCalenderDetail.setExpectAmount(studentFee.getCourseFee());
+		studentFee.setUpdateTime(date);
 		if (studentFee.getCourseFee().doubleValue() == 0) {
 			studentFee.setPaymentStatus(PAID_COMPLETED);
-			studentFee.setUpdateTime(date);
 			musicGroupPaymentCalenderDetail.setPaymentStatus(PAID_COMPLETED);
 			if(calender.getType() == ONLINE){
 				musicGroupStudentFeeDao.remainNetworkClassTimesAdd(userLastCalenderDetail.toString());
 			}
 		} else {
+			studentFee.setPaymentStatus(NON_PAYMENT);
 			musicGroupPaymentCalenderDetail.setPaymentStatus(MusicGroupStudentFee.PaymentStatus.NON_PAYMENT);
 		}
 		musicGroupPaymentCalenderDetail.setUpdateTime(date);

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

@@ -912,7 +912,7 @@
     <select id="queryUserVipNames" resultType="java.util.Map">
         SELECT cgsm.user_id_ 'key',GROUP_CONCAT(vg.name_)'value' FROM class_group_student_mapper cgsm
         LEFT JOIN vip_group vg ON cgsm.music_group_id_ = vg.id_
-        WHERE vg.group_status_ IN (2,4,6) AND cgsm.user_id_ IN
+        WHERE vg.group_status_ IN (2,4,6) AND cgsm.group_type_='VIP' AND cgsm.user_id_ IN
         <foreach collection="userIds" item="userId" open="(" close=")" separator=",">
             #{userId}
         </foreach>
@@ -925,7 +925,7 @@
         WHEN cgsm.status_ = 'QUIT_SCHOOL' THEN '休学' END) 'value'
         FROM class_group_student_mapper cgsm
         LEFT JOIN vip_group vg ON cgsm.music_group_id_ = vg.id_
-        WHERE vg.group_status_ IN (2,4,6) AND cgsm.user_id_ IN
+        WHERE vg.group_status_ IN (2,4,6) AND cgsm.group_type_='VIP' AND cgsm.user_id_ IN
         <foreach collection="userIds" item="userId" open="(" close=")" separator=",">
             #{userId}
         </foreach>