Merge remote-tracking branch 'origin/master'

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

@@ -2,6 +2,7 @@ package com.ym.mec.biz.dal.dto;
 
 import com.ym.mec.biz.dal.entity.MusicGroupStudentFee;
 import io.swagger.annotations.ApiModelProperty;
+import org.apache.commons.lang3.StringUtils;
 
 public class MusicCardDto {
     @ApiModelProperty(value = "报名id",required = true)
@@ -29,7 +30,7 @@ public class MusicCardDto {
     private String currentClass;
 
     @ApiModelProperty(value = "缴费状态",required = true)
-    private String paymentStatus;
+    private String paymentStatus = "PAID_COMPLETED";
 
     @ApiModelProperty(value = "乐团数量",required = true)
     private Integer musicGroupNum;
@@ -42,6 +43,9 @@ public class MusicCardDto {
     }
 
     public void setPaymentStatus(String paymentStatus) {
+        if(StringUtils.isEmpty(paymentStatus)){
+            paymentStatus = "PAID_COMPLETED";
+        }
         this.paymentStatus = paymentStatus;
     }
 

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

@@ -51,7 +51,7 @@ public class StudentAttendanceViewDto {
 
     public void setPaymentStatus(String paymentStatus) {
         if(StringUtils.isEmpty(paymentStatus)){
-            paymentStatus = "NON_PAYMENT";
+            paymentStatus = "PAID_COMPLETED";
         }
         this.paymentStatus = paymentStatus;
     }

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

@@ -86,7 +86,7 @@ public class StudentAttendance {
 
 	public void setPaymentStatus(String paymentStatus) {
 		if(StringUtils.isEmpty(paymentStatus)){
-			paymentStatus = "NON_PAYMENT";
+			paymentStatus = "PAID_COMPLETED";
 		}
 		this.paymentStatus = paymentStatus;
 	}

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

@@ -3715,7 +3715,6 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         musicGroupStudentClassAdjust.setSubLockCourseIds(JSON.toJSONString(courseIds));
         List<Long> studentPaymentIds = courseScheduleStudentPaymentDao.queryStudentNotStartByClassIdsAndStudentIds(classGroupIds,studentIds);
 
-//        musicGroupStudentClassAdjust.setSubLockCourseIds(JSON.toJSONString(courseIds));
         musicGroupStudentClassAdjust.setStudentPaymentIds(JSON.toJSONString(studentPaymentIds));
         //计算新增班级的可排课时长，总课次*默认时长  (用学员剩余的课程时长加上购买的时长，可能导致同一班级学员时长不一致)
         musicGroupStudentClassAdjust.setClassCourseMinute(JSON.toJSONString(findClassCourseMinuteMap(classGroupIds)));