'教务端老师端学员缴费状态修改'

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

@@ -2,6 +2,8 @@ package com.ym.mec.biz.dal.dto;
 
 import com.ym.mec.biz.dal.enums.StudentAttendanceStatusEnum;
 import io.swagger.annotations.ApiModelProperty;
+import org.apache.commons.lang3.StringUtils;
+import sun.swing.StringUIClientPropertyKey;
 
 /**
  * @Author Joburgess
@@ -38,7 +40,7 @@ public class StudentAttendanceViewDto {
     private String avatar;
 
     @ApiModelProperty(value = "缴费状态")
-    private String paymentStatus = "NON_PAYMENT";
+    private String paymentStatus = "PAID_COMPLETED";
 
     @ApiModelProperty(value = "学生在学状态",required = false)
     private StudentAttendanceStatusEnum status;
@@ -48,6 +50,9 @@ public class StudentAttendanceViewDto {
     }
 
     public void setPaymentStatus(String paymentStatus) {
+        if(StringUtils.isEmpty(paymentStatus)){
+            paymentStatus = "NON_PAYMENT";
+        }
         this.paymentStatus = paymentStatus;
     }
 

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

@@ -5,6 +5,7 @@ import com.ym.mec.biz.dal.enums.StudentAttendanceStatusEnum;
 
 import io.swagger.annotations.ApiModelProperty;
 
+import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import java.util.Date;
@@ -77,13 +78,16 @@ public class StudentAttendance {
 	private Integer currentClassTimes;
 
 	@ApiModelProperty(value = "缴费状态")
-	private String paymentStatus = "NON_PAYMENT";
+	private String paymentStatus = "PAID_COMPLETED";
 
 	public String getPaymentStatus() {
 		return paymentStatus;
 	}
 
 	public void setPaymentStatus(String paymentStatus) {
+		if(StringUtils.isEmpty(paymentStatus)){
+			paymentStatus = "NON_PAYMENT";
+		}
 		this.paymentStatus = paymentStatus;
 	}
 

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

@@ -1487,9 +1487,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                 Map<Integer,String> paymentStatusMap = MapUtil.convertIntegerMap(musicGroupPaymentCalenderDao.queryUserCoursePaymentStatus(collect,schedule.getMusicGroupId()));
                 if(paymentStatusMap.size() > 0){
                     truantStudent.forEach(studentAttendanceViewDto -> {
-                        if(StringUtils.isNotEmpty(paymentStatusMap.get(studentAttendanceViewDto.getStudentId().intValue()))){
-                            studentAttendanceViewDto.setPaymentStatus(paymentStatusMap.get(studentAttendanceViewDto.getStudentId().intValue()));
-                        }
+                        studentAttendanceViewDto.setPaymentStatus(paymentStatusMap.get(studentAttendanceViewDto.getStudentId().intValue()));
                     });
                 }
             }

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

@@ -606,9 +606,7 @@ public class StudentAttendanceServiceImpl extends BaseServiceImpl<Long, StudentA
                 Map<Integer,String> paymentStatusMap = MapUtil.convertIntegerMap(musicGroupPaymentCalenderDao.queryUserCoursePaymentStatus(collect,schedule.getMusicGroupId()));
                 if(paymentStatusMap.size() > 0){
                     dataList.forEach(e -> {
-                        if(StringUtils.isNotEmpty(paymentStatusMap.get(e.getUserId()))){
-                            e.setPaymentStatus(paymentStatusMap.get(e.getUserId()));
-                        }
+                        e.setPaymentStatus(paymentStatusMap.get(e.getUserId()));
                     });
                 }
             }