Browse Source

add 储备中进行中可以报名缴费

周箭河 4 years ago
parent
commit
e2d3a4c84a

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

@@ -78,11 +78,14 @@ public class MusicGroupRegisterController extends BaseController {
             return succeed(hasReg);
         }
         String err = studentRegistrationService.checkRegOrPayStatus(musicGroup.getId());
-        if(err != null){
-            return failed(err+",不能报名");
+        if (err != null) {
+            return failed(err + ",不能报名");
         }
 
-        if (musicGroup.getStatus().equals(MusicGroupStatusEnum.PAY)) {
+        if (musicGroup.getStatus().equals(MusicGroupStatusEnum.PAY) ||
+                musicGroup.getStatus().equals(MusicGroupStatusEnum.PREPARE) ||
+                musicGroup.getStatus().equals(MusicGroupStatusEnum.PROGRESS)
+        ) {
             studentRegistration.setPaymentStatus(PaymentStatusEnum.OPEN);
         } else {
             studentRegistration.setPaymentStatus(PaymentStatusEnum.NO);