|
@@ -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);
|