update

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/CourseListDto.java

@@ -1,5 +1,6 @@
 package com.ym.mec.biz.dal.dto;
 
+import com.ym.mec.biz.dal.entity.MusicGroupStudentFee;
 import com.ym.mec.biz.dal.enums.ClassGroupTypeEnum;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -37,9 +38,20 @@ public class CourseListDto {
     @ApiModelProperty(value = "单节课时",required = true)
     private Integer singleClassMinutes;
 
-    @ApiModelProperty(value = "0待续费，1已续费",required = true)
+//    @ApiModelProperty(value = "0待续费，1已续费",required = true)
     private Integer renewStatus = 0;
 
+    //续费状态
+    private MusicGroupStudentFee.PaymentStatus paymentStatus;
+
+    public MusicGroupStudentFee.PaymentStatus getPaymentStatus() {
+        return paymentStatus;
+    }
+
+    public void setPaymentStatus(MusicGroupStudentFee.PaymentStatus paymentStatus) {
+        this.paymentStatus = paymentStatus;
+    }
+
     public ClassGroupTypeEnum getType() {
         return type;
     }

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/MusicGroupStudentFee.java

@@ -73,17 +73,6 @@ public class MusicGroupStudentFee {
 	/**  */
 	private java.util.Date updateTime;
 
-	@ApiModelProperty(value = "缴费状态（0待缴费、1已缴费、2缴费中）", required = false)
-	private Integer paymentStatus;
-
-	public Integer getPaymentStatus() {
-		return paymentStatus;
-	}
-
-	public void setPaymentStatus(Integer paymentStatus) {
-		this.paymentStatus = paymentStatus;
-	}
-
 	public Date getNextPaymentDate() {
 		return nextPaymentDate;
 	}

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

@@ -364,7 +364,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                     MusicGroupStudentFee musicGroupStudentFee = musicGroupStudentFeeDao.findByUser(userId, e.getMusicGroupId());
 //                    if (musicGroupStudentFee != null) {
 //                        int i = DateUtil.daysBetween(new Date(), musicGroupStudentFee.getNextPaymentDate());
-                        e.setRenewStatus(musicGroupStudentFee.getPaymentStatus());
+                        e.setPaymentStatus(musicGroupStudentFee.getPaymentStatus());
 //                    }
                 }
             });

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

@@ -17,7 +17,7 @@
         <result column="continuous_absenteeism_times_" property="continuousAbsenteeismTimes"/>
         <result column="create_time_" property="createTime"/>
         <result column="update_time_" property="updateTime"/>
-        <result column="payment_status_" property="renewalStatus" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+        <result column="payment_status_" property="paymentStatus" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="temporary_course_fee_" property="temporaryCourseFee"/>
     </resultMap>