Merge remote-tracking branch 'origin/master'

mec-student/src/main/java/com/ym/mec/student/controller/MusicGroupController.java

@@ -109,7 +109,7 @@ public class MusicGroupController extends BaseController {
         if (studentRegistration == null) {
             return failed(HttpStatus.CONTINUE, "乐团报名信息不存在");
         }
-        if ((studentRegistration.getPaymentStatus() == null || !studentRegistration.getPaymentStatus().equals(PaymentStatusEnum.YES))) {
+        if (studentRegistration.getPaymentStatus() != null && studentRegistration.getPaymentStatus().equals(PaymentStatusEnum.YES)) {
             return failed("您已缴费,请等待乐团开启");
         }
         if (!musicGroup.getStatus().equals(MusicGroupStatusEnum.PAY) && (studentRegistration.getPaymentStatus() == null || !studentRegistration.getPaymentStatus().equals(PaymentStatusEnum.OPEN))) {

mec-student/src/main/java/com/ym/mec/student/controller/MusicGroupRegisterController.java

@@ -47,7 +47,7 @@ public class MusicGroupRegisterController extends BaseController {
             return failed("乐团已截止报名");
         }
 
-        if(musicGroup.getStatus().equals(MusicGroupStatusEnum.APPLY)||musicGroup.getStatus().equals(MusicGroupStatusEnum.PAY)){
+        if (musicGroup.getStatus().equals(MusicGroupStatusEnum.PAY)) {
             studentRegistration.setPaymentStatus(PaymentStatusEnum.OPEN);
         }
         studentRegistration.setOrganId(musicGroup.getOrganId());