Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/dal/page/MusicCalenderDetailQueryInfo.java

@@ -1,21 +1,37 @@
 package com.ym.mec.biz.dal.page;
 
-import com.ym.mec.biz.dal.entity.MusicGroupStudentFee;
-import com.ym.mec.biz.dal.enums.PaymentStatusEnum;
 import com.ym.mec.common.page.QueryInfo;
 
 public class MusicCalenderDetailQueryInfo extends QueryInfo {
 
 	private Integer userId;
 
-	private MusicGroupStudentFee.PaymentStatus paymentStatus;
+	private String paymentStatus;
 
 	private Integer subjectId;
 
 	private String musicGroupId;
 
+	private String musicGroupStatus;
+
 	private Long id;
 
+	public String getPaymentStatus() {
+		return paymentStatus;
+	}
+
+	public void setPaymentStatus(String paymentStatus) {
+		this.paymentStatus = paymentStatus;
+	}
+
+	public String getMusicGroupStatus() {
+		return musicGroupStatus;
+	}
+
+	public void setMusicGroupStatus(String musicGroupStatus) {
+		this.musicGroupStatus = musicGroupStatus;
+	}
+
 	public String getMusicGroupId() {
 		return musicGroupId;
 	}
@@ -40,14 +56,6 @@ public class MusicCalenderDetailQueryInfo extends QueryInfo {
 		this.userId = userId;
 	}
 
-	public MusicGroupStudentFee.PaymentStatus getPaymentStatus() {
-		return paymentStatus;
-	}
-
-	public void setPaymentStatus(MusicGroupStudentFee.PaymentStatus paymentStatus) {
-		this.paymentStatus = paymentStatus;
-	}
-
 	public Long getId() {
 		return id;
 	}

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

@@ -65,7 +65,7 @@ public class MusicGroupPaymentCalenderDetailServiceImpl extends BaseServiceImpl<
 			if(e.getPaymentStatus() == null || e.getPaymentStatus() != NON_PAYMENT){
 				throw new BizException("修改失败,缴费状态不匹配");
 			}
-			if(compare == 1){
+			if(expectAmount.intValue() == 0){
 				e.setPaymentStatus(PAID_COMPLETED);
 			}
 			e.setUpdateTime(date);
@@ -74,9 +74,11 @@ public class MusicGroupPaymentCalenderDetailServiceImpl extends BaseServiceImpl<
 		//如果是设置为0元
 		MusicGroupPaymentCalender calender = musicGroupPaymentCalenderDao.get(calenderDetails.get(0).getMusicGroupPaymentCalenderId());
 		if(calender.getType() == ONLINE){
+			//剩余网管课可购买次数加一
 			musicGroupStudentFeeDao.remainNetworkClassTimesAdd(ids);
 		}
-		if(compare == 1){
+		if(expectAmount.intValue() == 0){
+			//缴费完成
 			musicGroupStudentFeeDao.setPaidCompleted(calenderDetails);
 		}
 		musicGroupPaymentCalenderDetailDao.batchUpdate(calenderDetails);

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

@@ -172,8 +172,11 @@
 			<if test="id != null">
 				AND mgpcd.music_group_payment_calender_id_ = #{id}
 			</if>
-			<if test="paymentStatus != null">
-				AND mgpcd.payment_status_ = #{paymentStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
+			<if test="paymentStatus != null and paymentStatus != ''">
+				AND mgpcd.payment_status_ = #{paymentStatus}
+			</if>
+			<if test="musicGroupStatus != null and musicGroupStatus != ''">
+				AND sr.music_group_status_ = #{musicGroupStatus}
 			</if>
 			<if test="subjectId != null">
 				AND #{subjectId} = sr.actual_subject_id_
@@ -199,8 +202,11 @@
 			<if test="subjectId != null">
 				AND #{subjectId} = sr.actual_subject_id_
 			</if>
-			<if test="paymentStatus != null">
-				AND mgpcd.payment_status_ = #{paymentStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
+			<if test="paymentStatus != null and paymentStatus != ''">
+				AND mgpcd.payment_status_ = #{paymentStatus}
+			</if>
+			<if test="musicGroupStatus != null and musicGroupStatus != ''">
+				AND sr.music_group_status_ = #{musicGroupStatus}
 			</if>
 		</where>
 	</select>