|
@@ -6,11 +6,13 @@ import com.ym.mec.biz.dal.entity.MusicGroup;
|
|
import com.ym.mec.biz.dal.entity.StudentRegistration;
|
|
import com.ym.mec.biz.dal.entity.StudentRegistration;
|
|
import com.ym.mec.biz.dal.enums.MusicGroupStatusEnum;
|
|
import com.ym.mec.biz.dal.enums.MusicGroupStatusEnum;
|
|
import com.ym.mec.biz.dal.enums.PaymentStatusEnum;
|
|
import com.ym.mec.biz.dal.enums.PaymentStatusEnum;
|
|
|
|
+import com.ym.mec.biz.dal.enums.StudentMusicGroupStatusEnum;
|
|
import com.ym.mec.biz.service.MusicGroupService;
|
|
import com.ym.mec.biz.service.MusicGroupService;
|
|
import com.ym.mec.biz.service.MusicGroupSubjectPlanService;
|
|
import com.ym.mec.biz.service.MusicGroupSubjectPlanService;
|
|
import com.ym.mec.biz.service.StudentRegistrationService;
|
|
import com.ym.mec.biz.service.StudentRegistrationService;
|
|
import com.ym.mec.common.controller.BaseController;
|
|
import com.ym.mec.common.controller.BaseController;
|
|
import com.ym.mec.common.entity.HttpResponseResult;
|
|
import com.ym.mec.common.entity.HttpResponseResult;
|
|
|
|
+import com.ym.mec.common.exception.BizException;
|
|
import com.ym.mec.util.date.DateUtil;
|
|
import com.ym.mec.util.date.DateUtil;
|
|
|
|
|
|
import io.swagger.annotations.Api;
|
|
import io.swagger.annotations.Api;
|
|
@@ -19,6 +21,7 @@ import io.swagger.annotations.ApiImplicitParams;
|
|
import io.swagger.annotations.ApiOperation;
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
+import org.springframework.http.HttpStatus;
|
|
import org.springframework.web.bind.annotation.*;
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
import java.io.IOException;
|
|
import java.io.IOException;
|
|
@@ -62,6 +65,11 @@ public class MusicGroupRegisterController extends BaseController {
|
|
return succeed(studentRegistrationService.updateStudent(studentRegistration));
|
|
return succeed(studentRegistrationService.updateStudent(studentRegistration));
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ StudentRegistration hasReg = studentRegistrationService.getByPhoneAndMusicGroupId(studentRegistration.getMusicGroupId(), studentRegistration.getParentsPhone());
|
|
|
|
+ if (hasReg != null && hasReg.getMusicGroupStatus() != StudentMusicGroupStatusEnum.QUIT && MusicGroupStatusEnum.PAY.equals(musicGroup.getStatus())) {
|
|
|
|
+ return failed(HttpStatus.CONTINUE,"该乐团您已报名");
|
|
|
|
+ }
|
|
|
|
+
|
|
if (musicGroup.getStatus().equals(MusicGroupStatusEnum.PAY)) {
|
|
if (musicGroup.getStatus().equals(MusicGroupStatusEnum.PAY)) {
|
|
studentRegistration.setPaymentStatus(PaymentStatusEnum.OPEN);
|
|
studentRegistration.setPaymentStatus(PaymentStatusEnum.OPEN);
|
|
} else {
|
|
} else {
|